database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-08 14:22:09 +03:00
Code Activity

Typo fixes

Browse Source
This commit is contained in:
Alexander Presnyakov
2025-07-16 23:56:40 +00:00
parent d0ee5dae32
commit 285b3c688d
10 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmapi/cmapi_server/__main__.py
View File

@@ -220,10 +220,10 @@ if __name__ == '__main__':
'Something went wrong while trying to detect dbrm protocol.\n'
'Seems "controllernode" process isn\'t started.\n'
'This is just a notification, not a problem.\n'
'Next detection will started at first node\\cluster '
'Next detection will start at first node\\cluster '
'status check.\n'
f'This can cause extra {SOCK_TIMEOUT} seconds delay while\n'
'first attempt to get status.',
f'This can cause extra {SOCK_TIMEOUT} seconds delay during\n'
'this first attempt to get the status.',
exc_info=True
)
else:

6
cmapi/cmapi_server/controllers/endpoints.py
View File

@@ -495,7 +495,7 @@ class ConfigController:
attempts +=1
if attempts >= 10:
module_logger.debug(
'Timed out waiting for node to be ready.'
'Timed out while waiting for the node to become ready.'
)
break
time.sleep(1)
@@ -1204,7 +1204,7 @@ class AppController():
if AppManager.started:
return {'started': True}
else:
raise APIError(503, 'CMAPI not ready to handle requests.')
raise APIError(503, 'CMAPI is not ready to handle requests.')
class NodeProcessController():
@@ -1232,7 +1232,7 @@ class NodeProcessController():
name='DMLProc', is_primary=True, use_sudo=True, timeout=timeout
)
else:
module_logger.debug('Callling stop DMLproc gracefully.')
module_logger.debug('Calling stop DMLproc gracefully.')
try:
MCSProcessManager.gracefully_stop_dmlproc()
except (ConnectionRefusedError, RuntimeError):

6
cmapi/cmapi_server/helpers.py
View File

@@ -346,7 +346,7 @@ def broadcast_new_config(
# TODO: do not restart cluster when put xml config only with
# distribute secrets
if not CEJPasswordHandler.secretsfile_exists():
logging.debug('No .secrets file found so not distrinuting it.')
logging.debug('No .secrets file found so not distributing it.')
else:
secrets = CEJPasswordHandler.get_secrets_json()
body['secrets'] = secrets
@@ -809,7 +809,7 @@ def get_cej_info(config_root):
):
logging.error(
'CrossengineSupport password seems to be encrypted '
'but no .secrets file exist. May be it\'s eventually removed.'
'but no .secrets file exist. Maybe it was eventually removed.'
)
@@ -819,7 +819,7 @@ def get_cej_info(config_root):
else:
logging.error(
'CrossengineSupport password seems to be unencrypted but '
'.secrets file exist. May be .secrets file generated by '
'.secrets file exist. Maybe .secrets file was generated by '
'mistake or password left encrypted after using cskeys '
'utility.'
)

4
cmapi/cmapi_server/process_dispatchers/base.py
View File

@@ -64,7 +64,7 @@ class BaseDispatcher:
encoding='utf-8'
)
except Exception:
logging.error(f'Failed on run command "{command}".', exc_info=True)
logging.error(f'Failed to run command "{command}".', exc_info=True)
# TODO: cmapi have to close with exception here
# to stop docker container?
# raise
@@ -79,7 +79,7 @@ class BaseDispatcher:
del proc
result = (True, output)
else:
logging.debug('Waiting for command to finish.')
logging.debug('Waiting for the command to finish.')
stdout_str, _ = proc.communicate()
returncode = proc.wait()
if stdout_str is not None:

9
cmapi/engine_files/mcs-savebrm.py
View File

