From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 16 Apr 2019 12:33:25 +0000 (+0200)
Subject: mgr/test_orchestrator: Fix 'TestWriteCompletion' object has no attribute 'id'
X-Git-Tag: v14.2.2~159^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e44395ec47d5cb03871130fd09f58806b1a5161c;p=ceph.git

mgr/test_orchestrator: Fix 'TestWriteCompletion' object has no attribute 'id'

Caused by a race between `TestWriteCompletion.__init__() and
  `TestOrchestrator.serve()`

Fixes: https://tracker.ceph.com/issues/39259

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit dcffba933c0f1c488baace46d7ccc4d1b7a192e8)
---

diff --git a/src/pybind/mgr/test_orchestrator/module.py b/src/pybind/mgr/test_orchestrator/module.py
index 131ec85bb6ea..be105f69dfcf 100644
--- a/src/pybind/mgr/test_orchestrator/module.py
+++ b/src/pybind/mgr/test_orchestrator/module.py
@@ -23,6 +23,7 @@ class TestCompletionMixin(object):
         self._complete = False
 
         self.message = message
+        self.id = str(uuid.uuid4())
 
         TestCompletionMixin.all_completions.append(self)
 
@@ -52,7 +53,6 @@ class TestReadCompletion(TestCompletionMixin, orchestrator.ReadCompletion):
 class TestWriteCompletion(TestCompletionMixin, orchestrator.WriteCompletion):
     def __init__(self, cb, message):
         super(TestWriteCompletion, self).__init__(cb, message)
-        self.id = str(uuid.uuid4())
 
     @property
     def is_persistent(self):