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/10/11 20:46:14 UTC
[1/3] git commit: Reduce totalBlockFor() for LOCAL_* consistency
levels
Repository: cassandra
Updated Branches:
refs/heads/trunk fa592a46b -> e473769fb
Reduce totalBlockFor() for LOCAL_* consistency levels
patch by Nicolas Douillet; reviewed by Aleksey Yeschenko for
CASSANDRA-8058
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7497399d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7497399d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7497399d
Branch: refs/heads/trunk
Commit: 7497399d0be67b302c852ad92c37e60124b0a1e4
Parents: 0393c30
Author: Nicolas Douillet <ni...@gmail.com>
Authored: Sat Oct 11 21:28:04 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Oct 11 21:37:01 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ConsistencyLevel.java | 4 ++--
.../service/DatacenterWriteResponseHandler.java | 16 +++++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7497399d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b633e48..84bbe75 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.11:
+ * Reduce totalBlockFor() for LOCAL_* consistency levels (CASSANDRA-8058)
* Fix merging schemas with re-dropped keyspaces (CASSANDRA-7256)
* Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)
* Notify DT subscribers when a column family is truncated (CASSANDRA-8088)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7497399d/src/java/org/apache/cassandra/db/ConsistencyLevel.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
index 174b80d..3ef3217 100644
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@ -145,12 +145,12 @@ public enum ConsistencyLevel
return isDCLocal;
}
- private boolean isLocal(InetAddress endpoint)
+ public boolean isLocal(InetAddress endpoint)
{
return DatabaseDescriptor.getLocalDataCenter().equals(DatabaseDescriptor.getEndpointSnitch().getDatacenter(endpoint));
}
- private int countLocalEndpoints(Iterable<InetAddress> liveEndpoints)
+ public int countLocalEndpoints(Iterable<InetAddress> liveEndpoints)
{
int count = 0;
for (InetAddress endpoint : liveEndpoints)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7497399d/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
index 5530374..74dd488 100644
--- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
@@ -20,9 +20,7 @@ package org.apache.cassandra.service;
import java.net.InetAddress;
import java.util.Collection;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.WriteType;
@@ -32,8 +30,6 @@ import org.apache.cassandra.db.WriteType;
*/
public class DatacenterWriteResponseHandler extends WriteResponseHandler
{
- private static final IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
-
public DatacenterWriteResponseHandler(Collection<InetAddress> naturalEndpoints,
Collection<InetAddress> pendingEndpoints,
ConsistencyLevel consistencyLevel,
@@ -48,10 +44,16 @@ public class DatacenterWriteResponseHandler extends WriteResponseHandler
@Override
public void response(MessageIn message)
{
- if (message == null || DatabaseDescriptor.getLocalDataCenter().equals(snitch.getDatacenter(message.from)))
- {
+ if (message == null || consistencyLevel.isLocal(message.from))
if (responses.decrementAndGet() == 0)
signal();
- }
+ }
+
+ @Override
+ protected int totalBlockFor()
+ {
+ // during bootstrap, include pending endpoints (only local here) in the count
+ // or we may fail the consistency level guarantees (see #833, #8058)
+ return consistencyLevel.blockFor(keyspace) + consistencyLevel.countLocalEndpoints(pendingEndpoints);
}
}
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11e8dc1c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11e8dc1c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11e8dc1c
Branch: refs/heads/trunk
Commit: 11e8dc1c1cc2ab497a21384f0f3f0989a592bd75
Parents: 42582ec 7497399
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Oct 11 21:44:02 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Oct 11 21:44:02 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ConsistencyLevel.java | 4 ++--
.../service/DatacenterWriteResponseHandler.java | 16 +++++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11e8dc1c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 61dec54,84bbe75..891848e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,75 -1,5 +1,76 @@@
-2.0.11:
+2.1.1
+ * Fix EXECUTE request with skipMetadata=false returning no metadata
+ (CASSANDRA-8054)
+ * Allow concurrent use of CQLBulkOutputFormat (CASSANDRA-7776)
+ * Shutdown JVM on OOM (CASSANDRA-7507)
+ * Upgrade netty version and enable epoll event loop (CASSANDRA-7761)
+ * Don't duplicate sstables smaller than split size when using
+ the sstablesplitter tool (CASSANDRA-7616)
+ * Avoid re-parsing already prepared statements (CASSANDRA-7923)
+ * Fix some Thrift slice deletions and updates of COMPACT STORAGE
+ tables with some clustering columns omitted (CASSANDRA-7990)
+ * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
+ * Properly track added size (CASSANDRA-7239)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
+ * Release references to overlapping sstables during compaction (CASSANDRA-7819)
+ * Send notification when opening compaction results early (CASSANDRA-8034)
+ * Make native server start block until properly bound (CASSANDRA-7885)
+ * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
+ * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
+ * Make sstablerepairedset take a list of files (CASSANDRA-7995)
+ * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
+ * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
+ * Fix resource leak in event of corrupt sstable
+ * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
+ * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
+ * Invalidate prepared statements when their keyspace or table is
+ dropped (CASSANDRA-7566)
+ * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
+ * Add better error checking of new stress profile (CASSANDRA-7716)
+ * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
+ * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
+ * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+ * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
+ * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
+ * Add human readable option to nodetool commands (CASSANDRA-5433)
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
+ * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
+ * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Make repair -pr work with -local (CASSANDRA-7450)
+ * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
+ * Fix snapshot repair error on indexed tables (CASSANDRA-8020)
+ * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
+Merged from 2.0:
+ * Reduce totalBlockFor() for LOCAL_* consistency levels (CASSANDRA-8058)
* Fix merging schemas with re-dropped keyspaces (CASSANDRA-7256)
* Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188)
* Notify DT subscribers when a column family is truncated (CASSANDRA-8088)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11e8dc1c/src/java/org/apache/cassandra/db/ConsistencyLevel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/11e8dc1c/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
index 96fc96d,74dd488..fb8f992
--- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
@@@ -48,9 -44,16 +44,15 @@@ public class DatacenterWriteResponseHan
@Override
public void response(MessageIn message)
{
- if (message == null || DatabaseDescriptor.getLocalDataCenter().equals(snitch.getDatacenter(message.from)))
- {
+ if (message == null || consistencyLevel.isLocal(message.from))
- if (responses.decrementAndGet() == 0)
- signal();
+ super.response(message);
- }
+ }
+
+ @Override
+ protected int totalBlockFor()
+ {
+ // during bootstrap, include pending endpoints (only local here) in the count
+ // or we may fail the consistency level guarantees (see #833, #8058)
+ return consistencyLevel.blockFor(keyspace) + consistencyLevel.countLocalEndpoints(pendingEndpoints);
}
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@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/e473769f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e473769f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e473769f
Branch: refs/heads/trunk
Commit: e473769fbffb04669b45633378f849f614169a19
Parents: fa592a4 11e8dc1
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Oct 11 21:44:44 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Oct 11 21:44:44 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/ConsistencyLevel.java | 4 ++--
.../service/DatacenterWriteResponseHandler.java | 16 +++++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473769f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e473769f/src/java/org/apache/cassandra/db/ConsistencyLevel.java
----------------------------------------------------------------------