Merge lp:~hrvojem/percona-xtrabackup/bug1065761-2.0 into lp:percona-xtrabackup/2.0

Proposed by Hrvoje Matijakovic on 2012-10-16
Status: Merged
Approved by: Alexey Kopytov on 2012-10-28
Approved revision: 472
Merged at revision: 475
Proposed branch: lp:~hrvojem/percona-xtrabackup/bug1065761-2.0
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 137 lines (+55/-34)
5 files modified
doc/source/howtos/setting_up_replication.rst (+1/-1)
doc/source/index.rst (+1/-0)
doc/source/innobackupex/creating_a_backup_ibk.rst (+1/-32)
doc/source/xtrabackup-files.rst (+51/-0)
innobackupex (+1/-1)
To merge this branch: bzr merge lp:~hrvojem/percona-xtrabackup/bug1065761-2.0
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2012-10-16 Approve on 2012-10-28
Review via email: mp+129856@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Hrvoje,

Do we really have to duplicate all info from http://www.percona.com/doc/percona-xtrabackup/innobackupex/creating_a_backup_ibk.html on a separate page? Can we link one from another?

If we do have to duplicate it, I would exclude "mysql-stderr" and "mysql-stdout" (those are temporary "under the hood" files which are NOT a part of backup).

I would also improve descriptions for other files, but that should probably be filed and fixed separately.

review: Needs Information
Hrvoje Matijakovic (hrvojem) wrote :

