You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-01 06:46:55 +03:00
Review fixes.
This commit is contained in:
committed by
Alan Mologorsky
parent
aa57a7684c
commit
d17fc7d9be
@ -351,13 +351,14 @@ class ConfigController:
|
||||
# the config file or apply the changes
|
||||
is_test = request_body.get('test', False)
|
||||
|
||||
mandatory = [request_revision, request_manager, request_timeout]
|
||||
mandatory = (request_revision, request_manager, request_timeout)
|
||||
if None in mandatory:
|
||||
raise_422_error(
|
||||
module_logger, func_name, 'Mandatory attribute is missing.')
|
||||
|
||||
request_mode = request_body.get('cluster_mode', None)
|
||||
request_config = request_body.get('config', None)
|
||||
xml_config = request_body.get('config', None)
|
||||
sm_config = request_body.get('sm_config', None)
|
||||
mcs_config_filename = request_body.get(
|
||||
'mcs_config_filename', DEFAULT_MCS_CONF_PATH
|
||||
)
|
||||
@ -366,9 +367,12 @@ class ConfigController:
|
||||
)
|
||||
secrets = request_body.get('secrets', None)
|
||||
|
||||
if request_mode is None and request_config is None:
|
||||
operation_params = (request_mode, xml_config, secrets)
|
||||
# if no operation to apply, return 422
|
||||
if not any(operation_params):
|
||||
raise_422_error(
|
||||
module_logger, func_name, 'Mandatory attribute is missing.'
|
||||
module_logger, func_name,
|
||||
'Mandatory attribute is missing.'
|
||||
)
|
||||
|
||||
request_headers = cherrypy.request.headers
|
||||
@ -394,11 +398,10 @@ class ConfigController:
|
||||
request_response = {'timestamp': str(datetime.now())}
|
||||
|
||||
if secrets:
|
||||
#TODO: validate incoming secrets?
|
||||
CEJPasswordHandler().save_secrets(secrets)
|
||||
|
||||
node_config = NodeConfig()
|
||||
xml_config = request_body.get('config', None)
|
||||
sm_config = request_body.get('sm_config', None)
|
||||
if is_test:
|
||||
return request_response
|
||||
if request_mode is not None:
|
||||
|
Reference in New Issue
Block a user