You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/03 20:37:41 UTC

[1/6] git commit: don't log retry policy so often

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 aa2b769aa -> 02e0eb637
  refs/heads/cassandra-2.1 3bc4de96d -> 341153526
  refs/heads/trunk 2bf6d8a68 -> 53c91426e


don't log retry policy so often


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

Branch: refs/heads/cassandra-2.0
Commit: 02e0eb6378f926984df393870733e5462dd72361
Parents: aa2b769
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:38 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e0eb63/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index bfd3b08..3fac640 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -290,12 +290,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         {
             throw new RuntimeException(e);
         }
+        logger.debug("retryPolicy for {} is {}", name, this.metadata.getSpeculativeRetry());
         StorageService.optionalTasks.scheduleWithFixedDelay(new Runnable()
         {
             public void run()
             {
                 SpeculativeRetry retryPolicy = ColumnFamilyStore.this.metadata.getSpeculativeRetry();
-                logger.debug("retryPolicy for {} is {}", name, retryPolicy.value);
                 switch (retryPolicy.type)
                 {
                     case PERCENTILE:


[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 341153526e9a99fb6bf8c013a24cbc256044ab28
Parents: 3bc4de9 02e0eb6
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:45 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:45 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34115352/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------


[3/6] git commit: don't log retry policy so often

Posted by br...@apache.org.
don't log retry policy so often


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

Branch: refs/heads/trunk
Commit: 02e0eb6378f926984df393870733e5462dd72361
Parents: aa2b769
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:38 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e0eb63/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index bfd3b08..3fac640 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -290,12 +290,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         {
             throw new RuntimeException(e);
         }
+        logger.debug("retryPolicy for {} is {}", name, this.metadata.getSpeculativeRetry());
         StorageService.optionalTasks.scheduleWithFixedDelay(new Runnable()
         {
             public void run()
             {
                 SpeculativeRetry retryPolicy = ColumnFamilyStore.this.metadata.getSpeculativeRetry();
-                logger.debug("retryPolicy for {} is {}", name, retryPolicy.value);
                 switch (retryPolicy.type)
                 {
                     case PERCENTILE:


[6/6] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 53c91426e70182f644718a83248ddafc34cc66aa
Parents: 2bf6d8a 3411535
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:51 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:51 2014 -0500

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



[2/6] git commit: don't log retry policy so often

Posted by br...@apache.org.
don't log retry policy so often


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

Branch: refs/heads/cassandra-2.1
Commit: 02e0eb6378f926984df393870733e5462dd72361
Parents: aa2b769
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:38 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e0eb63/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index bfd3b08..3fac640 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -290,12 +290,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
         {
             throw new RuntimeException(e);
         }
+        logger.debug("retryPolicy for {} is {}", name, this.metadata.getSpeculativeRetry());
         StorageService.optionalTasks.scheduleWithFixedDelay(new Runnable()
         {
             public void run()
             {
                 SpeculativeRetry retryPolicy = ColumnFamilyStore.this.metadata.getSpeculativeRetry();
-                logger.debug("retryPolicy for {} is {}", name, retryPolicy.value);
                 switch (retryPolicy.type)
                 {
                     case PERCENTILE:


[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/cassandra-2.1
Commit: 341153526e9a99fb6bf8c013a24cbc256044ab28
Parents: 3bc4de9 02e0eb6
Author: Brandon Williams <br...@apache.org>
Authored: Sat May 3 13:33:45 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Sat May 3 13:33:45 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34115352/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------