diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-02-08 01:07:52 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-02-08 01:13:45 +0100 |
| commit | b188fcc29c3df97978e5da4a87b946b300d79932 (patch) | |
| tree | e29d9b288bd59110f3e136aaa762dcdad6ea635d | |
| parent | 6ac91648a9b855235783ade018470b498d056b90 (diff) | |
Correct a few file names.
| -rw-r--r-- | doc/merge.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/merge.txt b/doc/merge.txt index 254e6fc..0b3a0d6 100644 --- a/doc/merge.txt +++ b/doc/merge.txt @@ -9,16 +9,17 @@ The merge process - merge-backup reads 'fetched' and pushes these entries to secondary merge nodes, maintaining one file per secondary, - 'backup.<secondary>', indicating which entries have been copied to + 'verified.<secondary>', indicating which entries have been copied to and verified at node <secondary>. - merge-sth writes a new 'sth' file by reading the - 'backup.<secondary>' files into a list, picking a new tree size by + 'verified.<secondary>' files into a list, picking a new tree size by sorting the list (in falling order) and indexing it with the - 'backupquorum' config option. If the new tree size is smaller than - what the old 'sth' file says, no new STH is created. + 'backup-quorum-size' config option. If the new tree size is smaller + than what the old 'sth' file says, no new STH is created. -- merge-dist distributes 'sth' and missing entries to frontend nodes. +- merge-dist distributes 'sth' and missing entries to all frontend + nodes. Merge distribution (merge_dist) ----------------------------------------------------- @@ -83,8 +84,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 |