Commit f398c9b9 authored by Jose A. Lopes's avatar Jose A. Lopes

Fix watcher tampering with instance userdown QA

The watcher was tampering with the instance user down QA because, when
the watcher sees an instance marked an 'USER_down', it will cleanup
the instance, that is it will stop the instance, thus marking it as
'ADMIN_down'.  The change in instance status was causing the instance
user down QA to fail sporadically.  This patch pauses the watcher
during this test.
Signed-off-by: default avatarJose A. Lopes <jabolopes@google.com>
Reviewed-by: default avatarReviewed-by: Helga Velroyen <helgav@google.com>
parent 5a5a64c6
......@@ -33,6 +33,7 @@ from ganeti import query
from ganeti import pathutils
import qa_config
import qa_daemon
import qa_utils
import qa_error
......@@ -1158,7 +1159,7 @@ def _TestInstanceUserDownXen(instance, master):
@InstanceCheck(INST_UP, INST_UP, FIRST_ARG)
def _TestInstanceUserDownKvm(instance, master):
def _StopKVMInstance():
AssertCommand("pkill -f \"kvm -name %s\"" % instance.name, node=primary)
AssertCommand("pkill -f \"\\-name %s\"" % instance.name, node=primary)
time.sleep(5)
AssertCommand(["gnt-instance", "modify", "-H", "user_shutdown=true",
......@@ -1182,7 +1183,9 @@ def TestInstanceUserDown(instance, master):
(constants.HT_XEN_HVM, _TestInstanceUserDownXen),
(constants.HT_KVM, _TestInstanceUserDownKvm)]:
if hv in enabled_hypervisors:
qa_daemon.TestPauseWatcher()
fn(instance, master)
qa_daemon.TestResumeWatcher()
else:
print "%s hypervisor is not enabled, skipping test for this hypervisor" \
% hv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment