cleanup paxos tracing
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41798b6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41798b6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41798b6f Branch: refs/heads/trunk Commit: 41798b6f693fb14b0a1bf2fc212714eadc973719 Parents: ce9d303 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Sep 8 23:40:59 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 9 23:09:22 2013 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/paxos/PaxosState.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/41798b6f/src/java/org/apache/cassandra/service/paxos/PaxosState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java index ca69c16..aa27628 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java @@ -72,14 +72,14 @@ public class PaxosState PaxosState state = SystemKeyspace.loadPaxosState(toPrepare.key, toPrepare.update.metadata()); if (toPrepare.isAfter(state.inProgressCommit)) { - Tracing.trace("promising ballot {}", toPrepare.ballot); + Tracing.trace("Promising ballot {}", toPrepare.ballot); SystemKeyspace.savePaxosPromise(toPrepare); // return the pre-promise ballot so coordinator can pick the most recent in-progress value to resume return new PrepareResponse(true, state.inProgressCommit, state.mostRecentCommit); } else { - Tracing.trace("promise rejected; {} is not sufficiently newer than {}", toPrepare, state.inProgressCommit); + Tracing.trace("Promise rejected; {} is not sufficiently newer than {}", toPrepare, state.inProgressCommit); return new PrepareResponse(false, state.inProgressCommit, state.mostRecentCommit); } } @@ -92,13 +92,15 @@ public class PaxosState PaxosState state = SystemKeyspace.loadPaxosState(proposal.key, proposal.update.metadata()); if (proposal.hasBallot(state.inProgressCommit.ballot) || proposal.isAfter(state.inProgressCommit)) { - Tracing.trace("accepting proposal {}", proposal); + Tracing.trace("Accepting proposal {}", proposal); SystemKeyspace.savePaxosProposal(proposal); return true; } - - logger.debug("accept requested for {} but inProgress is now {}", proposal, state.inProgressCommit); - return false; + else + { + Tracing.trace("Rejecting proposal for {} because inProgress is now {}", proposal, state.inProgressCommit); + return false; + } } } @@ -109,7 +111,7 @@ public class PaxosState // Committing it is however always safe due to column timestamps, so always do it. However, // if our current in-progress ballot is strictly greater than the proposal one, we shouldn't // erase the in-progress update. - Tracing.trace("committing proposal {}", proposal); + Tracing.trace("Committing proposal {}", proposal); RowMutation rm = proposal.makeMutation(); Keyspace.open(rm.getKeyspaceName()).apply(rm, true);