From 2b6eded0d3c39b0b3c886577e5755b169faab233 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 28 Nov 2016 00:08:45 +0100 Subject: Do remove process from procs dict when they fail too. --- tools/merge_backup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/merge_backup.py b/tools/merge_backup.py index b0c7289..56b5b57 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -195,11 +195,11 @@ def merge_backup(args, config, localconfig, secondaries): if not p.is_alive(): p.join() nodename, pipe = procs[p] - if p.exitcode != 0: + if p.exitcode == 0: + root_hash = pipe.recv() + update_backupfile(mergedb, nodename, tree_size, root_hash) + else: logging.warning("%s failure: %d", nodename, p.exitcode) - continue - root_hash = pipe.recv() - update_backupfile(mergedb, nodename, tree_size, root_hash) del procs[p] if not procs: break -- cgit v1.1