X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ffiles%2Fstatic-mirroring%2Fstatic-master-update-component;h=4ab5143e5b0b44e3fad9aaa64ff6e35f0cde32bf;hb=5dc5997952b5754e99c246f2887057de4ad4b126;hp=2d397df27f5ffbdfa306e83de72d13f109f4c382;hpb=a3d0ee7754397443a449a5916e709ed0f8660ef1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component
index 2d397df27..4ab5143e5 100755
--- a/modules/roles/files/static-mirroring/static-master-update-component
+++ b/modules/roles/files/static-mirroring/static-master-update-component
@@ -91,6 +91,14 @@ if [ -z "$srchost" ] || [ -z "$srcdir" ]; then
   echo >&2 "$0: Invalid component: $component (not found in $componentlist)";
   exit 1
 fi
+
+tgtlock="$masterbase/$component.lock"
+if ! [ -e "$tgtlock" ]; then
+  touch "$tgtlock"
+fi
+echo "$0: Acquiring lock on $tgtlock..."
+lock 203 "$tgtlock" 1
+
 tgt="$masterbase/$component"
 if ! [ -d "$tgt" ]; then
   echo "$0: Creating $tgt for $component";
@@ -103,15 +111,16 @@ else
   src="$srchost:$srcdir"
 fi
 
-echo "$0: Acquiring locks..."
-lock 201 "$tgt" 1
+#echo "$0: Acquiring lock on $tgt..."
+#lock 201 "$tgt" 1
 
 tmpdir_new="$(mktemp -d --tmpdir="$masterbase" "${component}-updating.incoming-XXXXXX")"
 tmpdir_old="$(mktemp -d --tmpdir="$masterbase" "${component}-updating.removing-XXXXXX")"
 trap "rm -rf '$tmpdir_new' '$tmpdir_old'" EXIT
 chmod 0755 "$tmpdir_new"
 
-lock 202 "$tmpdir_new" 1
+#echo "$0: Acquiring lock on $tmpdir_new..."
+#lock 202 "$tmpdir_new" 1
 echo "$0: Got them."
 
 echo "$0: Updating master copy of $component..."
@@ -123,11 +132,11 @@ rsync --delete \
   "$src/." "$tmpdir_new/."
 echo "$0: Done.  Committing."
 
-mv "$tgt" "$tmpdir_old/old"
-if ! mv "$tmpdir_new" "$tgt"; then
+mv --no-target-directory "$tgt" "$tmpdir_old/old"
+if ! mv --no-target-directory "$tmpdir_new" "$tgt"; then
   echo >&2 "$0: WARNING: could not move $tmpdir_new to $tgt.  Trying to recover"
   rm -rf "$tgt"
-  mv "$tmpdir_old/old" "$tgt"
+  mv --no-target-directory "$tmpdir_old/old" "$tgt"
   echo >&2 "$0: Rolled back to old tree, maybe even successfully."
   exit 1
 fi
@@ -136,8 +145,9 @@ rm -rf "$tmpdir_new" "$tmpdir_old"
 trap - EXIT
 
 date '+%s' > "$tgt/.serial"
-unlock 201
-unlock 202
+#unlock 201
+#unlock 202
+unlock 203
 echo "$0: Triggering mirror runs..."
 exec static-master-run "$component"