Skip to content

M
MariaDB
Commit 909cdafd authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

MDEV-13496 Use "mariabackup" rather than "xtrabackup" in console output 

Replace the remaining "xtrabackup:" references in the code.
parent db203d74
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 23 deletions
extra/mariabackup/fil_cur.cc
View file @ 909cdafd
/****************************************************** /******************************************************
XtraBackup: hot backup tool for InnoDB MariaBackup: hot backup tool for InnoDB
(c) 2009-2013 Percona LLC and/or its affiliates. (c) 2009-2013 Percona LLC and/or its affiliates.
Originally Created 3/3/2009 Yasufumi Kinoshita Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
...@@ -173,7 +173,7 @@ xb_fil_cur_open( ...@@ -173,7 +173,7 @@ xb_fil_cur_open(
/* The following call prints an error message */ /* The following call prints an error message */
os_file_get_last_error(TRUE); os_file_get_last_error(TRUE);
msg("[%02u] xtrabackup: error: cannot open " msg("[%02u] mariabackup: error: cannot open "
"tablespace %s\n", "tablespace %s\n",
thread_n, cursor->abs_path); thread_n, cursor->abs_path);
...@@ -202,7 +202,7 @@ xb_fil_cur_open( ...@@ -202,7 +202,7 @@ xb_fil_cur_open(
cursor->file = node->handle; cursor->file = node->handle;
if (stat(cursor->abs_path, &cursor->statinfo)) { if (stat(cursor->abs_path, &cursor->statinfo)) {
msg("[%02u] xtrabackup: error: cannot stat %s\n", msg("[%02u] mariabackup: error: cannot stat %s\n",
thread_n, cursor->abs_path); thread_n, cursor->abs_path);
xb_fil_cur_close(cursor); xb_fil_cur_close(cursor);
...@@ -229,7 +229,7 @@ xb_fil_cur_open( ...@@ -229,7 +229,7 @@ xb_fil_cur_open(
msg("[%02u] %s is compressed with page size = " msg("[%02u] %s is compressed with page size = "
"%lu bytes\n", thread_n, node->name, page_size); "%lu bytes\n", thread_n, node->name, page_size);
if (page_size_shift < 10 || page_size_shift > 14) { if (page_size_shift < 10 || page_size_shift > 14) {
msg("[%02u] xtrabackup: Error: Invalid " msg("[%02u] mariabackup: Error: Invalid "
"page size: %lu.\n", thread_n, page_size); "page size: %lu.\n", thread_n, page_size);
ut_error; ut_error;
} }
...@@ -300,9 +300,9 @@ xb_fil_cur_read( ...@@ -300,9 +300,9 @@ xb_fil_cur_read(
offset + to_read == cursor->statinfo.st_size) { offset + to_read == cursor->statinfo.st_size) {
if (to_read < (ib_int64_t) cursor->page_size) { if (to_read < (ib_int64_t) cursor->page_size) {
msg("[%02u] xtrabackup: Warning: junk at the end of " msg("[%02u] mariabackup: Warning: junk at the end of "
"%s:\n", cursor->thread_n, cursor->abs_path); "%s:\n", cursor->thread_n, cursor->abs_path);
msg("[%02u] xtrabackup: Warning: offset = %llu, " msg("[%02u] mariabackup: Warning: offset = %llu, "
"to_read = %llu\n", "to_read = %llu\n",
cursor->thread_n, cursor->thread_n,
(unsigned long long) offset, (unsigned long long) offset,
...@@ -356,13 +356,13 @@ xb_fil_cur_read( ...@@ -356,13 +356,13 @@ xb_fil_cur_read(
page_no < (ib_int64_t) FSP_EXTENT_SIZE * 3) { page_no < (ib_int64_t) FSP_EXTENT_SIZE * 3) {
/* skip doublewrite buffer pages */ /* skip doublewrite buffer pages */
xb_a(cursor->page_size == UNIV_PAGE_SIZE); xb_a(cursor->page_size == UNIV_PAGE_SIZE);
msg("[%02u] xtrabackup: " msg("[%02u] mariabackup: "
"Page %lu is a doublewrite buffer page, " "Page %lu is a doublewrite buffer page, "
"skipping.\n", cursor->thread_n, page_no); "skipping.\n", cursor->thread_n, page_no);
} else { } else {
retry_count--; retry_count--;
if (retry_count == 0) { if (retry_count == 0) {
msg("[%02u] xtrabackup: " msg("[%02u] mariabackup: "
"Error: failed to read page after " "Error: failed to read page after "
"10 retries. File %s seems to be " "10 retries. File %s seems to be "
"corrupted.\n", cursor->thread_n, "corrupted.\n", cursor->thread_n,
...@@ -370,7 +370,7 @@ xb_fil_cur_read( ...@@ -370,7 +370,7 @@ xb_fil_cur_read(
ret = XB_FIL_CUR_ERROR; ret = XB_FIL_CUR_ERROR;
break; break;
} }
msg("[%02u] xtrabackup: " msg("[%02u] mariabackup: "
"Database page corruption detected at page " "Database page corruption detected at page "
"%lu, retrying...\n", cursor->thread_n, "%lu, retrying...\n", cursor->thread_n,
page_no); page_no);
......
extra/mariabackup/write_filt.cc
View file @ 909cdafd
/****************************************************** /******************************************************
XtraBackup: hot backup tool for InnoDB MariaBackup: hot backup tool for InnoDB
(c) 2009-2013 Percona LLC and/or its affiliates. (c) 2009-2013 Percona LLC and/or its affiliates.
Originally Created 3/3/2009 Yasufumi Kinoshita Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
...@@ -88,7 +88,7 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name, ...@@ -88,7 +88,7 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name,
info.zip_size = cursor->zip_size; info.zip_size = cursor->zip_size;
info.space_id = cursor->space_id; info.space_id = cursor->space_id;
if (!xb_write_delta_metadata(meta_name, &info)) { if (!xb_write_delta_metadata(meta_name, &info)) {
msg("[%02u] xtrabackup: Error: " msg("[%02u] mariabackup: Error: "
"failed to write meta info for %s\n", "failed to write meta info for %s\n",
cursor->thread_n, cursor->rel_path); cursor->thread_n, cursor->rel_path);
return(FALSE); return(FALSE);
......
extra/mariabackup/xtrabackup.cc
View file @ 909cdafd
/****************************************************** /******************************************************
XtraBackup: hot backup tool for InnoDB MariaBackup: hot backup tool for InnoDB
(c) 2009-2017 Percona LLC and/or its affiliates (c) 2009-2017 Percona LLC and/or its affiliates
Originally Created 3/3/2009 Yasufumi Kinoshita Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko, Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
...@@ -2370,14 +2370,14 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n) ...@@ -2370,14 +2370,14 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n)
if (write_filter->init != NULL && if (write_filter->init != NULL &&
!write_filter->init(&write_filt_ctxt, dst_name, &cursor)) { !write_filter->init(&write_filt_ctxt, dst_name, &cursor)) {
msg("[%02u] xtrabackup: error: " msg("[%02u] mariabackup: error: "
"failed to initialize page write filter.\n", thread_n); "failed to initialize page write filter.\n", thread_n);
goto error; goto error;
} }
dstfile = ds_open(ds_data, dst_name, &cursor.statinfo); dstfile = ds_open(ds_data, dst_name, &cursor.statinfo);
if (dstfile == NULL) { if (dstfile == NULL) {
msg("[%02u] xtrabackup: error: " msg("[%02u] mariabackup: error: "
"cannot open the destination stream for %s\n", "cannot open the destination stream for %s\n",
thread_n, dst_name); thread_n, dst_name);
goto error; goto error;
...@@ -2427,7 +2427,7 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n) ...@@ -2427,7 +2427,7 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n)
if (write_filter && write_filter->deinit) { if (write_filter && write_filter->deinit) {
write_filter->deinit(&write_filt_ctxt);; write_filter->deinit(&write_filt_ctxt);;
} }
msg("[%02u] xtrabackup: Error: " msg("[%02u] mariabackup: Error: "
"xtrabackup_copy_datafile() failed.\n", thread_n); "xtrabackup_copy_datafile() failed.\n", thread_n);
return(TRUE); /*ERROR*/ return(TRUE); /*ERROR*/
...@@ -2439,10 +2439,10 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n) ...@@ -2439,10 +2439,10 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n)
if (write_filter && write_filter->deinit) { if (write_filter && write_filter->deinit) {
write_filter->deinit(&write_filt_ctxt); write_filter->deinit(&write_filt_ctxt);
} }
msg("[%02u] xtrabackup: Warning: We assume the " msg("[%02u] mariabackup: Warning: We assume the "
"table was dropped during xtrabackup execution " "table was dropped during xtrabackup execution "
"and ignore the file.\n", thread_n); "and ignore the file.\n", thread_n);
msg("[%02u] xtrabackup: Warning: skipping tablespace %s.\n", msg("[%02u] mariabackup: Warning: skipping tablespace %s.\n",
thread_n, node_name); thread_n, node_name);
return(FALSE); return(FALSE);
} }
...@@ -2916,7 +2916,7 @@ data_copy_thread_func( ...@@ -2916,7 +2916,7 @@ data_copy_thread_func(
/* copy the datafile */ /* copy the datafile */
if(xtrabackup_copy_datafile(node, num)) { if(xtrabackup_copy_datafile(node, num)) {
msg("[%02u] xtrabackup: Error: " msg("[%02u] mariabackup: Error: "
"failed to copy datafile.\n", num); "failed to copy datafile.\n", num);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
...@@ -4276,7 +4276,7 @@ xtrabackup_init_temp_log(void) ...@@ -4276,7 +4276,7 @@ xtrabackup_init_temp_log(void)
&success,0); &success,0);
if (!success) { if (!success) {
os_file_get_last_error(TRUE); os_file_get_last_error(TRUE);
msg(" xtrabackup: Fatal error: cannot find %s.\n", msg("mariabackup: Fatal error: cannot find %s.\n",
src_path); src_path);
goto error; goto error;
...@@ -4290,7 +4290,7 @@ xtrabackup_init_temp_log(void) ...@@ -4290,7 +4290,7 @@ xtrabackup_init_temp_log(void)
if ( ut_memcmp(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP, if ( ut_memcmp(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP,
(byte*)"xtrabkup", (sizeof "xtrabkup") - 1) == 0) { (byte*)"xtrabkup", (sizeof "xtrabkup") - 1) == 0) {
msg(" xtrabackup: 'ib_logfile0' seems to be " msg("mariabackup: 'ib_logfile0' seems to be "
"'xtrabackup_logfile'. will retry.\n"); "'xtrabackup_logfile'. will retry.\n");
os_file_close(src_file); os_file_close(src_file);
...@@ -4305,8 +4305,7 @@ xtrabackup_init_temp_log(void) ...@@ -4305,8 +4305,7 @@ xtrabackup_init_temp_log(void)
goto retry; goto retry;
} }
msg(" xtrabackup: Fatal error: cannot find %s.\n", msg("mariabackup: Fatal error: cannot find %s.\n", src_path);
src_path);
os_file_close(src_file); os_file_close(src_file);
src_file = XB_FILE_UNDEFINED; src_file = XB_FILE_UNDEFINED;
...@@ -6467,7 +6466,7 @@ int main(int argc, char **argv) ...@@ -6467,7 +6466,7 @@ int main(int argc, char **argv)
if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) { if ((!xtrabackup_print_param) && (!xtrabackup_prepare) && (strcmp(mysql_data_home, "./") == 0)) {
if (!xtrabackup_print_param) if (!xtrabackup_print_param)
usage(); usage();
msg("\nxtrabackup: Error: Please set parameter 'datadir'\n"); msg("\nmariabackup: Error: Please set parameter 'datadir'\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7