I've linked the content from innobackupex page to the the index and removed the "mysql-stderr" and "mysql-stdout".

Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/source/howtos/setting_up_replication.rst'
--- doc/source/howtos/setting_up_replication.rst 2012-02-02 20:22:08 +0000
+++ doc/source/howtos/setting_up_replication.rst 2012-10-24 18:50:26 +0000
@@ -231,7 +231,7 @@
231.. code-block:: mysql231.. code-block:: mysql
232232
233 TheNEWSlave|mysql> CHANGE MASTER TO 233 TheNEWSlave|mysql> CHANGE MASTER TO
234 MASTER_HOST='$masterip'234 MASTER_HOST='$masterip',
235 MASTER_USER='repl',235 MASTER_USER='repl',
236 MASTER_PASSWORD='$slavepass',236 MASTER_PASSWORD='$slavepass',
237 MASTER_LOG_FILE='TheMaster-bin.000001', 237 MASTER_LOG_FILE='TheMaster-bin.000001',
238238
=== modified file 'doc/source/index.rst'
--- doc/source/index.rst 2012-02-02 20:23:58 +0000
+++ doc/source/index.rst 2012-10-24 18:50:26 +0000
@@ -70,6 +70,7 @@
70 faq70 faq
71 release-notes71 release-notes
72 glossary72 glossary
73 xtrabackup-files
73 trademark-policy74 trademark-policy
7475
75Indices and tables76Indices and tables
7677
=== modified file 'doc/source/innobackupex/creating_a_backup_ibk.rst'
--- doc/source/innobackupex/creating_a_backup_ibk.rst 2012-04-21 07:12:28 +0000
+++ doc/source/innobackupex/creating_a_backup_ibk.rst 2012-10-24 18:50:26 +0000
@@ -23,38 +23,7 @@
2323
24|innobackupex| called |xtrabackup| binary to backup all the data of |InnoDB| tables (see :doc:`../xtrabackup_bin/creating_a_backup` for details on this process) and copied all the table definitions in the database (:term:`.frm` files), data and files related to |MyISAM|, :term:`MERGE <.MRG>` (reference to other tables), :term:`CSV <.CSV>` and :term:`ARCHIVE <.ARM>` tables, along with :term:`triggers <.TRG>` and :term:`database configuration information <.opt>` to a time stamped directory created in the provided path. 24|innobackupex| called |xtrabackup| binary to backup all the data of |InnoDB| tables (see :doc:`../xtrabackup_bin/creating_a_backup` for details on this process) and copied all the table definitions in the database (:term:`.frm` files), data and files related to |MyISAM|, :term:`MERGE <.MRG>` (reference to other tables), :term:`CSV <.CSV>` and :term:`ARCHIVE <.ARM>` tables, along with :term:`triggers <.TRG>` and :term:`database configuration information <.opt>` to a time stamped directory created in the provided path.
2525
26It will also create the following files for convenience on the created directory:26It will also create the :ref:`following files <xtrabackup_files>` for convenience on the created directory.
27
28 * Information related to the backup and the server
29
30 * :file:`xtrabackup_checkpoints`
31 The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.
32
33 * :file:`xtrabackup_binlog_info`
34 The binary log file used by the server and its position at the moment of the backup. Result of the :command:`SHOW MASTER STATUS`.
35
36 * :file:`xtrabackup_binlog_pos_innodb`
37 The binary log file and its current position for |InnoDB| or |XtraDB| tables.
38
39 * :file:`xtrabackup_binary`
40 The |xtrabackup| binary used in the process.
41
42 * :file:`backup-my.cnf`
43 This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is NOT a backup of original :file:`my.cnf`.
44
45 * :file:`xtrabackup_logfile`
46 Contains data needed for running the: :option:`--apply-log`. The bigger this file is the :option:`--apply-log` process will take longer to finish.
47
48 * Information related to the replication environment (if using the :option:`--slave-info` option):
49
50 * :file:`xtrabackup_slave_info`
51 The ``CHANGE MASTER`` statement needed for setting up a slave.
52
53 * The output of :program:`mysqld` during the backup process:
54
55 * :file:`mysql-stderr`
56
57 * :file:`mysql-stdout`
5827
59Other options to consider28Other options to consider
60=========================29=========================
6130
=== added file 'doc/source/xtrabackup-files.rst'
--- doc/source/xtrabackup-files.rst 1970-01-01 00:00:00 +0000
+++ doc/source/xtrabackup-files.rst 2012-10-24 18:50:26 +0000
@@ -0,0 +1,51 @@
1.. _xtrabackup_files :
2
3=====================================
4Index of files created by XtraBackup
5=====================================
6
7* Information related to the backup and the server
8
9 * :file:`backup-my.cnf`
10 This file contains information to start the mini instance of InnoDB during the :option:`--apply-log`. This is **NOT** a backup of original :file:`my.cnf`.
11
12 * :file:`xtrabackup_checkpoints`
13 The type of the backup (e.g. full or incremental), its state (e.g. prepared) and the |LSN| range contained in it. This information is used for incremental backups.
14 Example of the :file:`xtrabackup_checkpoints` after taking a full backup: ::
15
16 backup_type = full-backuped
17 from_lsn = 0
18 to_lsn = 15188961605
19 last_lsn = 15188961605
20
21 Example of the :file:`xtrabackup_checkpoints` after taking an incremental backup: ::
22
23 backup_type = incremental
24 from_lsn = 15188961605
25 to_lsn = 15189350111
26 last_lsn = 15189350111
27
28 * :file:`xtrabackup_binlog_info`
29 The binary log file used by the server and its position at the moment of the backup. Result of the :command:`SHOW MASTER STATUS`.
30
31 * :file:`xtrabackup_binlog_pos_innodb`
32 The binary log file and its current position for |InnoDB| or |XtraDB| tables.
33
34 * :file:`xtrabackup_binary`
35 The |xtrabackup| binary used in the process.
36
37 * :file:`xtrabackup_logfile`
38 Contains data needed for running the: :option:`--apply-log`. The bigger this file is the :option:`--apply-log` process will take longer to finish.
39
40 * :file:`<table_name>.delta.meta`
41 This file is going to be created when performing the incremental backup. It contains the per-table delta metadata: page size, size of compressed page (if the value is 0 it means the tablespace isn't compressed) and space id. Example of this file could looks like this: ::
42
43 page_size = 16384
44 zip_size = 0
45 space_id = 0
46
47* Information related to the replication environment (if using the :option:`--slave-info` option):
48
49 * :file:`xtrabackup_slave_info`
50 The ``CHANGE MASTER`` statement needed for setting up a slave.
51
052
=== modified file 'innobackupex'
--- innobackupex 2012-10-16 15:05:23 +0000
+++ innobackupex 2012-10-24 18:50:26 +0000
@@ -262,7 +262,7 @@
262 my $reason = `cat $mysql_stderr`;262 my $reason = `cat $mysql_stderr`;
263 $mysql_pid = '';263 $mysql_pid = '';
264 # Failed to connect to MySQL264 # Failed to connect to MySQL
265 die "Failed to connect to MySQL server to detect version.\nYou must set xtrabackup version to use with --ibbackup option.\nPossible values are xtrabackup_51 (for MySQL 5.0 and 5.1) or xtrabackup (for MySQL 5.1 with InnoDB plugin or Percona Server)\n";265 die "Failed to connect to MySQL server to detect version.\nYou must set xtrabackup version to use with --ibbackup option.\nPossible values are xtrabackup_51 (for MySQL 5.0 and 5.1), xtrabackup_55 (for MySQL 5.5) or xtrabackup (for MySQL 5.1 with InnoDB plugin or Percona Server)\n";
266 }266 }
267 else{267 else{
268 mysql_close();268 mysql_close();

Subscribers

People subscribed via source and target branches