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/dc32ed80 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc32ed80 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc32ed80 Branch: refs/heads/trunk Commit: dc32ed80d727ca644d2162fbf0fb316811cd1adf Parents: 8378bfc e1aa7d3 Author: Jason Brown <jasedbr...@gmail.com> Authored: Mon Aug 21 15:33:19 2017 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Mon Aug 21 15:36:38 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/transport/Message.java | 6 +++++- src/java/org/apache/cassandra/transport/Server.java | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc32ed80/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6faaa48,2fbb7e9..a0a61ac --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,6 +1,27 @@@ -2.2.11 +3.0.15 + * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884) + * Fix digest calculation for counter cells (CASSANDRA-13750) + * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump to use type.toJSONString() (CASSANDRA-13573) + * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737) + * Drop table should remove corresponding entries in dropped_columns table (CASSANDRA-13730) + * Log warn message until legacy auth tables have been migrated (CASSANDRA-13371) + * Fix incorrect [2.1 <- 3.0] serialization of counter cells created in 2.0 (CASSANDRA-13691) + * Fix invalid writetime for null cells (CASSANDRA-13711) + * Fix ALTER TABLE statement to atomically propagate changes to the table and its MVs (CASSANDRA-12952) + * Fixed ambiguous output of nodetool tablestats command (CASSANDRA-13722) + * JMXEnabledThreadPoolExecutor with corePoolSize equal to maxPoolSize (Backport CASSANDRA-13329) + * Fix Digest mismatch Exception if hints file has UnknownColumnFamily (CASSANDRA-13696) + * Purge tombstones created by expired cells (CASSANDRA-13643) + * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482) + * Set test.runners based on cores and memory size (CASSANDRA-13078) + * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) + * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) + * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) + * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568) + * sstabledump reports incorrect usage for argument order (CASSANDRA-13532) +Merged from 2.2: + * Uncaught exceptions in Netty pipeline (CASSANDRA-13649) - * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) + * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) * Fix toJSONString for the UDT, tuple and collection types (CASSANDRA-13592) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc32ed80/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc32ed80/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/Server.java index f35d507,c91d37d..7df194d --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@@ -327,10 -304,15 +328,18 @@@ public class Server implements Cassandr pipeline.addLast("messageDecoder", messageDecoder); pipeline.addLast("messageEncoder", messageEncoder); + // The exceptionHandler will take care of handling exceptionCaught(...) events while still running + // on the same EventLoop as all previous added handlers in the pipeline. This is important as the used + // eventExecutorGroup may not enforce strict ordering for channel events. + // As the exceptionHandler runs in the EventLoop as the previous handlers we are sure all exceptions are + // correctly handled before the handler itself is removed. + // See https://issues.apache.org/jira/browse/CASSANDRA-13649 + pipeline.addLast("exceptionHandler", exceptionHandler); + - pipeline.addLast(server.eventExecutorGroup, "executor", dispatcher); + if (server.eventExecutorGroup != null) + pipeline.addLast(server.eventExecutorGroup, "executor", dispatcher); + else + pipeline.addLast("executor", dispatcher); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
