diff options
| -rw-r--r-- | doc/design.txt | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/doc/design.txt b/doc/design.txt index 0a57e70..8f933b5 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -19,12 +19,12 @@ Certificate Transparency (RFC6962) log server. | ^ ^ | | | +------------------------------------------------+ - | merge master | + | primary merge node | +------------------------------------------------+ ^ | | v | +----------------------------------+ - | | merge slaves | + | | secondary merge nodes | | +----------------------------------+ | ^ | | @@ -100,32 +100,32 @@ Signing node Merging node ============ -* The master is determined by configuration. -* The other merging nodes are called "slaves". -* The master has two phases, merging and distributing. +* The primary merge node is determined by configuration. +* The other merging nodes are called "secondaries". +* The primary merge node has two phases, merging and distributing. -Merging (master) ----------------- +Merging (primary) +----------------- * Fetches CCs by calling FetchNewEntries() on storage node i where i = 0...(n-1) * Determines the order of the new entries in the CT log. -* Sends the entries to the slaves. +* Sends the entries to the secondary merge nodes. * Calculates the tree head and asks a signing node to sign it. -* When a majority of the slaves have acknowledged the entries, - compares the calculated tree head to the tree heads of the slaves. +* When a majority of the secondaries have acknowledged the entries, + compares the calculated tree head to the tree heads of the secondaries. If they match, considers the additions to the CT log final and begins the distributing phase. -Merging (slave) ---------------- +Merging (secondaries) +--------------------- -* Receives entries from the master. The node must be certain - that the request comes from the current master, and not +* Receives entries from the primary merge node. The node must be certain + that the request comes from the current primary, and not an old one. * Takes reasonable measures to ensure that data is in permanent storage. -* Calculates the new tree head and returns it to the master. +* Calculates the new tree head and returns it to the primary merge node. Distributing ------------ @@ -156,9 +156,9 @@ Automatic repair process die and report. * Fetch the CT log order from the merge nodes. * Determine the latest version of the log. -* Select a new master. +* Select a new primary merge node. * Change the configuration of the merge nodes so that - they know who the new master is. + they know who the new primary merge node is. * Start all merge nodes. * If any of these steps fail, die and report. * If all steps succeed, die and report anyway. The automatic |