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 2018/03/15 14:23:07 UTC

[1/6] cassandra git commit: Respect max hint window when hinting for LWT

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 3d7471a56 -> fdc61cb6a
  refs/heads/cassandra-3.11 4c6a10af8 -> 19a547861
  refs/heads/trunk 92cde9b27 -> 49c1a256c


Respect max hint window when hinting for LWT

patch by Kurt Greaves; reviewed by Aleksey Yeschenko for CASSANDRA-14215


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

Branch: refs/heads/cassandra-3.0
Commit: fdc61cb6a74163402181d133519462f0ab1b504d
Parents: 3d7471a
Author: kurt <ku...@instaclustr.com>
Authored: Tue Feb 20 00:59:00 2018 +0000
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:13:56 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 8 +++++---
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 62b904f..6099b01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 3.0.17
- * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+ * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+ * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
  * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
  * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
  * Log when SSTables are deleted (CASSANDRA-14302)
@@ -8,10 +9,11 @@
  * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
  * Fully utilise specified compaction threads (CASSANDRA-14210)
  * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
-Merged from 2.1:
- * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
 Merged from 2.2:
  * Backport circleci yaml (CASSANDRA-14240)
+Merged from 2.1:
+ * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
+
 
 3.0.16
  * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 7a6bed4..bf58ef2 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -497,7 +497,7 @@ public class StorageProxy implements StorageProxyMBean
         return false;
     }
 
-    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint) throws WriteTimeoutException
+    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException
     {
         boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
         Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
@@ -523,14 +523,14 @@ public class StorageProxy implements StorageProxyMBean
                     if (canDoLocalRequest(destination))
                         commitPaxosLocal(message, responseHandler);
                     else
-                        MessagingService.instance().sendRR(message, destination, responseHandler, shouldHint);
+                        MessagingService.instance().sendRR(message, destination, responseHandler, allowHints && shouldHint(destination));
                 }
                 else
                 {
                     MessagingService.instance().sendOneWay(message, destination);
                 }
             }
-            else if (shouldHint)
+            else if (allowHints && shouldHint(destination))
             {
                 submitHint(proposal.makeMutation(), destination, null);
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[2/6] cassandra git commit: Respect max hint window when hinting for LWT

Posted by al...@apache.org.
Respect max hint window when hinting for LWT

patch by Kurt Greaves; reviewed by Aleksey Yeschenko for CASSANDRA-14215


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

Branch: refs/heads/cassandra-3.11
Commit: fdc61cb6a74163402181d133519462f0ab1b504d
Parents: 3d7471a
Author: kurt <ku...@instaclustr.com>
Authored: Tue Feb 20 00:59:00 2018 +0000
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:13:56 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 8 +++++---
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 62b904f..6099b01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 3.0.17
- * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+ * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+ * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
  * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
  * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
  * Log when SSTables are deleted (CASSANDRA-14302)
@@ -8,10 +9,11 @@
  * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
  * Fully utilise specified compaction threads (CASSANDRA-14210)
  * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
-Merged from 2.1:
- * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
 Merged from 2.2:
  * Backport circleci yaml (CASSANDRA-14240)
+Merged from 2.1:
+ * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
+
 
 3.0.16
  * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 7a6bed4..bf58ef2 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -497,7 +497,7 @@ public class StorageProxy implements StorageProxyMBean
         return false;
     }
 
-    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint) throws WriteTimeoutException
+    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException
     {
         boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
         Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
@@ -523,14 +523,14 @@ public class StorageProxy implements StorageProxyMBean
                     if (canDoLocalRequest(destination))
                         commitPaxosLocal(message, responseHandler);
                     else
-                        MessagingService.instance().sendRR(message, destination, responseHandler, shouldHint);
+                        MessagingService.instance().sendRR(message, destination, responseHandler, allowHints && shouldHint(destination));
                 }
                 else
                 {
                     MessagingService.instance().sendOneWay(message, destination);
                 }
             }
-            else if (shouldHint)
+            else if (allowHints && shouldHint(destination))
             {
                 submitHint(proposal.makeMutation(), destination, null);
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


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

Posted by al...@apache.org.
Merge branch 'cassandra-3.11' into trunk


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

Branch: refs/heads/trunk
Commit: 49c1a256c28e913e1e2af25dd308c8835291e7d7
Parents: 92cde9b 19a5478
Author: Aleksey Yeshchenko <al...@apple.com>
Authored: Thu Mar 15 17:20:09 2018 +0300
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:20:09 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 3 ++-
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c1a256/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49c1a256/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index b512722,52dd8ab..a47c4c6
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -586,14 -522,14 +586,14 @@@ public class StorageProxy implements St
          return false;
      }
  
-     private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint, long queryStartNanoTime) throws WriteTimeoutException
+     private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints, long queryStartNanoTime) throws WriteTimeoutException
      {
          boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
 -        Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
 +        Keyspace keyspace = Keyspace.open(proposal.update.metadata().keyspace);
  
          Token tk = proposal.update.partitionKey().getToken();
 -        List<InetAddress> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspace.getName(), tk);
 -        Collection<InetAddress> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspace.getName());
 +        List<InetAddressAndPort> naturalEndpoints = StorageService.instance.getNaturalEndpoints(keyspace.getName(), tk);
 +        Collection<InetAddressAndPort> pendingEndpoints = StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk, keyspace.getName());
  
          AbstractWriteResponseHandler<Commit> responseHandler = null;
          if (shouldBlock)
