openstack
/
charms.ceph
Code Issues Proposed changes

Move unit tests to shared library and remove dependence on utils code

This commit is contained in:
Chris Holcombe 2016-09-07 13:31:23 -07:00
parent 6e2431dd83
commit 33d1d35e7a
4 changed files with 409 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ceph/__init__.py
View File

@ -50,10 +50,6 @@ from charmhelpers.contrib.storage.linux.utils import (
zap_disk,
is_device_mounted)
from utils import (
get_unit_hostname,
)
LEADER = 'leader'
PEON = 'peon'
QUORUM = [LEADER, PEON]
@ -572,7 +568,7 @@ def error_out(msg):
def is_quorum():
asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
asok = "/var/run/ceph/ceph-mon.{}.asok".format(socket.gethostname())
cmd = [
"sudo",
"-u",
@ -599,7 +595,7 @@ def is_quorum():
def is_leader():
asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
asok = "/var/run/ceph/ceph-mon.{}.asok".format(socket.gethostname())
cmd = [
"sudo",
"-u",
@ -632,7 +628,7 @@ def wait_for_quorum():
def add_bootstrap_hint(peer):
asok = "/var/run/ceph/ceph-mon.{}.asok".format(get_unit_hostname())
asok = "/var/run/ceph/ceph-mon.{}.asok".format(socket.gethostname())
cmd = [
"sudo",
"-u",
@ -979,7 +975,7 @@ def get_named_key(name, caps=None, pool_list=None):
'--name', 'mon.',
'--keyring',
'/var/lib/ceph/mon/ceph-{}/keyring'.format(
get_unit_hostname()
socket.gethostname()
),
'auth', 'get-or-create', 'client.{}'.format(name),
]
@ -1015,7 +1011,7 @@ def systemd():
def bootstrap_monitor_cluster(secret):
hostname = get_unit_hostname()
hostname = socket.gethostname()
path = '/var/lib/ceph/mon/ceph-{}'.format(hostname)
done = '{}/done'.format(path)
if systemd():
@ -1060,7 +1056,7 @@ def bootstrap_monitor_cluster(secret):
def update_monfs():
hostname = get_unit_hostname()
hostname = socket.gethostname()
monfs = '/var/lib/ceph/mon/ceph-{}'.format(hostname)
if systemd():
init_marker = '{}/systemd'.format(monfs)

1
test-requirements.txt
View File

@ -7,3 +7,4 @@ flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
charm-tools>=2.0.0
requests==2.6.0
netifaces

190
unit_tests/test_mon_upgrade_roll.py Normal file
View File

@ -0,0 +1,190 @@
# Copyright 2016 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import unittest
import sys
import time
from mock import patch, call, MagicMock
import ceph
# python-apt is not installed as part of test-requirements but is imported by
# some charmhelpers modules so create a fake import.
mock_apt = MagicMock()
sys.modules['apt'] = mock_apt
mock_apt.apt_pkg = MagicMock()
def config_side_effect(*args):
if args[0] == 'source':
return 'cloud:trusty-kilo'
elif args[0] == 'key':
return 'key'
elif args[0] == 'release-version':
return 'cloud:trusty-kilo'
previous_node_start_time = time.time() - (9 * 60)
def monitor_key_side_effect(*args):
if args[1] == \
'mon_ip-192-168-1-2_0.94.1_done':
return False
elif args[1] == \
'mon_ip-192-168-1-2_0.94.1_start':
# Return that the previous node started 9 minutes ago
return previous_node_start_time
class UpgradeRollingTestCase(unittest.TestCase):
@patch('time.time')
@patch('ceph.log')
@patch('ceph.upgrade_monitor')
@patch('ceph.monitor_key_set')
def test_lock_and_roll(self, monitor_key_set, upgrade_monitor, log, time):
time.return_value = 1473279502.688828
monitor_key_set.monitor_key_set.return_value = None
ceph.lock_and_roll(my_name='ip-192-168-1-2',
version='0.94.1',
service='mon',
upgrade_key='admin')
upgrade_monitor.assert_called_once_with()
log.assert_has_calls(
[
call('monitor_key_set '
'mon_ip-192-168-1-2_0.94.1_start 1473279502.69'),
call('Rolling'),
call('Done')
])
@patch('ceph.apt_install')
@patch('ceph.chownr')
@patch('ceph.service_stop')
@patch('ceph.service_start')
@patch('ceph.log')
@patch('ceph.status_set')
@patch('ceph.apt_update')
@patch('ceph.add_source')
@patch('ceph.get_local_mon_ids')
@patch('ceph.systemd')
@patch('ceph.ceph_user')
@patch('ceph.get_version')
@patch('ceph.config')
def test_upgrade_monitor(self, config, get_version, ceph_user, systemd,
local_mons, add_source, apt_update, status_set,
log, service_start, service_stop, chownr,
apt_install):
print "Upgrading monitor"
get_version.return_value = "0.80"
config.side_effect = config_side_effect
ceph_user.return_value = "ceph"
systemd.return_value = False
local_mons.return_value = ['a']
ceph.upgrade_monitor()
service_stop.assert_called_with('ceph-mon-all')
service_start.assert_called_with('ceph-mon-all')
add_source.assert_called_with('cloud:trusty-kilo', 'key')
log.assert_has_calls(
[
call('Current ceph version is 0.80'),
call('Upgrading to: cloud:trusty-kilo')
]
)
status_set.assert_has_calls([
call('maintenance', 'Upgrading monitor'),
call('active', '')
])
chownr.assert_has_calls(
[
call(group='ceph', owner='ceph', path='/var/lib/ceph')
]
)
@patch('ceph.get_version')
@patch('ceph.status_set')
@patch('ceph.lock_and_roll')
@patch('ceph.wait_on_previous_node')
@patch('ceph.get_mon_map')
@patch('ceph.socket')
def test_roll_monitor_cluster_second(self,
socket,
get_mon_map,
wait_on_previous_node,
lock_and_roll,
status_set,
get_version):
get_version.return_value = "0.94.1"
wait_on_previous_node.return_value = None
socket.gethostname.return_value = "ip-192-168-1-3"
get_mon_map.return_value = {
'monmap': {
'mons': [
{
'name': 'ip-192-168-1-2',
},
{
'name': 'ip-192-168-1-3',
},
]
}
}
ceph.roll_monitor_cluster(new_version='0.94.1',
upgrade_key='admin')
status_set.assert_called_with(
'blocked',
'Waiting on ip-192-168-1-2 to finish upgrading')
lock_and_roll.assert_called_with(my_name='ip-192-168-1-3',
service='mon',
upgrade_key='admin',
version='0.94.1')
@patch('ceph.log')
@patch.object(ceph, 'time')
@patch('ceph.monitor_key_get')
@patch('ceph.monitor_key_exists')
def test_wait_on_previous_node(self, monitor_key_exists, monitor_key_get,
mock_time, log):
tval = [previous_node_start_time]
def fake_time():
tval[0] += 100
return tval[0]
mock_time.time.side_effect = fake_time
monitor_key_get.side_effect = monitor_key_side_effect
monitor_key_exists.return_value = False
ceph.wait_on_previous_node(previous_node="ip-192-168-1-2",
version='0.94.1',
service='mon',
upgrade_key='admin')
# Make sure we checked to see if the previous node started
monitor_key_get.assert_has_calls(
[call('admin', 'mon_ip-192-168-1-2_0.94.1_start')]
)
# Make sure we checked to see if the previous node was finished
monitor_key_exists.assert_has_calls(
[call('admin', 'mon_ip-192-168-1-2_0.94.1_done')]
)
# Make sure we waited at last once before proceeding
log.assert_has_calls(
[call('Previous node is: ip-192-168-1-2')],
[call('ip-192-168-1-2 is not finished. Waiting')],
)
self.assertEqual(tval[0], previous_node_start_time + 700)

212
unit_tests/test_osd_upgrade_roll.py Normal file
View File

@ -0,0 +1,212 @@
# Copyright 2016 Canonical Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import time
import unittest
from mock import patch, call
import ceph
from ceph import CrushLocation
TO_PATCH = [
'apt_install',
'apt_update',
'add_source',
'config',
'ceph',
'get_conf',
'hookenv',
'host',
'log',
'service_start',
'service_stop',
'socket',
'status_set',
'chownr',
]
def config_side_effect(*args):
if args[0] == 'source':
return 'cloud:trusty-kilo'
elif args[0] == 'key':
return 'key'
elif args[0] == 'release-version':
return 'cloud:trusty-kilo'
previous_node_start_time = time.time() - (9 * 60)
def monitor_key_side_effect(*args):
if args[1] == \
'ip-192-168-1-2_0.94.1_done':
return False
elif args[1] == \
'ip-192-168-1-2_0.94.1_start':
# Return that the previous node started 9 minutes ago
return previous_node_start_time
class UpgradeRollingTestCase(unittest.TestCase):
@patch('ceph.apt_install')
@patch('ceph.chownr')
@patch('ceph.service_stop')
@patch('ceph.service_start')
@patch('ceph.log')
@patch('ceph.status_set')
@patch('ceph.apt_update')
@patch('ceph.add_source')
@patch('ceph.get_local_osd_ids')
@patch('ceph.systemd')
@patch('ceph.ceph_user')
@patch('ceph.get_version')
@patch('ceph.config')
def test_upgrade_osd(self, config, get_version, ceph_user, systemd,
local_osds, add_source, apt_update, status_set,
log, service_start, service_stop, chownr,
apt_install):
config.side_effect = config_side_effect
get_version.return_value = "0.80"
ceph_user.return_value = "ceph"
systemd.return_value = False
local_osds.return_value = [0, 1, 2]
ceph.upgrade_osd()
service_stop.assert_called_with('ceph-osd-all')
service_start.assert_called_with('ceph-osd-all')
status_set.assert_has_calls([
call('maintenance', 'Upgrading osd'),
])
log.assert_has_calls(
[
call('Current ceph version is 0.80'),
call('Upgrading to: cloud:trusty-kilo')
]
)
chownr.assert_has_calls(
[
call(group='ceph', owner='ceph', path='/var/lib/ceph')
]
)
@patch('ceph.socket')
@patch('ceph.get_osd_tree')
@patch('ceph.log')
@patch('ceph.lock_and_roll')
@patch('ceph.get_upgrade_position')
def test_roll_osd_cluster_first(self,
get_upgrade_position,
lock_and_roll,
log,
get_osd_tree,
socket):
socket.gethostname.return_value = "ip-192-168-1-2"
get_osd_tree.return_value = ""
get_upgrade_position.return_value = 0
ceph.roll_osd_cluster(new_version='0.94.1',
upgrade_key='osd-upgrade')
log.assert_has_calls(
[
call('roll_osd_cluster called with 0.94.1'),
call('osd_sorted_list: []'),
call('upgrade position: 0')
]
)
lock_and_roll.assert_called_with(my_name="ip-192-168-1-2",
version="0.94.1",
upgrade_key='osd-upgrade',
service='osd')
@patch('ceph.get_osd_tree')
@patch('ceph.socket')
@patch('ceph.status_set')
@patch('ceph.lock_and_roll')
@patch('ceph.get_upgrade_position')
@patch('ceph.wait_on_previous_node')
def test_roll_osd_cluster_second(self,
wait_on_previous_node,
get_upgrade_position,
lock_and_roll,
status_set,
socket,
get_osd_tree):
wait_on_previous_node.return_value = None
socket.gethostname.return_value = "ip-192-168-1-3"
get_osd_tree.return_value = [
CrushLocation(
name="ip-192-168-1-2",
identifier='a',
host='host-a',
rack='rack-a',
row='row-a',
datacenter='dc-1',
chassis='chassis-a',
root='ceph'),
CrushLocation(
name="ip-192-168-1-3",
identifier='a',
host='host-b',
rack='rack-a',
row='row-a',
datacenter='dc-1',
chassis='chassis-a',
root='ceph')
]
get_upgrade_position.return_value = 1
ceph.roll_osd_cluster(new_version='0.94.1',
upgrade_key='osd-upgrade')
status_set.assert_called_with(
'blocked',
'Waiting on ip-192-168-1-2 to finish upgrading')
lock_and_roll.assert_called_with(my_name='ip-192-168-1-3',
service='osd',
upgrade_key='osd-upgrade',
version='0.94.1')
"""
@patch('ceph.log')
@patch('time.time', lambda *args: previous_node_start_time + 10 * 60 + 1)
@patch('ceph.monitor_key_get')
@patch('ceph.monitor_key_exists')
def test_wait_on_previous_node(self,
monitor_key_exists,
monitor_key_get,
log):
monitor_key_get.side_effect = monitor_key_side_effect
monitor_key_exists.return_value = False
ceph.wait_on_previous_node(previous_node="ip-192-168-1-2",
version='0.94.1',
service='osd',
upgrade_key='osd-upgrade')
# Make sure we checked to see if the previous node started
monitor_key_get.assert_has_calls(
[call('osd-upgrade', 'ip-192-168-1-2_0.94.1_start')]
)
# Make sure we checked to see if the previous node was finished
monitor_key_exists.assert_has_calls(
[call('osd-upgrade', 'ip-192-168-1-2_0.94.1_done')]
)
# Make sure we waited at last once before proceeding
log.assert_has_calls(
[call('Previous node is: ip-192-168-1-2')],
[call('ip-192-168-1-2 is not finished. Waiting')],
)
"""