Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/405ad009 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/405ad009 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/405ad009 Branch: refs/heads/cassandra-3.11 Commit: 405ad0099bf6318fa47072b32c3d6ad2cbc68c41 Parents: a8e2dc5 428eaa3 Author: Jason Brown <jasedbr...@gmail.com> Authored: Wed Sep 20 06:58:02 2017 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Wed Sep 20 07:05:13 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/BulkLoader.java | 38 ++++++++++++++++---- 2 files changed, 33 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/405ad009/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0af156f,848628b..0b3421f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ -2.1.19 +2.2.11 + * Safely handle empty buffers when outputting to JSON (CASSANDRA-13868) + * Copy session properties on cqlsh.py do_login (CASSANDRA-13847) + * Fix load over calculated issue in IndexSummaryRedistribution (CASSANDRA-13738) + * Fix compaction and flush exception not captured (CASSANDRA-13833) + * Make BatchlogManagerMBean.forceBatchlogReplay() blocking (CASSANDRA-13809) + * Uncaught exceptions in Netty pipeline (CASSANDRA-13649) + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) + * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) + * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) + * Fix nested Tuples/UDTs validation (CASSANDRA-13646) + * Remove unused max_value_size_in_mb config setting from yaml (CASSANDRA-13625 +Merged from 2.1: + * Add storage port options to sstableloader (CASSANDRA-13844) - * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) + * Remove stress-test target in CircleCI as it's not existing (CASSANDRA-13775) * Clone HeartBeatState when building gossip messages. Make its generation/version volatile (CASSANDRA-13700) http://git-wip-us.apache.org/repos/asf/cassandra/blob/405ad009/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java index 7d0fdc8,52f9467..093a063 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@@ -47,7 -55,9 +47,9 @@@ public class BulkLoade private static final String NOPROGRESS_OPTION = "no-progress"; private static final String IGNORE_NODES_OPTION = "ignore"; private static final String INITIAL_HOST_ADDRESS_OPTION = "nodes"; - private static final String RPC_PORT_OPTION = "port"; + private static final String NATIVE_PORT_OPTION = "port"; + private static final String STORAGE_PORT_OPTION = "storage-port"; + private static final String SSL_STORAGE_PORT_OPTION = "ssl-storage-port"; private static final String USER_OPTION = "username"; private static final String PASSWD_OPTION = "password"; private static final String THROTTLE_MBITS = "throttle"; @@@ -306,7 -401,7 +308,7 @@@ public boolean debug; public boolean verbose; public boolean noProgress; - public int nativePort = 9042; - public int rpcPort; ++ public int nativePort; public String user; public String passwd; public int throttle = 0; @@@ -438,13 -531,38 +437,38 @@@ config.stream_throughput_outbound_megabits_per_sec = 0; config.inter_dc_stream_throughput_outbound_megabits_per_sec = 0; } - opts.storagePort = config.storage_port; - opts.sslStoragePort = config.ssl_storage_port; opts.throttle = config.stream_throughput_outbound_megabits_per_sec; opts.interDcThrottle = config.inter_dc_stream_throughput_outbound_megabits_per_sec; - opts.encOptions = config.client_encryption_options; + opts.clientEncOptions = config.client_encryption_options; opts.serverEncOptions = config.server_encryption_options; - if (cmd.hasOption(RPC_PORT_OPTION)) ++ if (cmd.hasOption(NATIVE_PORT_OPTION)) + { - opts.rpcPort = Integer.parseInt(cmd.getOptionValue(RPC_PORT_OPTION)); ++ opts.nativePort = Integer.parseInt(cmd.getOptionValue(NATIVE_PORT_OPTION)); + } + else + { - opts.rpcPort = config.rpc_port; ++ opts.nativePort = config.native_transport_port; + } + + if (cmd.hasOption(STORAGE_PORT_OPTION)) + { + opts.storagePort = Integer.parseInt(cmd.getOptionValue(STORAGE_PORT_OPTION)); + } + else + { + opts.storagePort = config.storage_port; + } + + if (cmd.hasOption(SSL_STORAGE_PORT_OPTION)) + { + opts.sslStoragePort = Integer.parseInt(cmd.getOptionValue(SSL_STORAGE_PORT_OPTION)); + } + else + { + opts.sslStoragePort = config.ssl_storage_port; + } + if (cmd.hasOption(THROTTLE_MBITS)) { opts.throttle = Integer.parseInt(cmd.getOptionValue(THROTTLE_MBITS)); @@@ -527,7 -690,9 +551,9 @@@ options.addOption(null, NOPROGRESS_OPTION, "don't display progress"); options.addOption("i", IGNORE_NODES_OPTION, "NODES", "don't stream to this (comma separated) list of nodes"); options.addOption("d", INITIAL_HOST_ADDRESS_OPTION, "initial hosts", "Required. try to connect to these hosts (comma separated) initially for ring information"); - options.addOption("p", RPC_PORT_OPTION, "rpc port", "port used for rpc (default 9160)"); + options.addOption("p", NATIVE_PORT_OPTION, "rpc port", "port used for native connection (default 9042)"); + options.addOption("sp", STORAGE_PORT_OPTION, "storage port", "port used for internode communication (default 7000)"); + options.addOption("ssp", SSL_STORAGE_PORT_OPTION, "ssl storage port", "port used for TLS internode communication (default 7001)"); options.addOption("t", THROTTLE_MBITS, "throttle", "throttle speed in Mbits (default unlimited)"); options.addOption("idct", INTER_DC_THROTTLE_MBITS, "inter-dc-throttle", "inter-datacenter throttle speed in Mbits (default unlimited)"); options.addOption("u", USER_OPTION, "username", "username for cassandra authentication"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
