You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/08/06 12:13:29 UTC
[1/6] git commit: Prevent SSP from erroring out when the yaml is
yanked from it.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 cd84cc9ec -> a7d950e36
Prevent SSP from erroring out when the yaml is yanked from it.
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7663
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73eb68c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73eb68c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73eb68c5
Branch: refs/heads/cassandra-2.1.0
Commit: 73eb68c516a291e2f8a816abab20b67999eb851b
Parents: 244f234
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 13:53:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 13:53:01 2014 -0500
----------------------------------------------------------------------
.../cassandra/locator/SimpleSeedProvider.java | 30 ++++++++++++++++----
1 file changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/73eb68c5/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index 9f491f3..6c426bd 100644
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@ -17,6 +17,7 @@
*/
package org.apache.cassandra.locator;
+import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
import java.net.URL;
@@ -29,6 +30,7 @@ import java.util.Map;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.SeedProviderDef;
+import org.apache.cassandra.exceptions.ConfigurationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Loader;
@@ -39,20 +41,36 @@ public class SimpleSeedProvider implements SeedProvider
{
private static final Logger logger = LoggerFactory.getLogger(SimpleSeedProvider.class);
- public SimpleSeedProvider(Map<String, String> args) {}
+ List<InetAddress> seeds;
+ public SimpleSeedProvider(Map<String, String> args) {
+ try
+ {
+ seeds = loadSeeds();
+ }
+ catch (Exception e)
+ {
+ throw new AssertionError(e);
+ }
+ }
public List<InetAddress> getSeeds()
{
- InputStream input;
try
{
- URL url = DatabaseDescriptor.getStorageConfigURL();
- input = url.openStream();
+ seeds = loadSeeds();
}
catch (Exception e)
{
- throw new AssertionError(e);
+ logger.warn("Could not refresh seeds from configuration file: {}", e);
}
+ return Collections.unmodifiableList(seeds);
+ }
+
+ private List<InetAddress> loadSeeds() throws IOException, ConfigurationException
+ {
+ InputStream input;
+ URL url = DatabaseDescriptor.getStorageConfigURL();
+ input = url.openStream();
org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class);
seedDesc.putMapPropertyType("parameters", String.class, String.class);
@@ -73,6 +91,6 @@ public class SimpleSeedProvider implements SeedProvider
logger.warn("Seed provider couldn't lookup host " + host);
}
}
- return Collections.unmodifiableList(seeds);
+ return seeds;
}
}
[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5d1adb4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5d1adb4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5d1adb4
Branch: refs/heads/cassandra-2.1.0
Commit: d5d1adb4407f226c23257c300d9184c0abe32aa9
Parents: 4b6d6eb 73eb68c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 13:57:39 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 13:57:39 2014 -0500
----------------------------------------------------------------------
.../cassandra/locator/SimpleSeedProvider.java | 27 ++++++++++++++++----
1 file changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5d1adb4/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index a9ca15b,6c426bd..eda9fff
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@@ -50,8 -61,22 +61,14 @@@ public class SimpleSeedProvider impleme
}
catch (Exception e)
{
- throw new AssertionError(e);
+ logger.warn("Could not refresh seeds from configuration file: {}", e);
}
+ return Collections.unmodifiableList(seeds);
+ }
+
+ private List<InetAddress> loadSeeds() throws IOException, ConfigurationException
+ {
- InputStream input;
- URL url = DatabaseDescriptor.getStorageConfigURL();
- input = url.openStream();
- org.yaml.snakeyaml.constructor.Constructor constructor = new org.yaml.snakeyaml.constructor.Constructor(Config.class);
- TypeDescription seedDesc = new TypeDescription(SeedProviderDef.class);
- seedDesc.putMapPropertyType("parameters", String.class, String.class);
- constructor.addTypeDescription(seedDesc);
- Yaml yaml = new Yaml(new Loader(constructor));
- Config conf = (Config)yaml.load(input);
++ Config conf = DatabaseDescriptor.loadConfig();
String[] hosts = conf.seed_provider.parameters.get("seeds").split(",", -1);
List<InetAddress> seeds = new ArrayList<InetAddress>(hosts.length);
for (String host : hosts)
[4/6] git commit: Add stop method to EmbeddedCassandraService
Posted by sl...@apache.org.
Add stop method to EmbeddedCassandraService
patch by lyubent; reviewed by slebresne for CASSANDRA-7595
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/266f6b7b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/266f6b7b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/266f6b7b
Branch: refs/heads/cassandra-2.1.0
Commit: 266f6b7b50b1ee9b13d533af9e3406f8797c4af5
Parents: 73eb68c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:10:53 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:10:53 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/266f6b7b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ed04b63..2c95a52 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
* Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
* SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/266f6b7b/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java b/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
index 659d851..8993900 100644
--- a/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
+++ b/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
@@ -52,4 +52,9 @@ public class EmbeddedCassandraService
cassandraDaemon.init(null);
cassandraDaemon.start();
}
+
+ public void stop() throws IOException
+ {
+ cassandraDaemon.deactivate();
+ }
}
[3/6] git commit: Add new GC flags for java7/8
Posted by sl...@apache.org.
Add new GC flags for java7/8
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7432
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f92291c6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f92291c6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f92291c6
Branch: refs/heads/cassandra-2.1.0
Commit: f92291c62180ff7c49fc4ea0a7ca8eb9df76b8a2
Parents: d5d1adb
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:52:48 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:52:48 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f92291c6/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index d4e6590..5e2fb87 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -214,6 +214,10 @@ JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check
+if { [ "$JVM_VERSION" \> "1.7" ] && [ "$JVM_VERSION" \< "1.8.0" ] && [ "$JVM_PATCH_VERSION" -ge "60" ]; } || [ "$JVM_VERSION" \> "1.8" ] ; then
+ JVM_OPTS="$JVM_OPTS -XX:+CMSParallelInitialMarkEnabled -XX:+CMSEdenChunksRecordAlways"
+fi
+
if [ "$JVM_ARCH" = "64-Bit" ] ; then
JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark"
fi
[6/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7d950e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7d950e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7d950e3
Branch: refs/heads/cassandra-2.1.0
Commit: a7d950e36387ee46ff48b3e81f93d7a704aae874
Parents: cd84cc9 f498a94
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:13:20 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:13:20 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra-env.sh | 4 +++
.../cassandra/locator/SimpleSeedProvider.java | 27 ++++++++++++++++----
.../service/EmbeddedCassandraService.java | 5 ++++
4 files changed, 32 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7d950e3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e8a0f6f,30efd94..724dbc3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,68 -1,12 +1,69 @@@
-2.0.10
+2.1.0-final
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
++ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Update java driver (for hadoop) (CASSANDRA-7618)
- * Fix truncate to always flush (CASSANDRA-7511)
+ * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
+
+
+2.1.0-rc5
+ * Reject counters inside user types (CASSANDRA-7672)
+ * Switch to notification-based GCInspector (CASSANDRA-7638)
+ * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
+ * Don't use strict consistency when replacing (CASSANDRA-7568)
+ * Fix min/max cell name collection on 2.0 SSTables with range
+ tombstones (CASSANDRA-7593)
+ * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
+ * Filter cached results correctly (CASSANDRA-7636)
+ * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
* Remove shuffle and taketoken (CASSANDRA-7601)
- * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
- * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
- * Always merge ranges owned by a single node (CASSANDRA-6930)
- * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Clean up Windows batch scripts (CASSANDRA-7619)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+ * Fix NPE when dropping index from non-existent keyspace, AssertionError when
+ dropping non-existent index with IF EXISTS (CASSANDRA-7590)
+ * Fix sstablelevelresetter hang (CASSANDRA-7614)
+ * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
+ * Use "keyspace updated" schema change message for UDT changes in v1 and
+ v2 protocols (CASSANDRA-7617)
+ * Fix tracing of range slices and secondary index lookups that are local
+ to the coordinator (CASSANDRA-7599)
+ * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
+ * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
+ * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
+ * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
+ * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626)
+ * Fix scrub against collection type (CASSANDRA-7665)
+Merged from 2.0:
+ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
+ * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
+ * Always flush on truncate (CASSANDRA-7511)
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+
+
+2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
+ * Updated memtable_cleanup_threshold and memtable_flush_writers defaults
+ (CASSANDRA-7551)
+ * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
+ * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
+ * Fix configuration error message when running nodetool ring (CASSANDRA-7508)
+ * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
+ * Handle queries on multiple secondary index types (CASSANDRA-7525)
+ * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
* Warn when SSL certificates have expired (CASSANDRA-7528)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7d950e3/conf/cassandra-env.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7d950e3/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
index 6f36cd0,eda9fff..8e7d9fc
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@@ -63,9 -80,9 +80,9 @@@ public class SimpleSeedProvider impleme
catch (UnknownHostException ex)
{
// not fatal... DD will bark if there end up being zero seeds.
- logger.warn("Seed provider couldn't lookup host " + host);
+ logger.warn("Seed provider couldn't lookup host {}", host);
}
}
- return Collections.unmodifiableList(seeds);
+ return seeds;
}
}
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f498a94c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f498a94c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f498a94c
Branch: refs/heads/cassandra-2.1.0
Commit: f498a94cec0acb1d254bc266f408f1642d206207
Parents: f92291c 266f6b7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Aug 6 12:12:21 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Aug 6 12:12:21 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f498a94c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 20330f8,2c95a52..30efd94
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,5 +1,32 @@@
-1.2.19
+2.0.10
+ * Update java driver (for hadoop) (CASSANDRA-7618)
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
* Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
* SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)