From: Warren Usui <warren.usui@inktank.com>
Date: Thu, 5 Dec 2013 01:49:21 +0000 (-0800)
Subject: A create_if_vm call was made more than once when a lock-many style lock
X-Git-Tag: v0.94.10~27^2^2~364^2~471
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=421192617f8b31a0068c97447cb9f270101d0567;p=ceph.git

A create_if_vm call was made more than once when a lock-many style lock
was performed.  This caused downburst to run twice, and the second
downburst fails as a result of the first downburst running.

Fixes: 6933
---

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index f13f2012379bf..230971a2eb35b 100644
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -91,7 +91,7 @@ def lock_machines(ctx, config):
         if len(newly_locked) == how_many:
             vmlist = []
             for lmach in newly_locked:
-                if lock.create_if_vm(ctx, lmach):
+                if teuthology.is_vm(lmach):
                     vmlist.append(lmach)
             if vmlist:
                 log.info('Waiting for virtual machines to come up')