You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/03/31 16:19:12 UTC
[01/10] cassandra git commit: Add cassandra-stress keystore option
(CASSANDRA-9325)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 10f25aeeb -> 106750c78
refs/heads/cassandra-3.0 f8cc86039 -> 067c8dfbe
refs/heads/cassandra-3.5 b984ea35e -> b80a31d7e
refs/heads/trunk 3c147f865 -> 7e5c6b597
Add cassandra-stress keystore option (CASSANDRA-9325)
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
* Adds keystore -transport option in case client verification is used on server
Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/106750c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/106750c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/106750c7
Branch: refs/heads/cassandra-2.2
Commit: 106750c78e21c6d7ad85ee2d0819a36cd65726b3
Parents: 10f25ae
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Tue Feb 16 17:34:26 2016 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:09:24 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7aa321..3e51935 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
* Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
index 8b0ef6a..b6d1d90 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
@@ -65,6 +65,10 @@ public class SettingsTransport implements Serializable
factoryOptions.put(SSLTransportFactory.TRUSTSTORE, options.trustStore.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.TRUSTSTORE_PASSWORD))
factoryOptions.put(SSLTransportFactory.TRUSTSTORE_PASSWORD, options.trustStorePw.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE, options.keyStore.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE_PASSWORD))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE_PASSWORD, options.keyStorePw.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.PROTOCOL))
factoryOptions.put(SSLTransportFactory.PROTOCOL, options.protocol.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.CIPHER_SUITES))
@@ -102,6 +106,16 @@ public class SettingsTransport implements Serializable
encOptions.enabled = true;
encOptions.truststore = options.trustStore.value();
encOptions.truststore_password = options.trustStorePw.value();
+ if (options.keyStore.present())
+ {
+ encOptions.keystore = options.keyStore.value();
+ encOptions.keystore_password = options.keyStorePw.value();
+ }
+ else
+ {
+ // mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
+ encOptions.keystore = encOptions.truststore;
+ }
encOptions.algorithm = options.alg.value();
encOptions.protocol = options.protocol.value();
encOptions.cipher_suites = options.ciphers.value().split(",");
@@ -116,6 +130,8 @@ public class SettingsTransport implements Serializable
final OptionSimple factory = new OptionSimple("factory=", ".*", TFramedTransportFactory.class.getName(), "Fully-qualified ITransportFactory class name for creating a connection. Note: For Thrift over SSL, use org.apache.cassandra.thrift.SSLTransportFactory.", false);
final OptionSimple trustStore = new OptionSimple("truststore=", ".*", null, "SSL: full path to truststore", false);
final OptionSimple trustStorePw = new OptionSimple("truststore-password=", ".*", null, "SSL: truststore password", false);
+ final OptionSimple keyStore = new OptionSimple("keystore=", ".*", null, "SSL: full path to keystore", false);
+ final OptionSimple keyStorePw = new OptionSimple("keystore-password=", ".*", null, "SSL: keystore password", false);
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false);
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", "SunX509", "SSL: algorithm", false);
final OptionSimple storeType = new OptionSimple("store-type=", ".*", "JKS", "SSL: keystore format", false);
@@ -124,7 +140,7 @@ public class SettingsTransport implements Serializable
@Override
public List<? extends Option> options()
{
- return Arrays.asList(factory, trustStore, trustStorePw, protocol, alg, storeType, ciphers);
+ return Arrays.asList(factory, trustStore, trustStorePw, keyStore, keyStorePw, protocol, alg, storeType, ciphers);
}
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
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/067c8dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/067c8dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/067c8dfb
Branch: refs/heads/trunk
Commit: 067c8dfbe41421283e8cf6dc3c595efb237be054
Parents: f8cc860 106750c
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:15:40 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:15:40 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/067c8dfb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 449a2b5,3e51935..eda762b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
-2.2.6
+3.0.5
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
- * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
* cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
[02/10] cassandra git commit: Add cassandra-stress keystore option
(CASSANDRA-9325)
Posted by ja...@apache.org.
Add cassandra-stress keystore option (CASSANDRA-9325)
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
* Adds keystore -transport option in case client verification is used on server
Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/106750c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/106750c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/106750c7
Branch: refs/heads/cassandra-3.0
Commit: 106750c78e21c6d7ad85ee2d0819a36cd65726b3
Parents: 10f25ae
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Tue Feb 16 17:34:26 2016 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:09:24 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7aa321..3e51935 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
* Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
index 8b0ef6a..b6d1d90 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
@@ -65,6 +65,10 @@ public class SettingsTransport implements Serializable
factoryOptions.put(SSLTransportFactory.TRUSTSTORE, options.trustStore.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.TRUSTSTORE_PASSWORD))
factoryOptions.put(SSLTransportFactory.TRUSTSTORE_PASSWORD, options.trustStorePw.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE, options.keyStore.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE_PASSWORD))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE_PASSWORD, options.keyStorePw.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.PROTOCOL))
factoryOptions.put(SSLTransportFactory.PROTOCOL, options.protocol.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.CIPHER_SUITES))
@@ -102,6 +106,16 @@ public class SettingsTransport implements Serializable
encOptions.enabled = true;
encOptions.truststore = options.trustStore.value();
encOptions.truststore_password = options.trustStorePw.value();
+ if (options.keyStore.present())
+ {
+ encOptions.keystore = options.keyStore.value();
+ encOptions.keystore_password = options.keyStorePw.value();
+ }
+ else
+ {
+ // mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
+ encOptions.keystore = encOptions.truststore;
+ }
encOptions.algorithm = options.alg.value();
encOptions.protocol = options.protocol.value();
encOptions.cipher_suites = options.ciphers.value().split(",");
@@ -116,6 +130,8 @@ public class SettingsTransport implements Serializable
final OptionSimple factory = new OptionSimple("factory=", ".*", TFramedTransportFactory.class.getName(), "Fully-qualified ITransportFactory class name for creating a connection. Note: For Thrift over SSL, use org.apache.cassandra.thrift.SSLTransportFactory.", false);
final OptionSimple trustStore = new OptionSimple("truststore=", ".*", null, "SSL: full path to truststore", false);
final OptionSimple trustStorePw = new OptionSimple("truststore-password=", ".*", null, "SSL: truststore password", false);
+ final OptionSimple keyStore = new OptionSimple("keystore=", ".*", null, "SSL: full path to keystore", false);
+ final OptionSimple keyStorePw = new OptionSimple("keystore-password=", ".*", null, "SSL: keystore password", false);
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false);
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", "SunX509", "SSL: algorithm", false);
final OptionSimple storeType = new OptionSimple("store-type=", ".*", "JKS", "SSL: keystore format", false);
@@ -124,7 +140,7 @@ public class SettingsTransport implements Serializable
@Override
public List<? extends Option> options()
{
- return Arrays.asList(factory, trustStore, trustStorePw, protocol, alg, storeType, ciphers);
+ return Arrays.asList(factory, trustStore, trustStorePw, keyStore, keyStorePw, protocol, alg, storeType, ciphers);
}
}
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b80a31d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b80a31d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b80a31d7
Branch: refs/heads/cassandra-3.5
Commit: b80a31d7e0e3ea7bdb6cd5eb9de8d33a38e04430
Parents: b984ea3 067c8df
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:18:02 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:18:02 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b80a31d7/CHANGES.txt
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
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/067c8dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/067c8dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/067c8dfb
Branch: refs/heads/cassandra-3.0
Commit: 067c8dfbe41421283e8cf6dc3c595efb237be054
Parents: f8cc860 106750c
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:15:40 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:15:40 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/067c8dfb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 449a2b5,3e51935..eda762b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
-2.2.6
+3.0.5
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
- * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
* cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by ja...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b80a31d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b80a31d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b80a31d7
Branch: refs/heads/trunk
Commit: b80a31d7e0e3ea7bdb6cd5eb9de8d33a38e04430
Parents: b984ea3 067c8df
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:18:02 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:18:02 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b80a31d7/CHANGES.txt
----------------------------------------------------------------------
[03/10] cassandra git commit: Add cassandra-stress keystore option
(CASSANDRA-9325)
Posted by ja...@apache.org.
Add cassandra-stress keystore option (CASSANDRA-9325)
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
* Adds keystore -transport option in case client verification is used on server
Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/106750c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/106750c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/106750c7
Branch: refs/heads/cassandra-3.5
Commit: 106750c78e21c6d7ad85ee2d0819a36cd65726b3
Parents: 10f25ae
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Tue Feb 16 17:34:26 2016 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:09:24 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7aa321..3e51935 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
* Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
index 8b0ef6a..b6d1d90 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
@@ -65,6 +65,10 @@ public class SettingsTransport implements Serializable
factoryOptions.put(SSLTransportFactory.TRUSTSTORE, options.trustStore.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.TRUSTSTORE_PASSWORD))
factoryOptions.put(SSLTransportFactory.TRUSTSTORE_PASSWORD, options.trustStorePw.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE, options.keyStore.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE_PASSWORD))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE_PASSWORD, options.keyStorePw.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.PROTOCOL))
factoryOptions.put(SSLTransportFactory.PROTOCOL, options.protocol.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.CIPHER_SUITES))
@@ -102,6 +106,16 @@ public class SettingsTransport implements Serializable
encOptions.enabled = true;
encOptions.truststore = options.trustStore.value();
encOptions.truststore_password = options.trustStorePw.value();
+ if (options.keyStore.present())
+ {
+ encOptions.keystore = options.keyStore.value();
+ encOptions.keystore_password = options.keyStorePw.value();
+ }
+ else
+ {
+ // mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
+ encOptions.keystore = encOptions.truststore;
+ }
encOptions.algorithm = options.alg.value();
encOptions.protocol = options.protocol.value();
encOptions.cipher_suites = options.ciphers.value().split(",");
@@ -116,6 +130,8 @@ public class SettingsTransport implements Serializable
final OptionSimple factory = new OptionSimple("factory=", ".*", TFramedTransportFactory.class.getName(), "Fully-qualified ITransportFactory class name for creating a connection. Note: For Thrift over SSL, use org.apache.cassandra.thrift.SSLTransportFactory.", false);
final OptionSimple trustStore = new OptionSimple("truststore=", ".*", null, "SSL: full path to truststore", false);
final OptionSimple trustStorePw = new OptionSimple("truststore-password=", ".*", null, "SSL: truststore password", false);
+ final OptionSimple keyStore = new OptionSimple("keystore=", ".*", null, "SSL: full path to keystore", false);
+ final OptionSimple keyStorePw = new OptionSimple("keystore-password=", ".*", null, "SSL: keystore password", false);
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false);
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", "SunX509", "SSL: algorithm", false);
final OptionSimple storeType = new OptionSimple("store-type=", ".*", "JKS", "SSL: keystore format", false);
@@ -124,7 +140,7 @@ public class SettingsTransport implements Serializable
@Override
public List<? extends Option> options()
{
- return Arrays.asList(factory, trustStore, trustStorePw, protocol, alg, storeType, ciphers);
+ return Arrays.asList(factory, trustStore, trustStorePw, keyStore, keyStorePw, protocol, alg, storeType, ciphers);
}
}
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ja...@apache.org.
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/067c8dfb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/067c8dfb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/067c8dfb
Branch: refs/heads/cassandra-3.5
Commit: 067c8dfbe41421283e8cf6dc3c595efb237be054
Parents: f8cc860 106750c
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:15:40 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:15:40 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/067c8dfb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 449a2b5,3e51935..eda762b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,7 +1,19 @@@
-2.2.6
+3.0.5
+ * Upgrade ohc to 0.4.3
+ * Enable SO_REUSEADDR for JMX RMI server sockets (CASSANDRA-11093)
+ * Allocate merkletrees with the correct size (CASSANDRA-11390)
+ * Support streaming pre-3.0 sstables (CASSANDRA-10990)
+ * Add backpressure to compressed commit log (CASSANDRA-10971)
+ * SSTableExport supports secondary index tables (CASSANDRA-11330)
+ * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
+ * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)
+ * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208)
+ * Remove recursive call from CompositesSearcher (CASSANDRA-11304)
+ * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377)
+ * Fix sstableloader fail when using materialized view (CASSANDRA-11275)
+Merged from 2.2:
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
- * Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
* cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333)
* Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
[04/10] cassandra git commit: Add cassandra-stress keystore option
(CASSANDRA-9325)
Posted by ja...@apache.org.
Add cassandra-stress keystore option (CASSANDRA-9325)
* Prevents stress tool from checking keystore at .conf/keystore even if not needed
* Adds keystore -transport option in case client verification is used on server
Patch by Stefan Podkowinski; reviewed by T Jake Luciani for CASSANDRA-9325
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/106750c7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/106750c7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/106750c7
Branch: refs/heads/trunk
Commit: 106750c78e21c6d7ad85ee2d0819a36cd65726b3
Parents: 10f25ae
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Tue Feb 16 17:34:26 2016 +0100
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:09:24 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e7aa321..3e51935 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * Add cassandra-stress keystore option (CASSANDRA-9325)
* Dont mark sstables as repairing with sub range repairs (CASSANDRA-11451)
* Fix use of NullUpdater for 2i during compaction (CASSANDRA-11450)
* Notify when sstables change after cancelling compaction (CASSANDRA-11373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/106750c7/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
index 8b0ef6a..b6d1d90 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
@@ -65,6 +65,10 @@ public class SettingsTransport implements Serializable
factoryOptions.put(SSLTransportFactory.TRUSTSTORE, options.trustStore.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.TRUSTSTORE_PASSWORD))
factoryOptions.put(SSLTransportFactory.TRUSTSTORE_PASSWORD, options.trustStorePw.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE, options.keyStore.value());
+ if (transportFactory.supportedOptions().contains(SSLTransportFactory.KEYSTORE_PASSWORD))
+ factoryOptions.put(SSLTransportFactory.KEYSTORE_PASSWORD, options.keyStorePw.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.PROTOCOL))
factoryOptions.put(SSLTransportFactory.PROTOCOL, options.protocol.value());
if (transportFactory.supportedOptions().contains(SSLTransportFactory.CIPHER_SUITES))
@@ -102,6 +106,16 @@ public class SettingsTransport implements Serializable
encOptions.enabled = true;
encOptions.truststore = options.trustStore.value();
encOptions.truststore_password = options.trustStorePw.value();
+ if (options.keyStore.present())
+ {
+ encOptions.keystore = options.keyStore.value();
+ encOptions.keystore_password = options.keyStorePw.value();
+ }
+ else
+ {
+ // mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
+ encOptions.keystore = encOptions.truststore;
+ }
encOptions.algorithm = options.alg.value();
encOptions.protocol = options.protocol.value();
encOptions.cipher_suites = options.ciphers.value().split(",");
@@ -116,6 +130,8 @@ public class SettingsTransport implements Serializable
final OptionSimple factory = new OptionSimple("factory=", ".*", TFramedTransportFactory.class.getName(), "Fully-qualified ITransportFactory class name for creating a connection. Note: For Thrift over SSL, use org.apache.cassandra.thrift.SSLTransportFactory.", false);
final OptionSimple trustStore = new OptionSimple("truststore=", ".*", null, "SSL: full path to truststore", false);
final OptionSimple trustStorePw = new OptionSimple("truststore-password=", ".*", null, "SSL: truststore password", false);
+ final OptionSimple keyStore = new OptionSimple("keystore=", ".*", null, "SSL: full path to keystore", false);
+ final OptionSimple keyStorePw = new OptionSimple("keystore-password=", ".*", null, "SSL: keystore password", false);
final OptionSimple protocol = new OptionSimple("ssl-protocol=", ".*", "TLS", "SSL: connection protocol to use", false);
final OptionSimple alg = new OptionSimple("ssl-alg=", ".*", "SunX509", "SSL: algorithm", false);
final OptionSimple storeType = new OptionSimple("store-type=", ".*", "JKS", "SSL: keystore format", false);
@@ -124,7 +140,7 @@ public class SettingsTransport implements Serializable
@Override
public List<? extends Option> options()
{
- return Arrays.asList(factory, trustStore, trustStorePw, protocol, alg, storeType, ciphers);
+ return Arrays.asList(factory, trustStore, trustStorePw, keyStore, keyStorePw, protocol, alg, storeType, ciphers);
}
}
[10/10] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7e5c6b59
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e5c6b59
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e5c6b59
Branch: refs/heads/trunk
Commit: 7e5c6b597aae9571b3e6fb47dfe3b6467fecdc19
Parents: 3c147f8 b80a31d
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Mar 31 10:18:19 2016 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Mar 31 10:18:19 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../stress/settings/SettingsTransport.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e5c6b59/CHANGES.txt
----------------------------------------------------------------------