starlingx
/
config
Code Issues Proposed changes

Revert "Add checks to deny adding secondary tiers before ceph is up" 

This reverts commit b94a088e1f
that is fixing bug 1830191 but is causing bug 1835938

Closes-Bug: 1835938
Change-Id: If28387318e7bedd7f16a2aebfba25a4fb0989bb8
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
This commit is contained in:
Daniel Badea 2019-07-16 19:06:50 +00:00 committed by dbadea
parent 4fe2b6bed5
commit 4fb84ab33a
6 changed files with 21 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py
View File

@ -2308,7 +2308,7 @@ class HostController(rest.RestController):
if (personality is not None and
personality.find(constants.STORAGE_HOSTNAME) != -1 and
not skip_ceph_checks):
num_monitors, required_monitors, __ = \
num_monitors, required_monitors, quorum_names = \
self._ceph.get_monitors_status(pecan.request.dbapi)
if num_monitors < required_monitors:
raise wsme.exc.ClientSideError(_(
@ -2317,7 +2317,7 @@ class HostController(rest.RestController):
"enabled hosts with monitors are required. Please"
" ensure hosts with monitors are unlocked and "
"enabled.") %
(num_monitors, required_monitors))
(num_monitors, constants.MIN_STOR_MONITORS))
# If it is the last storage node to delete, we need to delete
# ceph osd pools and update additional tier status to "defined"
@ -5239,7 +5239,7 @@ class HostController(rest.RestController):
"enabled hosts with monitors are required. Please"
" ensure hosts with monitors are unlocked and "
"enabled.") %
(num_monitors, required_monitors))
(num_monitors, constants.MIN_STOR_MONITORS))
if not force:
# sm-lock-pre-check
@ -5468,7 +5468,7 @@ class HostController(rest.RestController):
_("Can not unlock a storage node without any Storage Volumes configured"))
ceph_helper = ceph.CephApiOperator()
num_monitors, required_monitors, __ = \
num_monitors, required_monitors, quorum_names = \
ceph_helper.get_monitors_status(pecan.request.dbapi)
if num_monitors < required_monitors:
raise wsme.exc.ClientSideError(
@ -5477,7 +5477,7 @@ class HostController(rest.RestController):
"enabled hosts with monitors are required. Please"
" ensure hosts with monitors are unlocked and "
"enabled.") %
(num_monitors, required_monitors))
(num_monitors, constants.MIN_STOR_MONITORS))
# Check Ceph configuration, if it is wiped out (in the Backup & Restore
# process) then restore the configuration.
@ -5773,7 +5773,7 @@ class HostController(rest.RestController):
"enabled hosts with monitors are required. Please"
" ensure hosts with monitors are unlocked and "
"enabled.") %
(num_monitors, required_monitors))
(num_monitors, constants.MIN_STOR_MONITORS))
storage_nodes = pecan.request.dbapi.ihost_get_by_personality(
constants.STORAGE)
@ -5920,7 +5920,7 @@ class HostController(rest.RestController):
"enabled hosts with monitors are required. "
"Please ensure hosts with monitors are "
"unlocked and enabled.") %
(num_monitors, required_monitors))
(num_monitors, constants.MIN_STOR_MONITORS))
def check_unlock_interfaces(self, hostupdate):
"""Semantic check for interfaces on host-unlock."""

2
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage.py
View File

@ -575,7 +575,7 @@ def _check_host(stor):
# semantic check: whether at least 2 unlocked hosts are monitors
if not cutils.is_aio_system(pecan.request.dbapi):
ceph_helper = ceph.CephApiOperator()
num_monitors, required_monitors, __ = \
num_monitors, required_monitors, quorum_names = \
ceph_helper.get_monitors_status(pecan.request.dbapi)
# CGTS 503 for now update monitors requirement until controller-0 is
# inventoried

31
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_tier.py
View File

