You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/12 22:36:21 UTC

[1/3] git commit: log at info when gossip is fine or people think it's still waiting

Updated Branches:
  refs/heads/cassandra-2.0 babc2de3e -> cafaa8eea
  refs/heads/trunk 0d0acac6c -> 1ede2967b


log at info when gossip is fine or people think it's still waiting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cafaa8ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cafaa8ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cafaa8ee

Branch: refs/heads/cassandra-2.0
Commit: cafaa8eeadd8adae348234773040ef97fe712609
Parents: babc2de
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 12 07:44:46 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 12 15:36:04 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cafaa8ee/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 d87f6d8..5f3c8cc 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -542,7 +542,7 @@ public class CassandraDaemon
         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);
+            logger.info("No gossip backlog; proceeding");
     }
 
     public static void stop(String[] args)


[3/3] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ede2967
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ede2967
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ede2967

Branch: refs/heads/trunk
Commit: 1ede2967b89f7831df8023f71174b262d878a0fe
Parents: 0d0acac cafaa8e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 12 15:36:15 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 12 15:36:15 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ede2967/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------


[2/3] git commit: log at info when gossip is fine or people think it's still waiting

Posted by jb...@apache.org.
log at info when gossip is fine or people think it's still waiting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cafaa8ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cafaa8ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cafaa8ee

Branch: refs/heads/trunk
Commit: cafaa8eeadd8adae348234773040ef97fe712609
Parents: babc2de
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Feb 12 07:44:46 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Feb 12 15:36:04 2014 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cafaa8ee/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 d87f6d8..5f3c8cc 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -542,7 +542,7 @@ public class CassandraDaemon
         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);
+            logger.info("No gossip backlog; proceeding");
     }
 
     public static void stop(String[] args)