On Fri, Feb 7, 2014 at 2:48 PM, Jose A. Lopes <[email protected]> wrote: > Increase instance shutdown timeout and make call 'pkill' more > reliable, which should fix the KVM QA. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > qa/qa_instance.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/qa/qa_instance.py b/qa/qa_instance.py > index 0fbb8fa..c9648c6 100644 > --- a/qa/qa_instance.py > +++ b/qa/qa_instance.py > @@ -1158,8 +1158,8 @@ 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) > - time.sleep(5) > + AssertCommand("pkill -f \"\\-name %s\"" % instance.name, node=primary) > + time.sleep(10) > > AssertCommand(["gnt-instance", "modify", "-H", "user_shutdown=true", > instance.name]) > -- > 1.9.0.rc1.175.g0b1dcb5 >
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
