You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/08/14 15:54:34 UTC
[1/4] git commit: export MALLOC_ARENA_MAX corrrectly
Repository: cassandra
Updated Branches:
refs/heads/trunk 048f72bd3 -> 4304b3a6d
export MALLOC_ARENA_MAX corrrectly
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed3694b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed3694b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed3694b8
Branch: refs/heads/trunk
Commit: ed3694b868cdfbf674445f878477d9f7589ba86e
Parents: 0623ea8
Author: Brandon Williams <br...@apache.org>
Authored: Wed Aug 13 13:28:28 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Aug 13 13:29:42 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed3694b8/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 211b81b..43a121c 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -144,7 +144,7 @@ esac
#HEAP_NEWSIZE="800M"
# Set this to control the amount of arenas per-thread in glibc
-#MALLOC_ARENA_MAX=4
+#export MALLOC_ARENA_MAX=4
if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then
calculate_heap_sizes
@@ -157,7 +157,7 @@ fi
if [ "x$MALLOC_ARENA_MAX" = "x" ]
then
- MALLOC_ARENA_MAX=4
+ export MALLOC_ARENA_MAX=4
fi
# Specifies the default port over which Cassandra will be available for
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/4304b3a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4304b3a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4304b3a6
Branch: refs/heads/trunk
Commit: 4304b3a6df8e10e7abd998cd79abe330607d38c2
Parents: 048f72b 1040b52
Author: Jake Luciani <ja...@apache.org>
Authored: Thu Aug 14 09:54:22 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu Aug 14 09:54:22 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/RangeStreamer.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4304b3a6/CHANGES.txt
----------------------------------------------------------------------
[2/4] git commit: Skip strict endpoint selection for ranges if RF ==
nodes
Posted by ja...@apache.org.
Skip strict endpoint selection for ranges if RF == nodes
Patch by Sam Tunnicliffe; reviewed by tjake for CASSANDRA-7765
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4e56c2f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4e56c2f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4e56c2f
Branch: refs/heads/trunk
Commit: e4e56c2fd08037b4ddc7459f341e2c86c272e803
Parents: ed3694b
Author: beobal <sa...@beobal.com>
Authored: Wed Aug 13 21:10:52 2014 +0100
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu Aug 14 09:51:45 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/RangeStreamer.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e56c2f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2913607..058681a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.0-rc6
+ * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
* Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
* Add tracing entries about concurrent range requests (CASSANDRA-7599)
* (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e56c2f/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index c5d45f9..d84a951 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -128,7 +128,7 @@ public class RangeStreamer
public void addRanges(String keyspaceName, Collection<Range<Token>> ranges)
{
- Multimap<Range<Token>, InetAddress> rangesForKeyspace = !DatabaseDescriptor.isReplacing() && useStrictConsistency && tokens != null
+ Multimap<Range<Token>, InetAddress> rangesForKeyspace = useStrictSourcesForRanges(keyspaceName)
? getAllRangesWithStrictSourcesFor(keyspaceName, ranges) : getAllRangesWithSourcesFor(keyspaceName, ranges);
if (logger.isDebugEnabled())
@@ -148,6 +148,15 @@ public class RangeStreamer
}
}
+ private boolean useStrictSourcesForRanges(String keyspaceName)
+ {
+ AbstractReplicationStrategy strat = Keyspace.open(keyspaceName).getReplicationStrategy();
+ return !DatabaseDescriptor.isReplacing()
+ && useStrictConsistency
+ && tokens != null
+ && metadata.getAllEndpoints().size() != strat.getReplicationFactor();
+ }
+
/**
* Get a map of all ranges and their respective sources that are candidates for streaming the given ranges
* to us. For each range, the list of sources is sorted by proximity relative to the given destAddress.
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1.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/1040b520
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1040b520
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1040b520
Branch: refs/heads/trunk
Commit: 1040b520d116abb089acfa24d30aba8556f91f0e
Parents: 74e7f28 e4e56c2
Author: Jake Luciani <ja...@apache.org>
Authored: Thu Aug 14 09:53:38 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu Aug 14 09:53:38 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/RangeStreamer.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1040b520/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f34cec7,058681a..cf2f34a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
+2.1.1
+ * 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)
+Merged from 2.0:
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+
+
2.1.0-rc6
+ * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765)
* Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
* Add tracing entries about concurrent range requests (CASSANDRA-7599)
* (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)