Percona XtraBackup moved to https://jira.percona.com/projects/PXB

Merge lp:~akopytov/percona-xtrabackup/bug977998 into lp:percona-xtrabackup/2.0

  1. bug977998
  2. Merge into 2.0
Proposed by Alexey Kopytov
Status: Merged
Approved by: Sergei Glushchenko
Approved revision: no longer in the source branch.
Merged at revision: 421
Proposed branch: lp:~akopytov/percona-xtrabackup/bug977998
Merge into: lp:percona-xtrabackup/2.0
Diff against target: 38 lines (+9/-2)
2 files modified
src/libarchive/libarchive/archive_write_set_format_pax.c (+6/-0)
src/stream.c (+3/-2)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug977998
Reviewer Review Type Date Requested Status
Sergei Glushchenko (community) Approve
Review via email: mp+103072@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

http://jenkins.percona.com/view/Percona Xtrabackup/job/percona-xtrabackup-param/178/

Revision history for this message
Sergei Glushchenko (sergei.glushchenko) wrote :

Approve. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/libarchive/libarchive/archive_write_set_format_pax.c'
2--- src/libarchive/libarchive/archive_write_set_format_pax.c 2012-02-10 20:05:56 +0000
3+++ src/libarchive/libarchive/archive_write_set_format_pax.c 2012-04-23 10:23:19 +0000
4@@ -816,12 +816,18 @@
5 /* Include star-compatible metadata info. */
6 /* Note: "SCHILY.dev{major,minor}" are NOT the
7 * major/minor portions of "SCHILY.dev". */
8+ /* Skip the SCHILY attributes, as they are ignored
9+ by GNU tar and cause warnings. Since GNU tar is a requirement
10+ for unpacking XtraBackup tar streams anyway, we can safely
11+ assume those attributes are never used. */
12+#if 0
13 add_pax_attr_int(&(pax->pax_header), "SCHILY.dev",
14 archive_entry_dev(entry_main));
15 add_pax_attr_int(&(pax->pax_header), "SCHILY.ino",
16 archive_entry_ino64(entry_main));
17 add_pax_attr_int(&(pax->pax_header), "SCHILY.nlink",
18 archive_entry_nlink(entry_main));
19+#endif
20
21 /* Store extended attributes */
22 archive_write_pax_header_xattrs(pax, entry_original);
23
24=== modified file 'src/stream.c'
25--- src/stream.c 2012-02-10 20:05:56 +0000
26+++ src/stream.c 2012-04-23 10:23:19 +0000
27@@ -88,8 +88,9 @@
28 }
29
30 if (archive_write_set_compression_none(a) != ARCHIVE_OK ||
31- archive_write_set_format_ustar(a) != ARCHIVE_OK) {
32- msg("failed to set libarchive stream options.\n");
33+ archive_write_set_format_pax_restricted(a) != ARCHIVE_OK) {
34+ msg("failed to set libarchive stream options: %s\n",
35+ archive_error_string(a));
36 archive_write_finish(a);
37 goto err;
38 }

Subscribers

People subscribed via source and target branches