summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2016-11-25 14:29:00 +0100
committerLinus Nordberg <linus@nordu.net>2016-11-25 14:37:29 +0100
commit616be2a18cea1ecfee327105a58f4f397a7e28f1 (patch)
tree520ea9a3fbe29ac78ce76c4b4527a70e8a70ae1d /doc
parentd8ce0c149f10d841dc19cbc32c8fc844aa4d65fb (diff)
Manual rebase onto master with map/robust-distribution.
Diffstat (limited to 'doc')
-rw-r--r--doc/merge.txt9
-rw-r--r--doc/minimalsystem.txt15
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
---------------