WIP

Merge can run as four separate processes, plus a fifth controlling
proces 'merge'.

Tests are limited to testcase1.py and they're failing because of the
test with the dead merge secondary. Tests are also time consuming
because they're waiting for 60s each time a merge needs to be
verified. This could be improved by peeking at the control files, for
example.

1 files changed, 55 insertions, 7 deletions

diff --git a/tools/merge b/tools/merge
index b5a50d5..0d1bf0e 100755
--- a/tools/merge
+++ b/tools/merge
@@ -1,10 +1,58 @@
-#! /bin/sh
+#! /usr/bin/env python
+"""merge"""
 
-set -o errexit
+import os
+import sys
+import signal
+from time import sleep
+from mergetools import parse_args
+from multiprocessing import Process
+import merge_fetch, merge_backup, merge_sth, merge_dist
 
-BINDIR=$(dirname $0)
+def run_once():
+    """Merge once."""
+    ret = merge_fetch.main()
+    if ret == 0:
+        ret = merge_backup.main()
+    if ret == 0:
+        ret = merge_sth.main()
+    if ret == 0:
+        ret = merge_dist.main()
+    return ret
 
-$BINDIR/merge_fetch.py "$@"
-$BINDIR/merge_backup.py "$@"
-$BINDIR/merge_sth.py "$@"
-$BINDIR/merge_dist.py "$@"
+def term(signal, arg):
+    sys.exit(1)
+
+def run_continuously(pidfilepath):
+    """Run continuously."""
+    parts = ('fetch', merge_fetch), ('backup', merge_backup), ('sth', merge_sth), ('dist', merge_dist)
+    procs = {}
+    for part, mod in parts:
+        procs[part] = Process(target=mod.main, name='merge_%s' % part)
+        procs[part].daemon = True
+        procs[part].start()
+
+    if pidfilepath:
+        open(pidfilepath, 'w').write(str(os.getpid()) + '\n')
+
+    signal.signal(signal.SIGTERM, term)
+    while True:
+        for name, p in procs.items():
+            if not p.is_alive():
+                print >>sys.stderr, "\nERROR:", name, "process is gone; exiting"
+                return 1
+        sleep(1)
+
+def main():
+    """Main"""
+    args, _, _ = parse_args()
+
+    if args.mergeinterval is None:
+        ret = run_once()
+    else:
+        ret = run_continuously(args.pidfile)
+
+    return ret
+
+if __name__ == '__main__':
+    sys.exit(main())