@ -305,7 +305,7 @@ class StorageTierController(rest.RestController):
raise exception.PatchError(patch=patch, reason=e)
# Semantic Checks
_check(self, "modify", tier.as_dict())
_check("modify", tier.as_dict())
try:
# Update only the fields that have changed
for field in objects.storage_tier.fields:
@ -396,7 +396,7 @@ def _pre_patch_checks(tier_obj, patch_obj):
"cannot be changed.") % tier_obj.name)
def _check(self, op, tier):
def _check(op, tier):
# Semantic checks
LOG.debug("storage_tier: Semantic check for %s operation" % op)
@ -410,16 +410,10 @@ def _check(self, op, tier):
raise wsme.exc.ClientSideError(_("Storage tier (%s) "
"already present." %
tier['name']))
# Deny adding secondary tier if initial configuration is not done.
if not cutils.is_initial_config_complete():
msg = _("Operation denied. Adding secondary tiers to a cluster requires "
"initial configuration to be complete and controller node unlocked.")
raise wsme.exc.ClientSideError(msg)
if cutils.is_aio_system(pecan.request.dbapi):
# Deny adding secondary tiers if primary tier backend is not configured
# for cluster.
# for cluster. When secondary tier is added we also query ceph to create
# pools and set replication therefore cluster has to be up.
clusterId = tier.get('forclusterid') or tier.get('cluster_uuid')
cluster_tiers = pecan.request.dbapi.storage_tier_get_by_cluster(clusterId)
configured = False if cluster_tiers else True
@ -436,20 +430,9 @@ def _check(self, op, tier):
msg = _("Operation denied. Adding secondary tiers to a cluster requires "
"primary tier storage backend of this cluster to be configured.")
raise wsme.exc.ClientSideError(msg)
else:
# Deny adding secondary tier if ceph is down on standard
num_monitors, required_monitors, __ = \
self._ceph.get_monitors_status(pecan.request.dbapi)
if num_monitors < required_monitors:
raise wsme.exc.ClientSideError(_(
"Operation denied. Ceph is not operational. "
"Only %d storage monitor available. "
"At least %s unlocked and enabled hosts with "
"monitors are required. Please ensure hosts "
"with monitors are unlocked and enabled.") %
(num_monitors, required_monitors))
elif op == "delete":
if tier['name'] == constants.SB_TIER_DEFAULT_NAMES[
constants.SB_TIER_TYPE_CEPH]:
raise wsme.exc.ClientSideError(_("Storage Tier %s cannot be "
@ -501,7 +484,7 @@ def _create(self, tier, iprofile=None):
tier = _set_defaults(tier)
# Semantic checks
tier = _check(self, "add", tier)
tier = _check("add", tier)
LOG.info("storage_tier._create with validated params: %s" % tier)
@ -541,7 +524,7 @@ def _delete(self, tier_uuid):
tier = objects.storage_tier.get_by_uuid(pecan.request.context, tier_uuid)
# Semantic checks
_check(self, "delete", tier.as_dict())
_check("delete", tier.as_dict())
# update the crushmap by removing the tier
try:

19
sysinv/sysinv/sysinv/sysinv/common/ceph.py
View File

@ -626,15 +626,13 @@ class CephApiOperator(object):
return True
def get_monitors_status(self, db_api):
# first check that the monitors are available in sysinv
num_active_monitors = 0
num_inv_monitors = 0
if cutils.is_aio_system(pecan.request.dbapi):
required_monitors = constants.MIN_STOR_MONITORS_AIO
else:
required_monitors = constants.MIN_STOR_MONITORS_MULTINODE
required_monitors = constants.MIN_STOR_MONITORS
quorum_names = []
inventory_monitor_names = []
# first check that the monitors are available in sysinv
monitor_list = db_api.ceph_mon_get_list()
for mon in monitor_list:
ihost = db_api.ihost_get(mon['forihostid'])
@ -669,17 +667,10 @@ class CephApiOperator(object):
# the intersection of the sysinv reported unlocked-available monitor
# hosts and the monitors reported in the quorum via the ceph API.
active_monitors = list(set(inventory_monitor_names) & set(quorum_names))
num_active_monitors = len(active_monitors)
if (num_inv_monitors and num_active_monitors == 0 and
cutils.is_initial_config_complete() and
not cutils.is_aio_system(pecan.request.dbapi)):
# The active controller always has a monitor.
# We are on standard or storage, initial configuration
# was completed and Ceph is down so we can't check if
# it is working. Assume it is.
num_active_monitors = 1
LOG.info("Active ceph monitors = %s" % str(active_monitors))
num_active_monitors = len(active_monitors)
return num_active_monitors, required_monitors, active_monitors
def list_osd_pools(self):

3
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -473,8 +473,7 @@ CEPH_AIO_SX_MODEL = 'aio-sx'
CEPH_UNDEFINED_MODEL = 'undefined'
# Storage: Minimum number of monitors
MIN_STOR_MONITORS_MULTINODE = 2
MIN_STOR_MONITORS_AIO = 1
MIN_STOR_MONITORS = 2
BACKUP_OVERHEAD = 20

19
sysinv/sysinv/sysinv/sysinv/tests/api/test_storage_tier.py
View File

@ -33,7 +33,6 @@ from sysinv.conductor import manager
from sysinv.conductor import rpcapi
from sysinv.common import ceph as ceph_utils
from sysinv.common import constants
from sysinv.common import utils as cutils
from sysinv.common.storage_backend_conf import StorageBackendConfig
from sysinv.db import api as dbapi
from sysinv.openstack.common import context
@ -45,17 +44,10 @@ from sysinv.tests.db import utils as dbutils
class StorageTierIndependentTCs(base.FunctionalTest):
set_crushmap_patcher = mock.patch.object(ceph_utils.CephApiOperator, 'set_crushmap')
set_monitors_status_patcher = mock.patch.object(ceph_utils.CephApiOperator, 'get_monitors_status')
set_is_initial_config_patcher = mock.patch.object(cutils, 'is_initial_config_complete')
def setUp(self):
super(StorageTierIndependentTCs, self).setUp()
self.mock_set_crushmap = self.set_crushmap_patcher.start()
self.set_monitors_status_patcher = self.set_monitors_status_patcher.start()
self.set_monitors_status_patcher.return_value = \
[3, 2, ['controller-0', 'controller-1', 'storage-0']]
self.set_is_initial_config_patcher = self.set_is_initial_config_patcher.start()
self.set_is_initial_config_patcher.return_value = True
self.system = dbutils.create_test_isystem()
self.cluster = dbutils.create_test_cluster(system_id=self.system.id, name='ceph_cluster')
self.load = dbutils.create_test_load()
@ -64,8 +56,6 @@ class StorageTierIndependentTCs(base.FunctionalTest):
def tearDown(self):
super(StorageTierIndependentTCs, self).tearDown()
self.set_crushmap_patcher.stop()
self.set_monitors_status_patcher = self.set_monitors_status_patcher.stop()
self.set_is_initial_config_patcher.stop()
def assertDeleted(self, fullPath):
self.get_json(fullPath, expect_errors=True) # Make sure this line raises an error
@ -541,17 +531,10 @@ class StorageTierIndependentTCs(base.FunctionalTest):
class StorageTierDependentTCs(base.FunctionalTest):
set_crushmap_patcher = mock.patch.object(ceph_utils.CephApiOperator, 'set_crushmap')
set_monitors_status_patcher = mock.patch.object(ceph_utils.CephApiOperator, 'get_monitors_status')
set_is_initial_config_patcher = mock.patch.object(cutils, 'is_initial_config_complete')
def setUp(self):
super(StorageTierDependentTCs, self).setUp()
self.mock_set_crushmap = self.set_crushmap_patcher.start()
self.set_monitors_status_patcher = self.set_monitors_status_patcher.start()
self.set_monitors_status_patcher.return_value = \
[3, 2, ['controller-0', 'controller-1', 'storage-0']]
self.set_is_initial_config_patcher = self.set_is_initial_config_patcher.start()
self.set_is_initial_config_patcher.return_value = True
self.service = manager.ConductorManager('test-host', 'test-topic')
self.service.dbapi = dbapi.get_instance()
self.context = context.get_admin_context()
@ -564,8 +547,6 @@ class StorageTierDependentTCs(base.FunctionalTest):
def tearDown(self):
super(StorageTierDependentTCs, self).tearDown()
self.set_crushmap_patcher.stop()
self.set_monitors_status_patcher = self.set_monitors_status_patcher.stop()
self.set_is_initial_config_patcher.stop()
def assertDeleted(self, fullPath):
self.get_json(fullPath, expect_errors=True) # Make sure this line raises an error