You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/03/17 16:51:53 UTC
[5/6] git commit: merge from 2.0
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60882c15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60882c15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60882c15
Branch: refs/heads/cassandra-2.1
Commit: 60882c15c8c1ceba3bd491dfc4f2041f3b34bd14
Parents: 30554b7 56e2b4a
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Mar 17 10:51:35 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Mar 17 10:51:35 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../thrift/CustomTThreadPoolServer.java | 25 ++++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60882c15/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0cd9d4a,2f708dc..ca4bcfb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
-2.0.7
+2.1.0-beta2
+ * Eliminate possibility of CL segment appearing twice in active list
+ (CASSANDRA-6557)
+ * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
+ * Switch CRC component to Adler and include it for compressed sstables
+ (CASSANDRA-4165)
+ * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
+ * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
+ * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
+ * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
+ * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
+ * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
+ * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
+ * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
+ * Scrub should not always clear out repaired status (CASSANDRA-5351)
+ * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
+ * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
+ * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
+ * Change caching option syntax (CASSANDRA-6745)
+ * Fix stress to do proper counter reads (CASSANDRA-6835)
+ * Fix help message for stress counter_write (CASSANDRA-6824)
+ * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848)
+ * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849)
+ * Fix race condition in Batch CLE (CASSANDRA-6860)
+Merged from 2.0:
+ * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788)
* Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865)
* Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864)
* Fix schema concurrency exceptions (CASSANDRA-6841)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60882c15/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 7bcfdf2,d1a3304..f7a602c
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@@ -117,9 -118,15 +118,15 @@@ public class CustomTThreadPoolServer ex
logger.warn("Transport error occurred during acceptance of message.", ttx);
}
}
+ catch (RejectedExecutionException e)
+ {
+ // worker thread decremented activeClients but hadn't finished exiting
+ logger.debug("Dropping client connection because our limit of {} has been reached", args.maxWorkerThreads);
+ continue;
+ }
if (activeClients.get() >= args.maxWorkerThreads)
- logger.warn("Maximum number of clients " + args.maxWorkerThreads + " reached");
+ logger.warn("Maximum number of clients {} reached", args.maxWorkerThreads);
}
executorService.shutdown();