cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 07 Jan 2016 11:04:50 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/601203cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/601203cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/601203cb

Branch: refs/heads/trunk
Commit: 601203cbcf5203932b299e311fe5969f2be629fc
Parents: f288387 e41fa34
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Jan 7 12:03:39 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Jan 7 12:03:39 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  7 ++++
 conf/cassandra.yaml                             |  3 +-
 .../org/apache/cassandra/config/Config.java     |  2 +-
 .../cassandra/service/StorageService.java       | 12 +++++++
 .../cassandra/service/StorageServiceMBean.java  |  3 ++
 .../org/apache/cassandra/tools/BulkLoader.java  | 12 ++++++-
 .../org/apache/cassandra/tools/NodeProbe.java   | 15 +++++++-
 .../org/apache/cassandra/tools/NodeTool.java    |  2 ++
 .../nodetool/GetInterDCStreamThroughput.java    | 33 +++++++++++++++++
 .../nodetool/SetInterDCStreamThroughput.java    | 37 ++++++++++++++++++++
 11 files changed, 123 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 64837e1,f26fe3b..c88f47b
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -164,7 -33,16 +164,14 @@@ Operation
        "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
        -Dcassandra.ignore_dc=true.
      - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
 -    - GC logging is now enabled by default (but you can disable it if you want by
 -      commenting the relevant lines of the cassandra-env file).
  
+ Upgrading
+ ---------
+     - The default for the inter-DC stream throughput setting
+       (inter_dc_stream_throughput_outbound_megabits_per_sec in cassandra.yaml) is
+       the same than the one for intra-DC one (200Mbps) instead of being unlimited.
+       Having it unlimited was never intended and was a bug.
+ 
  New features
  ------------
      - Time windows in DTCS are now limited to 1 day by default to be able to

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/Config.java
index 7154ba3,e7ac0c0..ca5bcea
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@@ -156,9 -158,9 +156,9 @@@ public class Confi
      public Integer max_streaming_retries = 3;
  
      public volatile Integer stream_throughput_outbound_megabits_per_sec = 200;
-     public volatile Integer inter_dc_stream_throughput_outbound_megabits_per_sec = 0;
+     public volatile Integer inter_dc_stream_throughput_outbound_megabits_per_sec = 200;
  
 -    public String[] data_file_directories;
 +    public String[] data_file_directories = new String[0];
  
      public String saved_caches_directory;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/BulkLoader.java
index 2b94a68,8a85c54..3e32f66
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@@ -54,8 -50,8 +54,9 @@@ public class BulkLoade
      private static final String NATIVE_PORT_OPTION = "port";
      private static final String USER_OPTION = "username";
      private static final String PASSWD_OPTION = "password";
 +    private static final String AUTH_PROVIDER_OPTION = "auth-provider";
      private static final String THROTTLE_MBITS = "throttle";
+     private static final String INTER_DC_THROTTLE_MBITS = "inter-dc-throttle";
  
      /* client encryption options */
      private static final String SSL_TRUSTSTORE = "truststore";
@@@ -310,9 -309,8 +312,10 @@@
          public int nativePort = 9042;
          public String user;
          public String passwd;
 +        public String authProviderName;
 +        public AuthProvider authProvider;
          public int throttle = 0;
+         public int interDcThrottle = 0;
          public int storagePort;
          public int sslStoragePort;
          public EncryptionOptions encOptions = new EncryptionOptions.ClientEncryptionOptions();
@@@ -577,9 -520,9 +586,10 @@@
              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",  NATIVE_PORT_OPTION, "rpc port", "port used for native
connection (default 9042)");
              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");
              options.addOption("pw", PASSWD_OPTION, "password", "password for cassandra authentication");
 +            options.addOption("ap", AUTH_PROVIDER_OPTION, "auth provider", "custom AuthProvider
class name for cassandra authentication");
              options.addOption("cph", CONNECTIONS_PER_HOST, "connectionsPerHost", "number
of concurrent connections-per-host.");
              // ssl connection-related options
              options.addOption("ts", SSL_TRUSTSTORE, "TRUSTSTORE", "Client SSL: full path
to truststore");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/601203cb/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------


Mime
View raw message