1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

MCOL-5618: Testing fix + script minor fixes.

- [fix] wrong cooking of .sh invoke string
- [fix] restore_dbrm -> dbrm_restore, backup_dbrm -> dbrm_backup to use same naming in both python wrapper and mcs_backup_manager.sh
- [fix] mathod of checking cmapi online or not in mcs_backup_manager.sh
This commit is contained in:
mariadb-AlanMologorsky
2024-06-05 07:10:54 +03:00
committed by Alan Mologorsky
parent 460826748f
commit c70d206afe
4 changed files with 9 additions and 9 deletions

View File

@ -21,9 +21,9 @@ app = typer.Typer(
app.add_typer(cluster_app.app, name='cluster')
app.add_typer(cmapi_app.app, name='cmapi')
app.command()(backup_commands.backup)
app.command('backup-dbrm')(backup_commands.backup_dbrm)
app.command('backup-dbrm')(backup_commands.dbrm_backup)
app.command()(restore_commands.restore)
app.command('restore-dbrm')(restore_commands.restore_dbrm)
app.command('restore-dbrm')(restore_commands.dbrm_restore)
if __name__ == '__main__':

View File

@ -248,13 +248,13 @@ def backup(
if sh_arg is None:
continue
arguments.append(sh_arg)
cmd = f'{MCS_BACKUP_MANAGER_SH} {" ".join(arguments)}'
cmd = f'{MCS_BACKUP_MANAGER_SH} backup {" ".join(arguments)}'
success, _ = BaseDispatcher.exec_command(cmd, stdout=sys.stdout)
return {'success': success}
@handle_output
def backup_dbrm(
def dbrm_backup(
m: Annotated[
str,
typer.Option(
@ -320,6 +320,6 @@ def backup_dbrm(
if sh_arg is None:
continue
arguments.append(sh_arg)
cmd = f'{MCS_BACKUP_MANAGER_SH} {" ".join(arguments)}'
cmd = f'{MCS_BACKUP_MANAGER_SH} dbrm_backup {" ".join(arguments)}'
success, _ = BaseDispatcher.exec_command(cmd, stdout=sys.stdout)
return {'success': success}

View File

@ -256,13 +256,13 @@ def restore(
if sh_arg is None:
continue
arguments.append(sh_arg)
cmd = f'{MCS_BACKUP_MANAGER_SH} {" ".join(arguments)}'
cmd = f'{MCS_BACKUP_MANAGER_SH} restore {" ".join(arguments)}'
success, _ = BaseDispatcher.exec_command(cmd, stdout=sys.stdout)
return {'success': success}
@handle_output
def restore_dbrm(
def dbrm_restore(
p: Annotated[
str,
typer.Option(
@ -290,6 +290,6 @@ def restore_dbrm(
if sh_arg is None:
continue
arguments.append(sh_arg)
cmd = f'{MCS_BACKUP_MANAGER_SH} {" ".join(arguments)}'
cmd = f'{MCS_BACKUP_MANAGER_SH} dbrm_restore {" ".join(arguments)}'
success, _ = BaseDispatcher.exec_command(cmd, stdout=sys.stdout)
return {'success': success}