You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2017/01/11 07:02:12 UTC
[20/30] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2acc15ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2acc15ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2acc15ba
Branch: refs/heads/cassandra-3.X
Commit: 2acc15ba38695495acdb678dcb005d7f611bae2b
Parents: dbe039f 47f7d9c
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Jan 11 07:37:22 2017 +0100
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Jan 11 07:37:22 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2acc15ba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b301ee,23fd12a..a7e89ed
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,8 +1,33 @@@
-2.1.17
+2.2.9
+ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
+ * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
+ * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
+ * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)
+ * Reduce granuality of OpOrder.Group during index build (CASSANDRA-12796)
+ * Test bind parameters and unset parameters in InsertUpdateIfConditionTest (CASSANDRA-12980)
+ * 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)
+ * Avoid blocking gossip during pending range calculation (CASSANDRA-12281)
+ * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792)
+ * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901)
+ * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863)
+ * Fix Util.spinAssertEquals (CASSANDRA-12283)
+ * Fix potential NPE for compactionstats (CASSANDRA-12462)
+ * Prepare legacy authenticate statement if credentials table initialised after node startup (CASSANDRA-12813)
+ * Change cassandra.wait_for_tracing_events_timeout_secs default to 0 (CASSANDRA-12754)
+ * Clean up permissions when a UDA is dropped (CASSANDRA-12720)
+ * Limit colUpdateTimeDelta histogram updates to reasonable deltas (CASSANDRA-11117)
+ * Fix leak errors and execution rejected exceptions when draining (CASSANDRA-12457)
+ * Fix merkle tree depth calculation (CASSANDRA-12580)
+ * Make Collections deserialization more robust (CASSANDRA-12618)
+ * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
+ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979)
+Merged from 2.1:
+ * Fix race causing infinite loop if Thrift server is stopped before it starts listening (CASSANDRA-12856)
* cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959)
- * Fix missed signal when commit log segments are recycled (CASSANDRA-13037)
- * Fix RecoveryManagerTruncateTest (CASSANDRA-12802)
* Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2acc15ba/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index c5f34ae,905a981..efa9330
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@@ -81,10 -81,11 +81,12 @@@ public class CustomTThreadPoolServer ex
public CustomTThreadPoolServer(TThreadPoolServer.Args args, ExecutorService executorService) {
super(args);
this.executorService = executorService;
+ this.stopped = false;
this.args = args;
+ this.activeClients = new AtomicInteger(0);
}
+ @SuppressWarnings("resource")
public void serve()
{
try