openstack
/
charm-ceph-osd
Code Issues Proposed changes

Ensure upgrade keyring exists prior to upgrade checks 

During ceph to ceph-osd/ceph-mon migrations, the bootstrap keyring
for the cluster will be in place as the ceph-osd units are started
alongside existing ceph units.

Switch this check to look for the upgrade keyring, which won't be
in place until the ceph-osd <-> ceph-mon relation is complete, at
which point in time a) the unit has the correct access to perform
the upgrade and b) the previous/current version check code will
not trip over due to the previous value of the source option
being None, resulting in a fallback to 'distro' as the previous
source of ceph.

Change-Id: I10895c60aeb543a10461676e4455ed6b5e2fdb46
Closes-Bug: 1729369
This commit is contained in:
James Page 2017-11-01 16:35:17 +00:00
parent d18c17186b
commit 36d5e14d17
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
.project
.tox
.testrepository
.stestr
bin
*.sw[nop]
*.pyc

4
hooks/ceph_hooks.py
View File

@ -82,8 +82,8 @@ STORAGE_MOUNT_PATH = '/var/lib/ceph'
def check_for_upgrade():
if not ceph.is_bootstrapped():
log("Ceph is not bootstrapped, skipping upgrade checks.")
if not os.path.exists(ceph._upgrade_keyring):
log("Ceph upgrade keyring not detected, skipping upgrade checks.")
return
c = hookenv.config()

24
unit_tests/test_upgrade.py
View File

@ -19,16 +19,16 @@ def config_side_effect(*args):
class UpgradeRollingTestCase(unittest.TestCase):
@patch('ceph_hooks.ceph.dirs_need_ownership_update')
@patch('ceph_hooks.ceph.is_bootstrapped')
@patch('ceph_hooks.os.path.exists')
@patch('ceph_hooks.ceph.resolve_ceph_version')
@patch('ceph_hooks.emit_cephconf')
@patch('ceph_hooks.hookenv')
@patch('ceph_hooks.ceph.roll_osd_cluster')
def test_check_for_upgrade(self, roll_osd_cluster, hookenv,
emit_cephconf, version, is_bootstrapped,
emit_cephconf, version, exists,
dirs_need_ownership_update):
dirs_need_ownership_update.return_value = False
is_bootstrapped.return_value = True
exists.return_value = True
version.side_effect = ['firefly', 'hammer']
previous_mock = MagicMock().return_value
previous_mock.previous.return_value = "cloud:trusty-juno"
@ -40,19 +40,21 @@ class UpgradeRollingTestCase(unittest.TestCase):
upgrade_key='osd-upgrade')
emit_cephconf.assert_has_calls([call(upgrading=True),
call(upgrading=False)])
exists.assert_called_with(
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")
@patch('ceph_hooks.ceph.dirs_need_ownership_update')
@patch('ceph_hooks.ceph.is_bootstrapped')
@patch('ceph_hooks.os.path.exists')
@patch('ceph_hooks.ceph.resolve_ceph_version')
@patch('ceph_hooks.emit_cephconf')
@patch('ceph_hooks.hookenv')
@patch('ceph_hooks.ceph.roll_osd_cluster')
def test_resume_failed_upgrade(self, roll_osd_cluster,
hookenv, emit_cephconf, version,
is_bootstrapped,
exists,
dirs_need_ownership_update):
dirs_need_ownership_update.return_value = True
is_bootstrapped.return_value = True
exists.return_value = True
version.side_effect = ['jewel', 'jewel']
check_for_upgrade()
@ -61,15 +63,17 @@ class UpgradeRollingTestCase(unittest.TestCase):
upgrade_key='osd-upgrade')
emit_cephconf.assert_has_calls([call(upgrading=True),
call(upgrading=False)])
exists.assert_called_with(
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")
@patch('ceph_hooks.ceph.is_bootstrapped')
@patch('ceph_hooks.os.path.exists')
@patch('ceph_hooks.ceph.resolve_ceph_version')
@patch('ceph_hooks.hookenv')
@patch('ceph_hooks.ceph.roll_monitor_cluster')
def test_check_for_upgrade_not_bootstrapped(self, roll_monitor_cluster,
hookenv,
version, is_bootstrapped):
is_bootstrapped.return_value = False
version, exists):
exists.return_value = False
version.side_effect = ['firefly', 'hammer']
previous_mock = MagicMock().return_value
previous_mock.previous.return_value = "cloud:trusty-juno"
@ -78,3 +82,5 @@ class UpgradeRollingTestCase(unittest.TestCase):
check_for_upgrade()
roll_monitor_cluster.assert_not_called()
exists.assert_called_with(
"/var/lib/ceph/osd/ceph.client.osd-upgrade.keyring")