Skip to content

[From REQ-477] Quicktest_vdi_copy: Wait for VBD unplug and destroy VDIs created by this test #3467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2018
Merged

[From REQ-477] Quicktest_vdi_copy: Wait for VBD unplug and destroy VDIs created by this test #3467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76f246c
Quicktest_vdi_copy: clean up
edwintorok Nov 30, 2017
1daf976
CA-277464: Quicktest_vdi_copy: wait for VBD unplug before destroying VDI
gaborigloi Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ocaml/quicktest/quicktest_vdi_copy.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@ let read_from_vdi ~session_id ~vdi f =
Http.Get uri in
http req (fun (_, fd) -> f fd)

(* Simpler alternative to Xapi_vdi.wait_for_vbds_to_be_unplugged_and_destroyed,
using sleep instead of the event system. *)
let wait_for_no_vbds_then_destroy ~rpc ~session_id self =
let wait_for_no_vbds () =
let start = Mtime_clock.counter () in
let over () = (Mtime_clock.count start |> Mtime.Span.to_s) > 4.0 in
while not (over ()) && Client.VDI.get_VBDs ~rpc ~session_id ~self <> [] do Unix.sleepf 0.1 done
in
wait_for_no_vbds ();
Client.VDI.destroy ~rpc ~session_id ~self

let start session_id sr =
let t = make_test "Check VDI.copy delta handling" 1 in
start t;
Expand Down Expand Up @@ -142,5 +153,9 @@ let start session_id sr =
done;
debug t "1MiB - 1 sector is full of 'a's";
);

debug t "Destroying VDI (cleanup)";
List.iter (wait_for_no_vbds_then_destroy ~rpc:!rpc ~session_id) [ original; snapshot; snapshot_backup; delta_backup ];

success t