s3: Wait longer after failure, pick up any failed pieces later.

diff --git a/s3 b/s3
index 398ce32..6b36ed6 100755 (executable)
--- a/s3
+++ b/s3
@@ -6,7 +6,7 @@
 CURL=/home/mwolson_admin/bin/curl
 HMAC=$(dirname $0)/s3-hmac
 ATTEMPTS=7
-ATTEMPT_WAIT=10
+ATTEMPT_WAIT=1m
 
 # print a message and bail
 die() {

diff --git a/s3.common b/s3.common
index f5f2361..0365beb 100644 (file)
--- a/s3.common
+++ b/s3.common
@@ -44,7 +44,8 @@ function move_over () {
     local dest=$BACKUPDIR/$subdir
     local ret
     split -d -b ${CHUNKSIZE}m - ${file}.
-    for i in ${file}.*; do
+#    for i in ${file}.*; do
+    for i in *.[0-9][0-9]; do
         echo "Transferring $i to S3 ..."
         s3_cmd put $dest/$i $i
         rm -f $i