[snapshot/master] Now that we use postgresql replication for the metadata we no longer need to sync all the mirrorrun dumps around and import then on mirrors
---
master/import-run | 3 ++-
mirror/sync-incremental | 9 ++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/master/import-run b/master/import-run
index 3ee3853..9e32d77 100755
--- a/master/import-run
+++ b/master/import-run
@@ -30,7 +30,8 @@ case "$archive" in
fi
snapshot import --config "$CONFIG" --archive "$archive" --path /srv/mirrors/"$archive" $quick $verbose
rm -f "$force_slow_flag"
- snapshot dumpall --config "$CONFIG"
+ #snapshot dumpall --config "$CONFIG"
+ "$BASE"/code/misc/dump-tools/add-new-dumps-to-git -c "$CONFIG" -b "$BASE"/dumps-git
ssh -i "$BASE"/.ssh/id-trigger -f stabile sync-incremental < /dev/null > /dev/null 2>&1 &
diff --git a/mirror/sync-incremental b/mirror/sync-incremental
index 2407919..774c206 100755
--- a/mirror/sync-incremental
+++ b/mirror/sync-incremental
@@ -25,11 +25,10 @@ trap "rm -f '$LOCKFILE'" EXIT
while [ -e "$SYNC_REQUIRED" ] ; do
rm -f "$SYNC_REQUIRED"
- rsync -az --exclude '*.tmp.*' snapshot-master.debian.org:dumps/ "$HOME"/master-dumps/ $v
+ #rsync -az --exclude '*.tmp.*' snapshot-master.debian.org:dumps/ "$HOME"/master-dumps/ $v
+ #$BASE/mirror/import-new-dumps -c "$CONF" -s ~/code/snapshot $v
- $BASE/mirror/import-new-dumps -c "$CONF" -s ~/code/snapshot $v &
- $BASE/mirror/farm-journal-fetch-tarball -c "$CONF" $v &
- wait
+ $BASE/mirror/farm-journal-fetch-tarball -c "$CONF" $v
- $BASE/snapshot --config "$CONF" --verbose --quick index
+ #$BASE/snapshot --config "$CONF" --verbose --quick index
done
--
1.7.2.3
Reply to: