user/linus/catlfish.git/tools/merge, branch pmerge2

Parallelise merge_fetch.py.

2016-11-24T23:47:13+00:00

NOTE: Not supporting permdb yet!

We're still not passing the tests because merge_backup.py exits when
the secondary merge disappears.

WIP

2016-11-23T16:09:48+00:00

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.

Test failing merge backup

2016-10-14T14:54:57+00:00

Refactor tests

Quote '$@' in shell script.

2015-11-10T11:48:47+00:00

Merge is now run by shell script tools/merge.

2015-11-10T11:48:46+00:00

tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and
merge_dist.py sequentially.

TODO: test backupquorum != 0