Repository: cassandra Updated Branches: refs/heads/trunk b274aa1c7 -> a64f4143c
Don't set client mode in SSTableLoader Patch by marcuse; reviewed by yukim for CASSANDRA-8238 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/022e3ee3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/022e3ee3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/022e3ee3 Branch: refs/heads/trunk Commit: 022e3ee31c17c44cf6cf19dacef66a03156209ab Parents: d97e7cb Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Mar 13 15:02:51 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Mar 16 09:43:24 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/YamlConfigurationLoader.java | 2 +- src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 5 ----- src/java/org/apache/cassandra/tools/BulkLoader.java | 1 + 4 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/022e3ee3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d7ab277..d41a1a4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Don't set clientMode in SSTableLoader (CASSANDRA-8238) * Fix SSTableRewriter with disabled early open (CASSANDRA-8535) * Allow invalidating permissions and cache time (CASSANDRA-8722) * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0 http://git-wip-us.apache.org/repos/asf/cassandra/blob/022e3ee3/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 0b62ff4..e222046 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -71,7 +71,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader String required = "file:" + File.separator + File.separator; if (!configUrl.startsWith(required)) throw new ConfigurationException("Expecting URI in variable: [cassandra.config]. Please prefix the file with " + required + File.separator + - " for local files or " + required + "<server>" + File.separator + " for remote files. Aborting."); + " for local files or " + required + "<server>" + File.separator + " for remote files. Aborting. If you are executing this from an external tool, it needs to set Config.setClientMode(true) to avoid loading configuration."); throw new ConfigurationException("Cannot locate " + configUrl + ". If this is a local file, please confirm you've provided " + required + File.separator + " as a URI prefix."); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/022e3ee3/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java index cd23ae2..b66f8dc 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java @@ -57,11 +57,6 @@ public class SSTableLoader implements StreamEventHandler private final List<SSTableReader> sstables = new ArrayList<>(); private final Multimap<InetAddress, StreamSession.SSTableStreamingSections> streamingDetails = HashMultimap.create(); - static - { - Config.setClientMode(true); - } - public SSTableLoader(File directory, Client client, OutputHandler outputHandler) { this(directory, client, outputHandler, 1); http://git-wip-us.apache.org/repos/asf/cassandra/blob/022e3ee3/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index f15c86d..73f4ec5 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -75,6 +75,7 @@ public class BulkLoader public static void main(String args[]) { + Config.setClientMode(true); LoaderOptions options = LoaderOptions.parseArgs(args); OutputHandler handler = new OutputHandler.SystemOutput(options.verbose, options.debug); SSTableLoader loader = new SSTableLoader(
