V2.64 (mozilla-releng#915)

* Remove quotes around releases where statement that were breaking the query.

* Ensure $DELETED is always an integer in cleanup script.

* Check manage-db.py return code.

* Version bump.

scripts/manage-db.py

@@ -172,7 +172,7 @@ def extract_active_data(trans, url, dump_location="dump.sql"):
             for batched_release_list in batch_generator:
                 query = ", ".join("'" + names + "'" for names in batched_release_list)
                 cmd = mysql_data_only_command(host, user, password, db, "releases").split()
-                cmd.append('--where="releases.name IN ({})"'.format(query))
+                cmd.append("--where=releases.name IN ({})".format(query))
                 run(cmd, stdout=dump_file, check=True)
 
         cmd = mysql_data_only_command(host, user, password, db, "releases_history").split()

scripts/run-batch-deletes.sh

@@ -26,11 +26,23 @@ while true; do
 
     printf "Deleting..."
     # DBURI and MAX_AGE should be in the environment
-    DELETED=$(python ./manage-db.py -d "$DBURI" cleanup "$MAX_AGE" 2>/dev/null | awk '/Total/ {print $3}')
+    DELETED=$(python ./manage-db.py -d "$DBURI" cleanup "$MAX_AGE" 2>/dev/null)
+    if ! [ "$?" -eq "0" ]; then
+        echo "manage-db.py didn't exit cleanly"
+        continue
+    fi
+    DELETED=$(echo "$DELETED" | awk '/Total/ {print $3}')
+    ORIG_DELETED=$DELETED
+    # Sometimes DELETED ends up not being set for some reason, which breaks
+    # the `expr` expressions below, and gets the script stuck in a loop.
+    if ! [ "$DELETED" -eq "$DELETED" ] 2>/dev/null; then
+        DELETED=0
+    fi
     TOTAL=$(expr $TOTAL + $DELETED)
     NOW=$(date '+%s')
     printf "%d rows removed >>> %d seconds remaining. %d deleted.\n" $DELETED $(expr $TIL - $NOW) $TOTAL
 
+    echo "Original value for \$DELETED: $ORIG_DELETED"
     if [ $DELETED -eq 0 ]; then
         echo "Nothing left to do"
         exit 0

version.txt

@@ -1 +1 @@
-2.63
+2.64