You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/08/06 00:55:11 UTC
[01/11] git commit: Fix build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 d5d1adb44 -> f92291c62
refs/heads/cassandra-2.1 72241f6d7 -> 97e74eece
refs/heads/trunk 4a69811ee -> 740bcb540
Fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b6d6ebd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b6d6ebd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b6d6ebd
Branch: refs/heads/cassandra-2.1
Commit: 4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c
Parents: 5151fd5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 5 16:02:56 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 5 16:02:56 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b6d6ebd/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index 741f599..7a5fd47 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -519,6 +519,11 @@ public class CqlConfigHelper
}
@Override
+ public void onSuspected(Host host)
+ {
+ }
+
+ @Override
public HostDistance distance(Host host)
{
if (host.getAddress().getHostName().equals(stickHost))
[03/11] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@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
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)
[05/11] git commit: Add new GC flags for java7/8
Posted by br...@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.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
[10/11] git commit: Add CMSWaitDuration=10000
Posted by br...@apache.org.
Add CMSWaitDuration=10000
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97e74eec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97e74eec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97e74eec
Branch: refs/heads/trunk
Commit: 97e74eece4da0426af5b1f72ca77c40b12c5f76c
Parents: 62838b9
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:54:50 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:54:50 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/97e74eec/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index be84e6e..965b3a2 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -218,6 +218,7 @@ JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
+JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
# 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
[09/11] git commit: Add CMSWaitDuration=10000
Posted by br...@apache.org.
Add CMSWaitDuration=10000
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97e74eec
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97e74eec
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97e74eec
Branch: refs/heads/cassandra-2.1
Commit: 97e74eece4da0426af5b1f72ca77c40b12c5f76c
Parents: 62838b9
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:54:50 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:54:50 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/97e74eec/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index be84e6e..965b3a2 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -218,6 +218,7 @@ JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
+JVM_OPTS="$JVM_OPTS -XX:CMSWaitDuration=10000"
# 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
[08/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/62838b93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62838b93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62838b93
Branch: refs/heads/cassandra-2.1
Commit: 62838b93b13f9029665b30af24a9576ae3d01ab6
Parents: 72241f6 f92291c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:53:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:53:40 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62838b93/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 1a8f08d,5e2fb87..be84e6e
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -217,9 -212,12 +217,13 @@@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThre
JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
+JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
# 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
[04/11] git commit: Add new GC flags for java7/8
Posted by br...@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/trunk
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
[06/11] git commit: Add new GC flags for java7/8
Posted by br...@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
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
[07/11] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/62838b93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62838b93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62838b93
Branch: refs/heads/trunk
Commit: 62838b93b13f9029665b30af24a9576ae3d01ab6
Parents: 72241f6 f92291c
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:53:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:53:40 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62838b93/conf/cassandra-env.sh
----------------------------------------------------------------------
diff --cc conf/cassandra-env.sh
index 1a8f08d,5e2fb87..be84e6e
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -217,9 -212,12 +217,13 @@@ JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThre
JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75"
JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly"
JVM_OPTS="$JVM_OPTS -XX:+UseTLAB"
+JVM_OPTS="$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler"
# 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
[02/11] git commit: Prevent SSP from erroring out when the yaml is
yanked from it.
Posted by br...@apache.org.
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
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;
}
}
[11/11] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/740bcb54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/740bcb54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/740bcb54
Branch: refs/heads/trunk
Commit: 740bcb540f2d5a540dcef379dfd7cd50d8916505
Parents: 4a69811 97e74ee
Author: Brandon Williams <br...@apache.org>
Authored: Tue Aug 5 17:55:01 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Aug 5 17:55:01 2014 -0500
----------------------------------------------------------------------
conf/cassandra-env.sh | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------