You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/05 03:39:33 UTC
git commit: get ocd on log capitalization
Updated Branches:
refs/heads/cassandra-2.0 79b362616 -> 41de0bd4e
get ocd on log capitalization
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41de0bd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41de0bd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41de0bd4
Branch: refs/heads/cassandra-2.0
Commit: 41de0bd4e422c1b5959823caccb39a6f9a262df1
Parents: 79b3626
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jan 28 15:31:10 2014 -0600
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Feb 5 05:39:15 2014 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/service/CassandraDaemon.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41de0bd4/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 9e63c05..1319836 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -507,7 +507,7 @@ public class CassandraDaemon
final int GOSSIP_SETTLE_POLL_INTERVAL_MS = 1000;
final int GOSSIP_SETTLE_POLL_SUCCESSES_REQUIRED = 3;
- logger.info("waiting for gossip to settle before accepting client requests...");
+ logger.info("Waiting for gossip to settle before accepting client requests...");
Uninterruptibles.sleepUninterruptibly(GOSSIP_SETTLE_MIN_WAIT_MS, TimeUnit.MILLISECONDS);
int totalPolls = 0;
int numOkay = 0;
@@ -521,12 +521,12 @@ public class CassandraDaemon
totalPolls++;
if (active == 0 && pending == 0)
{
- logger.debug("gossip looks settled. CompletedTasks: {}", completed);
+ logger.debug("Gossip looks settled. CompletedTasks: {}", completed);
numOkay++;
}
else
{
- logger.info("gossip not settled after {} polls. Gossip Stage active/pending/completed: {}/{}/{}", totalPolls, active, pending, completed);
+ logger.info("Gossip not settled after {} polls. Gossip Stage active/pending/completed: {}/{}/{}", totalPolls, active, pending, completed);
numOkay = 0;
}
if (forceAfter > 0 && totalPolls > forceAfter)
@@ -536,7 +536,10 @@ public class CassandraDaemon
break;
}
}
- logger.info("gossip settled after {} extra polls; proceeding", totalPolls - GOSSIP_SETTLE_POLL_SUCCESSES_REQUIRED);
+ if (totalPolls > GOSSIP_SETTLE_POLL_SUCCESSES_REQUIRED)
+ logger.info("Gossip settled after {} extra polls; proceeding", totalPolls - GOSSIP_SETTLE_POLL_SUCCESSES_REQUIRED);
+ else
+ logger.debug("Gossip settled after {} extra polls; proceeding", totalPolls - GOSSIP_SETTLE_POLL_SUCCESSES_REQUIRED);
}
public static void stop(String[] args)