@@ -43,7 +43,7 @@ if __name__ == '__main__':
if (storage.lower() != 's3' and master_addr != default_addr) or \
master_addr == default_addr:
is_primary = True
print('Multi-node with local-storage detected.')
print('Multi-node configuration with local storage detected.')
else:
has_requests = False
try:
@@ -55,7 +55,7 @@ master_addr == default_addr:
Please install CMAPI first.')
if has_requests is True:
try:
print('Requesting for the primary node status.')
print('Requesting the status of the primary node.')
api_version = get_version()
api_port = get_port()
url = "https://{}:{}/cmapi/{}/node/primary".format(default_addr, \
@@ -64,12 +64,11 @@ master_addr == default_addr:
verify=False,
timeout=REST_REQUEST_TO)
if (resp.status_code != 200):
print("Error sending GET /node/primary.")
print("Error occurred while sending GET /node/primary.")
else:
is_primary = resp.json()['is_primary'] == 'True'
except:
print('Failed to request.')
print(str(e))
print('Failed to send request.')
if is_primary is True:
try:

4
cmapi/failover/agent_comm.py
View File

@@ -181,7 +181,7 @@ class AgentComm:
self.__runner()
except Exception:
logger.error(
'AgentComm.runner(): got an unrecognised exception.',
'AgentComm.runner(): got an unhandled exception.',
exc_info=True
)
if not self._die:
@@ -227,7 +227,7 @@ class AgentComm:
if needs_transaction:
logger.debug(
'Failover starts transaction to run upcoming event.'
'Failover is starting a transaction to process the upcoming event.'
)
(txn_id, nodes) = self._agent.startTransaction(
extra_nodes=list(nodes_added),

6
cmapi/failover/node_monitor.py
View File

@@ -77,7 +77,7 @@ class NodeMonitor:
)
if not self._die:
time.sleep(1)
self._logger.info("node monitor logic exiting normally...")
self._logger.info("Node monitor logic exited normally...")
def _monitor(self):
"""
@@ -138,7 +138,7 @@ class NodeMonitor:
self._inStandby = False
# has it been deactivated?
else:
self._logger.trace('Node not in active nodes, do nothing.')
self._logger.trace('Node is not in active nodes, no action taken.')
self._inStandby = True
continue # wait to be activated
@@ -191,7 +191,7 @@ class NodeMonitor:
# if we are in a cohort that has <= 50% of the desired nodes, enter standby
if len(activeNodes)/len(desiredNodes) <= 0.5 and len(effectiveActiveNodeList)/len(desiredNodes) <= 0.5:
if not inStandbyMode:
msg = "Only {} out of {} nodes are active. At least {} are required. Entering standby mode to protect the system."\
msg = "Only {} out of {} nodes are active. At least {} are required. Entering standby mode to protect the system."\
.format(len(activeNodes), len(desiredNodes), int(len(desiredNodes)/2) + 1)
self._agentComm.raiseAlarm(msg)
self._logger.critical(msg)

6
cmapi/mcs_cluster_tool/decorators.py
View File

@@ -23,7 +23,7 @@ def handle_output(func):
typer.echo(err.message, err=True)
logger.error('Error during command execution', exc_info=True)
except typer.BadParameter as err:
logger.error('Bad command line parameter.')
logger.error('Invalid command line parameter.')
raise err
except typer.Exit as err: # if some command used typer.Exit
#TODO: think about universal protocol to return json data and
@@ -31,10 +31,10 @@ def handle_output(func):
return_code = err.exit_code
except Exception:
logger.error(
'Undefined error during command execution',
'An undefined error occurred during command execution',
exc_info=True
)
typer.echo('Unknown error, check the log file.', err=True)
typer.echo('An unknown error occurred, please check the log file.', err=True)
raise typer.Exit(return_code)
return wrapper

2
cmapi/mcs_node_control/models/dbrm.py
View File

@@ -41,7 +41,7 @@ class DBRM:
master_conn_info = node_config.get_dbrm_conn_info(root)
if master_conn_info is None:
module_logger.warning(
'DBRB.connect: No DBRM info in the Columnstore.xml.'
'DBRB.connect: No DBRM info found in the Columnstore.xml.'
)
dbrm_host = master_conn_info['IPAddr'] or DEFAULT_HOST
dbrm_port = int(master_conn_info['Port']) or DEFAULT_PORT

2
cmapi/mcs_node_control/models/node_config.py
View File

@@ -256,7 +256,7 @@ class NodeConfig:
# Raise an appropriate exception
module_logger.error(
f'{self.apply_config.__name__} throws an exception.'
'The original config must be restored by '
'The original config must be restored by an '
'explicit ROLLBACK command or timeout.',
exc_info=True
)