diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:29:00 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-11-25 14:37:29 +0100 |
| commit | 616be2a18cea1ecfee327105a58f4f397a7e28f1 (patch) | |
| tree | 520ea9a3fbe29ac78ce76c4b4527a70e8a70ae1d /doc/merge.txt | |
| parent | d8ce0c149f10d841dc19cbc32c8fc844aa4d65fb (diff) | |
Manual rebase onto master with map/robust-distribution.
Diffstat (limited to 'doc/merge.txt')
| -rw-r--r-- | doc/merge.txt | 9 |
1 files changed, 7 insertions, 2 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 |