@@@ -622,16 -558,9 +622,16 @@@
                      MessagingService.instance().sendOneWay(message, destination);
                  }
              }
 -            else if (allowHints && shouldHint(destination))
 +            else
              {
 -                submitHint(proposal.makeMutation(), destination, null);
 +                if (responseHandler != null)
 +                {
 +                    responseHandler.expired();
 +                }
-                 if (shouldHint)
++                if (allowHints && shouldHint(destination))
 +                {
 +                    submitHint(proposal.makeMutation(), destination, null);
 +                }
              }
          }
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/trunk
Commit: 19a547861ad6c68e4ce584ee1b9ffee66bd5042d
Parents: 4c6a10a fdc61cb
Author: Aleksey Yeshchenko <al...@apple.com>
Authored: Thu Mar 15 17:17:23 2018 +0300
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:17:23 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 3 ++-
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fcd86ed,6099b01..bae967f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,11 @@@
 -3.0.17
 +3.11.3
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
-  * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+  * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+  * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
   * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
   * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
   * Log when SSTables are deleted (CASSANDRA-14302)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 4dc05e3,bf58ef2..52dd8ab
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -522,7 -497,7 +522,7 @@@ public class StorageProxy implements St
          return false;
      }
  
-     private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint, long queryStartNanoTime) throws WriteTimeoutException
 -    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException
++    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints, long queryStartNanoTime) throws WriteTimeoutException
      {
          boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
          Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[3/6] cassandra git commit: Respect max hint window when hinting for LWT

Posted by al...@apache.org.
Respect max hint window when hinting for LWT

patch by Kurt Greaves; reviewed by Aleksey Yeschenko for CASSANDRA-14215


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

Branch: refs/heads/trunk
Commit: fdc61cb6a74163402181d133519462f0ab1b504d
Parents: 3d7471a
Author: kurt <ku...@instaclustr.com>
Authored: Tue Feb 20 00:59:00 2018 +0000
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:13:56 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 8 +++++---
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 62b904f..6099b01 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 3.0.17
- * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+ * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+ * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
  * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
  * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
  * Log when SSTables are deleted (CASSANDRA-14302)
@@ -8,10 +9,11 @@
  * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194)
  * Fully utilise specified compaction threads (CASSANDRA-14210)
  * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
-Merged from 2.1:
- * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
 Merged from 2.2:
  * Backport circleci yaml (CASSANDRA-14240)
+Merged from 2.1:
+ * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
+
 
 3.0.16
  * Fix unit test failures in ViewComplexTest (CASSANDRA-14219)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 7a6bed4..bf58ef2 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -497,7 +497,7 @@ public class StorageProxy implements StorageProxyMBean
         return false;
     }
 
-    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint) throws WriteTimeoutException
+    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException
     {
         boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
         Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);
@@ -523,14 +523,14 @@ public class StorageProxy implements StorageProxyMBean
                     if (canDoLocalRequest(destination))
                         commitPaxosLocal(message, responseHandler);
                     else
-                        MessagingService.instance().sendRR(message, destination, responseHandler, shouldHint);
+                        MessagingService.instance().sendRR(message, destination, responseHandler, allowHints && shouldHint(destination));
                 }
                 else
                 {
                     MessagingService.instance().sendOneWay(message, destination);
                 }
             }
-            else if (shouldHint)
+            else if (allowHints && shouldHint(destination))
             {
                 submitHint(proposal.makeMutation(), destination, null);
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: 19a547861ad6c68e4ce584ee1b9ffee66bd5042d
Parents: 4c6a10a fdc61cb
Author: Aleksey Yeshchenko <al...@apple.com>
Authored: Thu Mar 15 17:17:23 2018 +0300
Committer: Aleksey Yeshchenko <al...@apple.com>
Committed: Thu Mar 15 17:17:23 2018 +0300

----------------------------------------------------------------------
 CHANGES.txt                                             | 3 ++-
 src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fcd86ed,6099b01..bae967f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,11 @@@
 -3.0.17
 +3.11.3
 + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247)
 + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170)
 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163)
 + * Fix wildcard GROUP BY queries (CASSANDRA-14209)
 +Merged from 3.0:
-  * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697)
+  * Respect max hint window when hinting for LWT (CASSANDRA-14215)
+  * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697)
   * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
   * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087)
   * Log when SSTables are deleted (CASSANDRA-14302)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a54786/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 4dc05e3,bf58ef2..52dd8ab
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -522,7 -497,7 +522,7 @@@ public class StorageProxy implements St
          return false;
      }
  
-     private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint, long queryStartNanoTime) throws WriteTimeoutException
 -    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException
++    private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints, long queryStartNanoTime) throws WriteTimeoutException
      {
          boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY;
          Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org