From: John Spray <john.spray@redhat.com>
Date: Thu, 7 Sep 2017 13:42:29 +0000 (-0400)
Subject: qa/tasks/mgr: regression test for 21260
X-Git-Tag: v13.0.1~966^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28cb4bb2e68298a8a307eb2de6121b60db43cb86;p=ceph.git

qa/tasks/mgr: regression test for 21260

(aka http://tracker.ceph.com/issues/21260)

Fixes: http://tracker.ceph.com/issues/21260
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/qa/tasks/mgr/test_failover.py b/qa/tasks/mgr/test_failover.py
index c3ac7fb78be..0dd9cb7e8ba 100644
--- a/qa/tasks/mgr/test_failover.py
+++ b/qa/tasks/mgr/test_failover.py
@@ -1,5 +1,6 @@
 
 import logging
+import json
 
 from tasks.mgr.mgr_test_case import MgrTestCase
 
@@ -92,6 +93,15 @@ class TestFailover(MgrTestCase):
             timeout=10
         )
 
+        # Both daemons should have fully populated metadata
+        # (regression test for http://tracker.ceph.com/issues/21260)
+        meta = json.loads(self.mgr_cluster.mon_manager.raw_cluster_cmd(
+            "mgr", "metadata"))
+        id_to_meta = dict([(i['id'], i) for i in meta])
+        for i in [original_active] + original_standbys:
+            self.assertIn(i, id_to_meta)
+            self.assertIn('ceph_version', id_to_meta[i])
+
         # We should be able to fail back over again: the exercises
         # our re-initialization of the python runtime within
         # a single process lifetime.