You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2016/12/09 18:29:24 UTC
[1/5] cassandra git commit: Do not specify local address on outgoing
connection when listen_on_broadcast_address is set
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X 9b0934786 -> 599dbbc9f
Do not specify local address on outgoing connection when listen_on_broadcast_address is set
Patch by Milan Majercik; Reviewed by Paulo Motta for CASSANDRA-12673
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd415263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd415263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd415263
Branch: refs/heads/cassandra-3.X
Commit: dd415263cc698d8b7b7165cb77add233302fcdfe
Parents: 0b97c5d
Author: mmajercik <mm...@specter.firstmobileaffiliate.com>
Authored: Wed Dec 7 10:52:02 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Thu Dec 8 16:45:33 2016 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 6 +++++-
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 4 ++--
4 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd415263/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 302becf..6b2a9c0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.9
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
* Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
* cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
* Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd415263/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 60daee6..9f5a22f 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -250,7 +250,11 @@ public class Config
public MemtableAllocationType memtable_allocation_type = MemtableAllocationType.heap_buffers;
- private static boolean outboundBindAny = false;
+ /**
+ * @deprecated No longer needed for streaming protocol. See CASSANDRA-12673 for details.
+ */
+ @Deprecated
+ protected static boolean outboundBindAny = false;
public volatile int tombstone_warn_threshold = 1000;
public volatile int tombstone_failure_threshold = 100000;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd415263/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 75f80b9..a3fb79b 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1752,6 +1752,11 @@ public class DatabaseDescriptor
}
}
+ public static boolean getOutboundBindAny()
+ {
+ return Config.outboundBindAny || conf.listen_on_broadcast_address;
+ }
+
public static int getIndexSummaryResizeIntervalInMinutes()
{
return conf.index_summary_resize_interval_in_minutes;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd415263/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index 2af0016..2b92036 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -129,7 +129,7 @@ public class OutboundTcpConnectionPool
// zero means 'bind on any available port.'
if (isEncryptedChannel(endpoint))
{
- if (Config.getOutboundBindAny())
+ if (DatabaseDescriptor.getOutboundBindAny())
return SSLFactory.getSocket(DatabaseDescriptor.getServerEncryptionOptions(), endpoint, DatabaseDescriptor.getSSLStoragePort());
else
return SSLFactory.getSocket(DatabaseDescriptor.getServerEncryptionOptions(), endpoint, DatabaseDescriptor.getSSLStoragePort(), FBUtilities.getLocalAddress(), 0);
@@ -137,7 +137,7 @@ public class OutboundTcpConnectionPool
else
{
SocketChannel channel = SocketChannel.open();
- if (!Config.getOutboundBindAny())
+ if (!DatabaseDescriptor.getOutboundBindAny())
channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
return channel.socket();
[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f176c574
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f176c574
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f176c574
Branch: refs/heads/cassandra-3.X
Commit: f176c574c570ba753d53416c2e84f8becb6199df
Parents: e416c82 752f5d5
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Dec 9 16:15:16 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 9 16:15:16 2016 -0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/5] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/599dbbc9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/599dbbc9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/599dbbc9
Branch: refs/heads/cassandra-3.X
Commit: 599dbbc9fb554a17092779d73bc23e5b48760f7d
Parents: 9b09347 47d604d
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Dec 9 16:20:06 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 9 16:20:06 2016 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 12 ------------
.../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 1 -
.../apache/cassandra/net/OutboundTcpConnectionPool.java | 7 +------
5 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/599dbbc9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b581977,2bf1ead..4aac593
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
+3.12
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
+ * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+ * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
+ * Add support for arithmetic operators (CASSANDRA-11935)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+
+
3.10
+ * Remove outboundBindAny configuration property (CASSANDRA-12673)
* Use correct bounds for all-data range when filtering (CASSANDRA-12666)
* Remove timing window in test case (CASSANDRA-12875)
* Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
[4/5] cassandra git commit: Remove outboundBindAny configuration
property
Posted by pa...@apache.org.
Remove outboundBindAny configuration property
Patch by Milan Majercik; Reviewed by Paulo Motta for CASSANDRA-12673
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47d604de
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47d604de
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47d604de
Branch: refs/heads/cassandra-3.X
Commit: 47d604deb0b43758461b5532b69ffc2de2df9036
Parents: f176c57
Author: mmajercik <mm...@specter.firstmobileaffiliate.com>
Authored: Thu Nov 10 16:31:03 2016 +0100
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 9 16:16:17 2016 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 12 ------------
.../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 1 -
.../apache/cassandra/net/OutboundTcpConnectionPool.java | 7 +------
5 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d604de/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6da6b4f..2bf1ead 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Remove outboundBindAny configuration property (CASSANDRA-12673)
* Use correct bounds for all-data range when filtering (CASSANDRA-12666)
* Remove timing window in test case (CASSANDRA-12875)
* Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d604de/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 80a8797..e6c8c10 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -78,6 +78,7 @@ New features
- Add support to "unset" JSON fields in prepared statements by specifying DEFAULT UNSET.
See CASSANDRA-11424 for details
- Allow TTL with null value on insert and update. It will be treated as equivalent to inserting a 0.
+ - Removed outboundBindAny configuration property. See CASSANDRA-12673 for details.
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d604de/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index b1318d9..be0517f 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -277,8 +277,6 @@ public class Config
public MemtableAllocationType memtable_allocation_type = MemtableAllocationType.heap_buffers;
- private static boolean outboundBindAny = false;
-
public volatile int tombstone_warn_threshold = 1000;
public volatile int tombstone_failure_threshold = 100000;
@@ -357,16 +355,6 @@ public class Config
public volatile boolean back_pressure_enabled = false;
public volatile ParameterizedClass back_pressure_strategy;
- public static boolean getOutboundBindAny()
- {
- return outboundBindAny;
- }
-
- public static void setOutboundBindAny(boolean value)
- {
- outboundBindAny = value;
- }
-
/**
* @deprecated migrate to {@link DatabaseDescriptor#isClientInitialized()}
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d604de/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
index 2ed37ee..fd9ed00 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlBulkRecordWriter.java
@@ -105,7 +105,6 @@ public class CqlBulkRecordWriter extends RecordWriter<Object, List<ByteBuffer>>
CqlBulkRecordWriter(Configuration conf) throws IOException
{
- Config.setOutboundBindAny(true);
this.conf = conf;
DatabaseDescriptor.setStreamThroughputOutboundMegabitsPerSec(Integer.parseInt(conf.get(STREAM_THROTTLE_MBITS, "0")));
maxFailures = Integer.parseInt(conf.get(MAX_FAILED_HOSTS, "0"));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d604de/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index b0391ba..9f9ffee 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -138,16 +138,11 @@ public class OutboundTcpConnectionPool
// zero means 'bind on any available port.'
if (isEncryptedChannel(endpoint))
{
- if (Config.getOutboundBindAny())
- return SSLFactory.getSocket(DatabaseDescriptor.getServerEncryptionOptions(), endpoint, DatabaseDescriptor.getSSLStoragePort());
- else
- return SSLFactory.getSocket(DatabaseDescriptor.getServerEncryptionOptions(), endpoint, DatabaseDescriptor.getSSLStoragePort(), FBUtilities.getLocalAddress(), 0);
+ return SSLFactory.getSocket(DatabaseDescriptor.getServerEncryptionOptions(), endpoint, DatabaseDescriptor.getSSLStoragePort());
}
else
{
SocketChannel channel = SocketChannel.open();
- if (!Config.getOutboundBindAny())
- channel.bind(new InetSocketAddress(FBUtilities.getLocalAddress(), 0));
channel.connect(new InetSocketAddress(endpoint, DatabaseDescriptor.getStoragePort()));
return channel.socket();
}
[2/5] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by pa...@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/752f5d56
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/752f5d56
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/752f5d56
Branch: refs/heads/cassandra-3.X
Commit: 752f5d566a5fd01518071943beda9945e0703cef
Parents: d9b06e8 dd41526
Author: Paulo Motta <pa...@apache.org>
Authored: Thu Dec 8 17:24:22 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Thu Dec 8 17:24:22 2016 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 6 +++++-
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++
.../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 4 ++--
4 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 21cf5be,6b2a9c0..1da48bd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
-2.2.9
+3.0.11
+ * CQL often queries static columns unnecessarily (CASSANDRA-12768)
+ * Make sure sstables only get committed when it's safe to discard commit log records (CASSANDRA-12956)
+ * Reject default_time_to_live option when creating or altering MVs (CASSANDRA-12868)
+ * Nodetool should use a more sane max heap size (CASSANDRA-12739)
+ * LocalToken ensures token values are cloned on heap (CASSANDRA-12651)
+ * AnticompactionRequestSerializer serializedSize is incorrect (CASSANDRA-12934)
+ * Prevent reloading of logback.xml from UDF sandbox (CASSANDRA-12535)
+ * Reenable HeapPool (CASSANDRA-12900)
+Merged from 2.2:
+ * Do not specify local address on outgoing connection when listen_on_broadcast_address is set (CASSANDRA-12673)
* Use saved tokens when setting local tokens on StorageService.joinRing (CASSANDRA-12935)
* cqlsh: fix DESC TYPES errors (CASSANDRA-12914)
* Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/752f5d56/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------