Commit: 8da194cd0eaea126a9bee0bc85cef0d471a13631 - rsnappush (hg)

rsync wrapper for pushing incremental backups

Commit MetaInfo

• Revision: 8da194cd0eaea126a9bee0bc85cef0d471a13631 (tree)
• Zeit: 2019-11-13 15:17:56
• Autor: Frank Tobin <ftobin@neve...>
• Commiter: Frank Tobin

Log Message

support storing permissions

Ändern Zusammenfassung

• modified: rsnappush

Diff

diff -r 7c0782056095 -r 8da194cd0eae rsnappush
--- a/rsnappush	Wed Nov 06 00:01:48 2019 -0500
+++ b/rsnappush	Wed Nov 13 01:17:56 2019 -0500
@@ -5,15 +5,19 @@
 
 Author: Frank Tobin
 Email: [e-mail]
+Author URL: https://www.neverending.org/
 License: Eclipse Public License 2.0 (https://opensource.org/licenses/EPL-2.0)
 """
 
 import os
 import re
 import sys
+import lzma
 import time
 import argparse
 import subprocess
+import tempfile
+import shutil
 
 parser = argparse.ArgumentParser(description="Perform file-based incremental rsync push backup with hard-links")
 
@@ -24,10 +28,9 @@
                     help="pass-thru options to rsync.  Use '=' syntax, and include prefixing dashes. Example: --rsync-opt=--partial-dir=/home/user/rsync-partial")
 parser.add_argument("--quiet", "-q", action="store_true", default=False,
                     help="emit less output")
-parser.add_argument("--backup-prefix", default="backup-",
-                    help="Prefix used in directory snapshots; default: 'backup-'")
-parser.add_argument("--compare-n-backups", type=int, default=20,
-                    help="How many previous backups to consider hard-linking against; default: 20 (rsync max)")
+
+backup_prefix = "backup-"
+compare_n_backups = 20
 
 args = parser.parse_args()
 
@@ -40,33 +43,41 @@
     dest_account = None
     dest_path = args.dest
 
-mkdir_cmd = ["mkdir", "-p", dest_path]
-if dest_account:
-    mkdir_cmd = ['ssh', dest_account] + mkdir_cmd
+def ssh_prefix(cmd):
+    if dest_account:
+        cmd = ['ssh', dest_account] + cmd
+    return cmd
+
+def rsync_quietness(cmd):
+    if args.quiet:
+        cmd.append("--quiet")
+    else:
+        cmd.extend(["-v", "--progress"])
+    return cmd
+
+mkdir_cmd = ssh_prefix(["mkdir", "-p", dest_path])
 subprocess.run(mkdir_cmd, check=True)
 
 # check what backups already exist
-check_backups_cmd = ["ls", f"{dest_path}/"]
-if dest_account:
-    check_backups_cmd = ['ssh', dest_account] + check_backups_cmd
+check_backups_cmd = ssh_prefix(["ls", f"{dest_path}/"])
+
 proc = subprocess.run(check_backups_cmd,
                       stdout=subprocess.PIPE, encoding="utf-8", check=True)
-
 link_dests = proc.stdout.splitlines()
-link_dests = list(filter(lambda x: re.search(args.backup_prefix, x), link_dests))
-link_dests = link_dests[-args.compare_n_backups:]
+link_dests = list(filter(lambda x: re.search(backup_prefix, x), link_dests))
+link_dests = link_dests[-compare_n_backups:]
 link_dest_args = list(map(lambda x: f"--link-dest=../{x}", link_dests))
 
-my_dest = time.strftime(f'{args.backup_prefix}%Y%m%d-%H:%M')
+timestamp_str = time.strftime('%Y%m%d-%H%M')
+my_dest = time.strftime(f'{backup_prefix}{timestamp_str}')
 
 cmd = ["rsync", "--human-readable", "-a", "--hard-links",
        "--delete", "--compress-level", "9",
        "-e", "ssh"
 ]
 
-if not args.quiet:
-    cmd.extend(["-v", "--progress"])
 
+cmd = rsync_quietness(cmd)
 cmd.extend(args.rsync_opt)
 cmd.extend(link_dest_args)
 
@@ -75,4 +86,26 @@
 
 if not args.quiet:
     print(*cmd)
-os.execvp(cmd[0], cmd)
+subprocess.run(cmd, check=False) # don't let permissions problems get in the way
+
+with tempfile.NamedTemporaryFile(prefix="rsnappush-perms.") as permissions_file:
+    compressed_perms_file = lzma.open(permissions_file.name, mode="w")
+    
+    get_perms_cmd = ["getfacl", "-R", "--absolute-names", args.source]
+
+    with subprocess.Popen(get_perms_cmd, stdout=subprocess.PIPE) as proc:
+        shutil.copyfileobj(proc.stdout, compressed_perms_file)
+
+    compressed_perms_file.close()
+
+    mkdir_cmd = ssh_prefix(["mkdir", "-p", os.path.join(dest_path, "permissions")])
+    subprocess.run(mkdir_cmd)
+    perms_rsync = ["rsync", "--human-readable", "-a", "-e", "ssh"]
+    perms_rsync = rsync_quietness(perms_rsync)
+    perms_rsync.extend(args.rsync_opt)
+
+    perms_rsync.extend([permissions_file.name,
+                        os.path.join(args.dest, 'permissions', f'permissions-{timestamp_str}.xz')])
+    if not args.quiet:
+        print(*perms_rsync)
+    subprocess.run(perms_rsync, check=True)