Fix #644 secondary restart allows non-empty dir (#645)

- removed secondary_setup, use local files

Author: robnagler

rsconf/component/bkp.py

@@ -29,22 +29,16 @@ def internal_build(self):
         z = jc.bkp
         z.run_u = jc.rsconf_db.root_u
         z.run_d = systemd.unit_run_d(jc, self.name)
-        secondary_setup = None
         if jc.rsconf_db.host == z.primary:
             self._primary(jc, z)
             n = "primary"
         else:
-            secondary_setup = self._secondary(jc, z)
+            self._secondary(jc, z)
             n = "secondary"
         te = z.run_d.join(n)
         systemd.timer_prepare(self, jc, timer_exec=te, on_calendar=z.on_calendar)
         self.install_access(mode="500", owner=z.run_u)
         self.install_resource("bkp/{}.sh".format(n), jc, te)
-        if secondary_setup:
-            self.install_abspath(
-                secondary_setup,
-                z.run_d.join(secondary_setup.purebasename),
-            )
         systemd.timer_enable(self, j2_ctx=jc, run_u=z.run_u)
 
     def _primary(self, jc, z):
@@ -88,4 +82,3 @@ def _primary(self, jc, z):
 
     def _secondary(self, jc, z):
         z.setdefault("secondary_copy_unmount_cmds", "")
-        return z.setdefault("secondary_setup_f", None)

rsconf/package_data/bkp/secondary.sh.jinja

@@ -8,13 +8,14 @@ _snap_root_d=$_mirror_d/secondary_snap
 _restart_f=$_snap_root_d/RESTART
 
 _assert_copy_d() {
+    declare is_restart=$1
     if [[ ! -d $_copy_d ]]; then
         _err "$_copy_d does not exist"
     fi
     if [[ $(_file_sys "$_copy_d") == $(_file_sys "$(dirname "$_copy_d")") ]]; then
         _err "$_copy_d is not on a separate file system; need to run secondary_setup"
     fi
-    if [[ $(ls $_copy_d) ]]; then
+    if [[ ! $is_restart && $(ls $_copy_d) ]]; then
         _err "$_copy_d is not empty"
     fi
 }
@@ -121,7 +122,7 @@ systemctl start bkp.service"
     rm -rf "$_snap_root_d"
     cp -al "$_current_d" "$_snap_root_d"
     touch "$_sentinel_f"
-    _assert_copy_d
+    _assert_copy_d "$is_restart_rv"
 }
 
 _main "$@"

tests/pkcli/build1_data/1.out/srv/host/v9.radia.run/srv/bkp/secondary

@@ -8,13 +8,14 @@ _snap_root_d=$_mirror_d/secondary_snap
 _restart_f=$_snap_root_d/RESTART
 
 _assert_copy_d() {
+    declare is_restart=$1
     if [[ ! -d $_copy_d ]]; then
         _err "$_copy_d does not exist"
     fi
     if [[ $(_file_sys "$_copy_d") == $(_file_sys "$(dirname "$_copy_d")") ]]; then
         _err "$_copy_d is not on a separate file system; need to run secondary_setup"
     fi
-    if [[ $(ls $_copy_d) ]]; then
+    if [[ ! $is_restart && $(ls $_copy_d) ]]; then
         _err "$_copy_d is not empty"
     fi
 }
@@ -121,7 +122,7 @@ systemctl start bkp.service"
     rm -rf "$_snap_root_d"
     cp -al "$_current_d" "$_snap_root_d"
     touch "$_sentinel_f"
-    _assert_copy_d
+    _assert_copy_d "$is_restart_rv"
 }
 
 _main "$@"