You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/21 05:36:12 UTC
[1/2] git commit: Do not open non-ssl storage port if encryption
option is all patch by dbrosius reviewed by jbellis for cassandra-3916
Updated Branches:
refs/heads/cassandra-2.0 0d976a8fb -> 15c738c58
Do not open non-ssl storage port if encryption option is all
patch by dbrosius reviewed by jbellis for cassandra-3916
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb43309b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb43309b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb43309b
Branch: refs/heads/cassandra-2.0
Commit: fb43309b4741372f777e8ce910cd496299a1ebbf
Parents: a0fa697
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 20 23:24:10 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 20 23:24:10 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../apache/cassandra/net/MessagingService.java | 75 ++++++++++----------
2 files changed, 41 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb43309b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 27e6f24..b4681ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
1.2.11
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
1.2.10
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb43309b/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 2964d35..a199e83 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -413,45 +413,48 @@ public final class MessagingService implements MessagingServiceMBean
logger.info("Starting Encrypted Messaging Service on SSL port {}", DatabaseDescriptor.getSSLStoragePort());
}
- ServerSocketChannel serverChannel = null;
- try
- {
- serverChannel = ServerSocketChannel.open();
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- ServerSocket socket = serverChannel.socket();
- try
- {
- socket.setReuseAddress(true);
- }
- catch (SocketException e)
+ if (DatabaseDescriptor.getServerEncryptionOptions().internode_encryption != ServerEncryptionOptions.InternodeEncryption.all)
{
- throw new ConfigurationException("Insufficient permissions to setReuseAddress", e);
- }
- InetSocketAddress address = new InetSocketAddress(localEp, DatabaseDescriptor.getStoragePort());
- try
- {
- socket.bind(address);
- }
- catch (BindException e)
- {
- if (e.getMessage().contains("in use"))
- throw new ConfigurationException(address + " is in use by another process. Change listen_address:storage_port in cassandra.yaml to values that do not conflict with other services");
- else if (e.getMessage().contains("Cannot assign requested address"))
- throw new ConfigurationException("Unable to bind to address " + address
- + ". Set listen_address in cassandra.yaml to an interface you can bind to, e.g., your private IP address on EC2");
- else
+ ServerSocketChannel serverChannel = null;
+ try
+ {
+ serverChannel = ServerSocketChannel.open();
+ }
+ catch (IOException e)
+ {
throw new RuntimeException(e);
+ }
+ ServerSocket socket = serverChannel.socket();
+ try
+ {
+ socket.setReuseAddress(true);
+ }
+ catch (SocketException e)
+ {
+ throw new ConfigurationException("Insufficient permissions to setReuseAddress", e);
+ }
+ InetSocketAddress address = new InetSocketAddress(localEp, DatabaseDescriptor.getStoragePort());
+ try
+ {
+ socket.bind(address);
+ }
+ catch (BindException e)
+ {
+ if (e.getMessage().contains("in use"))
+ throw new ConfigurationException(address + " is in use by another process. Change listen_address:storage_port in cassandra.yaml to values that do not conflict with other services");
+ else if (e.getMessage().contains("Cannot assign requested address"))
+ throw new ConfigurationException("Unable to bind to address " + address
+ + ". Set listen_address in cassandra.yaml to an interface you can bind to, e.g., your private IP address on EC2");
+ else
+ throw new RuntimeException(e);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ logger.info("Starting Messaging Service on port {}", DatabaseDescriptor.getStoragePort());
+ ss.add(socket);
}
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- logger.info("Starting Messaging Service on port {}", DatabaseDescriptor.getStoragePort());
- ss.add(socket);
return ss;
}
[2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15c738c5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15c738c5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15c738c5
Branch: refs/heads/cassandra-2.0
Commit: 15c738c588828fda29c8ceff0e0fd505770ece2c
Parents: 0d976a8 fb43309
Author: Dave Brosius <db...@apache.org>
Authored: Fri Sep 20 23:35:27 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Sep 20 23:35:27 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 5 ++
.../apache/cassandra/net/MessagingService.java | 75 ++++++++++----------
2 files changed, 44 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15c738c5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7f30117,b4681ae..f239b5a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,10 +1,43 @@@
-1.2.11
+2.0.1
+ * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
+ * Improve memory use defaults (CASSANDRA-5069)
+ * Make ThriftServer more easlly extensible (CASSANDRA-6058)
+ * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
+ * add file_cache_size_in_mb setting (CASSANDRA-5661)
+ * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
+ * Improve leveled compaction's ability to find non-overlapping L0 compactions
+ to work on concurrently (CASSANDRA-5921)
+ * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
+ * Log Merkle tree stats (CASSANDRA-2698)
+ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
+ * Improve offheap memcpy performance (CASSANDRA-5884)
+ * Use a range aware scanner for cleanup (CASSANDRA-2524)
+ * Cleanup doesn't need to inspect sstables that contain only local data
+ (CASSANDRA-5722)
+ * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
+ * Improve native protocol serialization (CASSANDRA-5664)
+ * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
+ * Require superuser status for adding triggers (CASSANDRA-5963)
+ * Make standalone scrubber handle old and new style leveled manifest
+ (CASSANDRA-6005)
+ * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
+ * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
+ * Fix NPE in sstablesplit (CASSANDRA-6027)
+ * Migrate pre-2.0 key/value/column aliases to system.schema_columns
+ (CASSANDRA-6009)
+ * Paging filter empty rows too agressively (CASSANDRA-6040)
+ * Support variadic parameters for IN clauses (CASSANDRA-4210)
+ * cqlsh: return the result of CAS writes (CASSANDRA-5796)
+ * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
+ * Support named bind variables in CQL (CASSANDRA-6033)
+Merged from 1.2:
* Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
+ * Allow where clause conditions to be in parenthesis (CASSANDRA-6037)
+ * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916)
+
+
+ 1.2.10
* Avoid second-guessing out-of-space state (CASSANDRA-5605)
* Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
* (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/15c738c5/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------