Updated Branches: refs/heads/trunk 55dda732b -> be2726b39
update comments Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be2726b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be2726b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be2726b3 Branch: refs/heads/trunk Commit: be2726b39d54bb0f00d2479070b39b939db4a3cb Parents: 55dda73 Author: Jonathan Ellis <[email protected]> Authored: Thu Mar 28 17:48:03 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Mar 28 17:48:03 2013 -0500 ---------------------------------------------------------------------- .../cassandra/service/ActiveRepairService.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be2726b3/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 4a9eefb..3c5ba7f 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -50,11 +50,11 @@ import org.apache.cassandra.streaming.StreamingRepairTask; import org.apache.cassandra.utils.*; /** - * AntiEntropyService encapsulates "validating" (hashing) individual column families, + * ActiveRepairService encapsulates "validating" (hashing) individual column families, * exchanging MerkleTrees with remote nodes via a TreeRequest/Response conversation, * and then triggering repairs for disagreeing ranges. * - * Every Tree conversation has an 'initiator', where valid trees are sent after generation + * The node where repair was invoked acts as the 'initiator,' where valid trees are sent after generation * and where the local and remote tree will rendezvous in rendezvous(cf, endpoint, tree). * Once the trees rendezvous, a Differencer is executed and the service can trigger repairs * for disagreeing ranges. @@ -62,11 +62,11 @@ import org.apache.cassandra.utils.*; * Tree comparison and repair triggering occur in the single threaded Stage.ANTIENTROPY. * * The steps taken to enact a repair are as follows: - * 1. A major compaction is triggered via nodeprobe: - * * Nodeprobe sends TreeRequest messages to all neighbors of the target node: when a node - * receives a TreeRequest, it will perform a readonly compaction to immediately validate - * the column family. - * 2. The compaction process validates the column family by: + * 1. A repair is requested via nodeprobe: + * * The initiator sends TreeRequest messages to all neighbors of the target node: when a node + * receives a TreeRequest, it will perform a validation (read-only) compaction to immediately validate + * the column family. This is performed on the CompactionManager ExecutorService. + * 2. The validation process builds the merkle tree by: * * Calling Validator.prepare(), which samples the column family to determine key distribution, * * Calling Validator.add() in order for every row in the column family, * * Calling Validator.complete() to indicate that all rows have been added.
