Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02f48c86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02f48c86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02f48c86 Branch: refs/heads/cassandra-3.8 Commit: 02f48c86591939e3cd20157af867dfec94ca443b Parents: 6a846e6 19245e5 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Aug 11 11:06:20 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Aug 11 11:06:20 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/utils/RMIServerSocketFactoryImpl.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f48c86/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bca8879,0a1d406..29a6c50 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,9 +1,13 @@@ -3.0.9 +3.9 + * Fix value skipping with counter columns (CASSANDRA-11726) + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205) + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282) + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348) + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * Fix potential resource leak in RMIServerSocketFactoryImpl (CASSANDRA-12331) - * Backport CASSANDRA-12002 (CASSANDRA-12177) * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100) - * Fix potential bad messaging service message for paged range reads - within mixed-version 3.x clusters (CASSANDRA-12249) * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828) * NullPointerException during compaction on table with static columns (CASSANDRA-12336) * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823) http://git-wip-us.apache.org/repos/asf/cassandra/blob/02f48c86/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java index 4ac4a39,6444a65..9baf0c7 --- a/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java +++ b/src/java/org/apache/cassandra/utils/RMIServerSocketFactoryImpl.java @@@ -38,9 -33,18 +39,17 @@@ public class RMIServerSocketFactoryImp public ServerSocket createServerSocket(final int pPort) throws IOException { - ServerSocket socket = ServerSocketFactory.getDefault() - .createServerSocket(pPort, 0, InetAddress.getLoopbackAddress()); + ServerSocket socket = ServerSocketFactory.getDefault().createServerSocket(pPort, 0, bindAddress); - socket.setReuseAddress(true); - return socket; + try + { + socket.setReuseAddress(true); + return socket; + } + catch (SocketException e) + { + socket.close(); + throw e; + } } public boolean equals(Object obj)
