ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328108 )
Change subject: if one wiki can't be monitored, don't except out, do the rest
......................................................................
if one wiki can't be monitored, don't except out, do the rest
Change-Id: I2fb1c143277a4ba2a4198e277ca68e9eaea24593
---
M xmldumps-backup/monitor.py
1 file changed, 17 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/08/328108/1
diff --git a/xmldumps-backup/monitor.py b/xmldumps-backup/monitor.py
index a3d153d..d38b213 100644
--- a/xmldumps-backup/monitor.py
+++ b/xmldumps-backup/monitor.py
@@ -3,9 +3,13 @@
import os
from os.path import exists
import sys
+import traceback
from dumps.WikiDump import Wiki, Config, Locker
from dumps.fileutils import FileUtils
from dumps.runnerutils import StatusHtml
+
+
+VERBOSE = False
def add_to_filename(filename, infix):
@@ -23,14 +27,19 @@
dbs = config.db_list_by_age()
for db_name in dbs:
- wiki = Wiki(config, db_name)
- locker = Locker(wiki)
- lockfiles = locker.is_stale(all_locks=True)
- if lockfiles:
- locker.cleanup_stale_locks(lockfiles)
- running = running or locker.is_locked(all_locks=True)
- states.append(StatusHtml.status_line(wiki))
-
+ try:
+ wiki = Wiki(config, db_name)
+ locker = Locker(wiki)
+ lockfiles = locker.is_stale(all_locks=True)
+ if lockfiles:
+ locker.cleanup_stale_locks(lockfiles)
+ running = running or locker.is_locked(all_locks=True)
+ states.append(StatusHtml.status_line(wiki))
+ except Exception:
+ # if there's a problem with one wiki at least
+ # let's show the rest
+ if VERBOSE:
+ traceback.print_exc(file=sys.stdout)
if running:
status = "Dumps are in progress..."
elif exists("maintenance.txt"):
--
To view, visit https://gerrit.wikimedia.org/r/328108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fb1c143277a4ba2a4198e277ca68e9eaea24593
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
