Merge pull request #209 from openstack-charmers/fix-luminous

charm_tests/ceph/rbd_mirror: Workaround upstream Ceph Luminous bug

.travis.yml

@@ -18,9 +18,10 @@ script:
        sudo snap install juju --classic;
        sudo sh -c 'echo PATH=/snap/bin:$PATH >> /etc/environment';
        sudo lxd waitready;
+       sudo journalctl --no-pager -xe;
        sudo lxd init --auto;
        sudo usermod -a -G lxd travis;
-       sudo su travis -c 'juju bootstrap --no-gui localhost';
+       sudo su travis -c 'juju bootstrap --debug --no-gui localhost';
     fi
   - tox -c tox.ini -e $ENV
   - if [ $ENV = 'func-travis' ]; then

zaza/charm_tests/ceph/rbd_mirror/tests.py

@@ -52,7 +52,7 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
     def get_pools(self):
         """Retrieve list of pools from both sites.
 
-        :returns: Tuple with two dicts representing the pools on each side.
+        :returns: Tuple with list of pools on each side.
         :rtype: tuple
         """
         site_a_pools = zaza.utilities.ceph.get_ceph_pools(
@@ -64,7 +64,7 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
                 'ceph-mon' + self.site_b_app_suffix,
                 model_name=self.site_b_model),
             model_name=self.site_b_model)
-        return site_a_pools, site_b_pools
+        return sorted(site_a_pools.keys()), sorted(site_b_pools.keys())
 
     def wait_for_mirror_state(self, state, application_name=None,
                               model_name=None,
@@ -97,7 +97,9 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
                         break
                     if check_entries_behind_master:
                         m = rep.match(image['description'])
-                        if m and m.group(1) != '0':
+                        # NOTE(fnordahl): Tactical fix for upstream Ceph
+                        # Luminous bug https://tracker.ceph.com/issues/23516
+                        if m and int(m.group(1)) > 42:
                             logging.info('entries_behind_master={}'
                                          .format(m.group(1)))
                             break