diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-23 17:09:48 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-23 17:09:48 +0100 |
| commit | 19a2a611a839c0318f58347e2d93943c8e2401a5 (patch) | |
| tree | 18cd302161a88d4546b39792a4bff6b1ade95c77 /doc | |
| parent | 27e368196ce65e109c027987c706a697356f7bc5 (diff) | |
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.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/merge.txt | 9 | ||||
| -rw-r--r-- | doc/minimalsystem.txt | 15 |
2 files changed, 16 insertions, 8 deletions
diff --git a/doc/merge.txt b/doc/merge.txt index d12424f..c7d8dc9 100644 --- a/doc/merge.txt +++ b/doc/merge.txt @@ -20,6 +20,13 @@ The merge process - merge-dist distributes 'sth' and missing entries to frontend nodes. + [logorder] + v + fetch backup sth dist + v ^ v ^ v ^ + [fetched] [backup.<secondary>] [sth] + + Merge distribution (merge_dist) ----------------------------------------------------- @@ -83,8 +90,6 @@ Merge backup (merge_backup) TODO ==== -- Run the three pieces in parallell. - - Improve merge-fetch by parallellising it using one process per storage node writing to a "queue info" file (storage-node, hash) and a single "queue handling process" reading queue files and writing to the diff --git a/doc/minimalsystem.txt b/doc/minimalsystem.txt index 061b6cc..3f10784 100644 --- a/doc/minimalsystem.txt +++ b/doc/minimalsystem.txt @@ -46,18 +46,21 @@ If you want to submit all the files in a directory, name directory with a `/` at the end, for example `tools/testcerts/`. -Running merge once ------------------- +Running merge +------------- - tools/merge.py --config test/catlfish-test.cfg +To run merge once, do + + tools/merge --config test/catlfish-test.cfg --localconfig test/catlfish-test-local-merge.cfg This will read the submitted certificates from the storage node, decide the order, and publish the certificates to the frontend server. -If you want to run the system continuously, run the merge command in -cron or in a while loop. See `packaging/docker/catlfish-dev/merge.sh` -for an example of the latter. +If you want to run merge continuously, use `--mergeinterval' or run +the merge command in a while loop. See +`catlfish-dockerfiles/catlfish-dev/merge.sh` for an example of the +latter. Verifying SCT:s --------------- |