mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Replace the remaining "xtrabackup:" references in the code.
This commit is contained in:
Marko Mäkelä 2017-10-25 09:06:45 +03:00
parent db203d7471
commit 909cdafd35
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
extra/mariabackup/fil_cur.cc
View file

@ -1,5 +1,5 @@
/******************************************************
XtraBackup: hot backup tool for InnoDB
MariaBackup: hot backup tool for InnoDB
(c) 2009-2013 Percona LLC and/or its affiliates.
Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
@ -173,7 +173,7 @@ xb_fil_cur_open(
/* The following call prints an error message */
os_file_get_last_error(TRUE);
msg("[%02u] xtrabackup: error: cannot open "
msg("[%02u] mariabackup: error: cannot open "
"tablespace %s\n",
thread_n, cursor->abs_path);
@ -202,7 +202,7 @@ xb_fil_cur_open(
cursor->file = node->handle;
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);
xb_fil_cur_close(cursor);
@ -229,7 +229,7 @@ xb_fil_cur_open(
msg("[%02u] %s is compressed with page size = "
"%lu bytes\n", thread_n, node->name, page_size);
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);
ut_error;
}
@ -300,9 +300,9 @@ xb_fil_cur_read(
offset + to_read == cursor->statinfo.st_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);
msg("[%02u] xtrabackup: Warning: offset = %llu, "
msg("[%02u] mariabackup: Warning: offset = %llu, "
"to_read = %llu\n",
cursor->thread_n,
(unsigned long long) offset,
@ -356,13 +356,13 @@ read_retry:
page_no < (ib_int64_t) FSP_EXTENT_SIZE * 3) {
/* skip doublewrite buffer pages */
xb_a(cursor->page_size == UNIV_PAGE_SIZE);
msg("[%02u] xtrabackup: "
msg("[%02u] mariabackup: "
"Page %lu is a doublewrite buffer page, "
"skipping.\n", cursor->thread_n, page_no);
} else {
retry_count--;
if (retry_count == 0) {
msg("[%02u] xtrabackup: "
msg("[%02u] mariabackup: "
"Error: failed to read page after "
"10 retries. File %s seems to be "
"corrupted.\n", cursor->thread_n,
@ -370,7 +370,7 @@ read_retry:
ret = XB_FIL_CUR_ERROR;
break;
}
msg("[%02u] xtrabackup: "
msg("[%02u] mariabackup: "
"Database page corruption detected at page "
"%lu, retrying...\n", cursor->thread_n,
page_no);

4
extra/mariabackup/write_filt.cc
View file

@ -1,5 +1,5 @@
/******************************************************
XtraBackup: hot backup tool for InnoDB
MariaBackup: hot backup tool for InnoDB
(c) 2009-2013 Percona LLC and/or its affiliates.
Originally Created 3/3/2009 Yasufumi Kinoshita
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,
info.zip_size = cursor->zip_size;
info.space_id = cursor->space_id;
if (!xb_write_delta_metadata(meta_name, &info)) {
msg("[%02u] xtrabackup: Error: "
msg("[%02u] mariabackup: Error: "
"failed to write meta info for %s\n",
cursor->thread_n, cursor->rel_path);
return(FALSE);

23
extra/mariabackup/xtrabackup.cc
View file

@ -1,5 +1,5 @@
/******************************************************
XtraBackup: hot backup tool for InnoDB
MariaBackup: hot backup tool for InnoDB
(c) 2009-2017 Percona LLC and/or its affiliates
Originally Created 3/3/2009 Yasufumi Kinoshita
Written by Alexey Kopytov, Aleksandr Kuzminsky, Stewart Smith, Vadim Tkachenko,
@ -2370,14 +2370,14 @@ xtrabackup_copy_datafile(fil_node_t* node, uint thread_n)
if (write_filter->init != NULL &&
!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);
goto error;
}
dstfile = ds_open(ds_data, dst_name, &cursor.statinfo);
if (dstfile == NULL) {
msg("[%02u] xtrabackup: error: "
msg("[%02u] mariabackup: error: "
"cannot open the destination stream for %s\n",
thread_n, dst_name);
goto error;
@ -2427,7 +2427,7 @@ error:
if (write_filter && write_filter->deinit) {
write_filter->deinit(&write_filt_ctxt);;
}
msg("[%02u] xtrabackup: Error: "
msg("[%02u] mariabackup: Error: "
"xtrabackup_copy_datafile() failed.\n", thread_n);
return(TRUE); /*ERROR*/
@ -2439,10 +2439,10 @@ skip:
if (write_filter && write_filter->deinit) {
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 "
"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);
return(FALSE);
}
@ -2916,7 +2916,7 @@ data_copy_thread_func(
/* copy the datafile */
if(xtrabackup_copy_datafile(node, num)) {
msg("[%02u] xtrabackup: Error: "
msg("[%02u] mariabackup: Error: "
"failed to copy datafile.\n", num);
exit(EXIT_FAILURE);
}
@ -4276,7 +4276,7 @@ retry:
&success,0);
if (!success) {
os_file_get_last_error(TRUE);
msg(" xtrabackup: Fatal error: cannot find %s.\n",
msg("mariabackup: Fatal error: cannot find %s.\n",
src_path);
goto error;
@ -4290,7 +4290,7 @@ retry:
if ( ut_memcmp(log_buf + LOG_FILE_WAS_CREATED_BY_HOT_BACKUP,
(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");
os_file_close(src_file);
@ -4305,8 +4305,7 @@ retry:
goto retry;
}
msg(" xtrabackup: Fatal error: cannot find %s.\n",
src_path);
msg("mariabackup: Fatal error: cannot find %s.\n", src_path);
os_file_close(src_file);
src_file = XB_FILE_UNDEFINED;
@ -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)
usage();
msg("\nxtrabackup: Error: Please set parameter 'datadir'\n");
msg("\nmariabackup: Error: Please set parameter 'datadir'\n");
exit(EXIT_FAILURE);
}