cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Tue, 12 Sep 2017 13:38:28 GMT
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/eb027a1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb027a1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb027a1d

Branch: refs/heads/cassandra-3.11
Commit: eb027a1de6d97f040ef9da1552e5811539e633a0
Parents: b64a4e4 1210365
Author: Paulo Motta <paulo@apache.org>
Authored: Tue Sep 12 08:31:42 2017 -0500
Committer: Paulo Motta <paulo@apache.org>
Committed: Tue Sep 12 08:33:00 2017 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/batchlog/BatchlogManager.java     |  3 +-
 .../service/BatchlogResponseHandler.java        |  4 +-
 .../apache/cassandra/service/StorageProxy.java  | 86 +++++++++-----------
 4 files changed, 44 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 52775e7,26b1794..099a869
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,6 +1,17 @@@
 -3.0.15
 +3.11.1
 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418)
 + * BTree.Builder memory leak (CASSANDRA-13754)
 + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798)
 + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938)
 + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744)
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Fix pending view mutations handling and cleanup batchlog when there are local and remote
paired mutations (CASSANDRA-13069)
   * Range deletes in a CAS batch are ignored (CASSANDRA-13655)
 + * Avoid assertion error when IndexSummary > 2G (CASSANDRA-12014)
   * Change repair midpoint logging for tiny ranges (CASSANDRA-13603)
   * Better handle corrupt final commitlog segment (CASSANDRA-11995)
   * StreamingHistogram is not thread safe (CASSANDRA-13756)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb027a1d/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index b8f87d9,1ce1bc5..913c3c2
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -819,7 -756,31 +792,34 @@@ public class StorageProxy implements St
                                          "but this node hasn't updated its ring metadata
yet. Adding mutation to " +
                                          "local batchlog to be replayed later.",
                                          mutation.key());
-                         nonPairedMutations.add(mutation);
+                         continue;
+                     }
+ 
+                     // When local node is the paired endpoint just apply the mutation locally.
+                     if (pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) &&
StorageService.instance.isJoined())
++                    {
+                         try
+                         {
+                             mutation.apply(writeCommitLog);
+                             nonLocalMutations.remove(mutation);
+                             cleanup.ackMutation();
+                         }
+                         catch (Exception exc)
+                         {
+                             logger.error("Error applying local view update to keyspace {}:
{}", mutation.getKeyspaceName(), mutation);
+                             throw exc;
+                         }
++                    }
+                     else
+                     {
+                         wrappers.add(wrapViewBatchResponseHandler(mutation,
+                                                                   consistencyLevel,
+                                                                   consistencyLevel,
+                                                                   Collections.singletonList(pairedEndpoint.get()),
+                                                                   baseComplete,
+                                                                   WriteType.BATCH,
 -                                                                  cleanup));
++                                                                  cleanup,
++                                                                  queryStartNanoTime));
                      }
                  }
  


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


Mime
View raw message