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/3d211e9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d211e9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d211e9f Branch: refs/heads/trunk Commit: 3d211e9fbf1c4c61fffe7f589d64dd5ca7074c48 Parents: c59897b 593bbf5 Author: Stefania Alborghetti <[email protected]> Authored: Fri Jun 10 15:54:22 2016 -0500 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Jun 10 15:56:15 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ pylib/cqlshlib/copyutil.py | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d211e9f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index fd2fe79,d639d43..47aef7e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,28 @@@ -2.2.7 +3.0.8 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) +Merged from 2.2: * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984) ++Merged from 2.1: ++ * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections (CASSANDRA-11749) ++ + +3.0.7 + * Fix legacy serialization of Thrift-generated non-compound range tombstones + when communicating with 2.x nodes (CASSANDRA-11930) + * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849) + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912) + * Fix sstables not being protected from removal during index build (CASSANDRA-11905) + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032) + * Remove unneeded code to repair index summaries that have + been improperly down-sampled (CASSANDRA-11127) + * Avoid WriteTimeoutExceptions during commit log replay due to materialized + view lock contention (CASSANDRA-11891) + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530) + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705) + * Allow compaction strategies to disable early open (CASSANDRA-11754) + * Refactor Materialized View code (CASSANDRA-11475) + * Update Java Driver (CASSANDRA-11615) +Merged from 2.2: * Persist local metadata earlier in startup sequence (CASSANDRA-11742) * Run CommitLog tests with different compression settings (CASSANDRA-9039) * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d211e9f/pylib/cqlshlib/copyutil.py ---------------------------------------------------------------------- diff --cc pylib/cqlshlib/copyutil.py index d3ae1eb,a1adbaa..700b062 --- a/pylib/cqlshlib/copyutil.py +++ b/pylib/cqlshlib/copyutil.py @@@ -1222,8 -1223,16 +1229,17 @@@ class FeedingProcess(mp.Process) self.send_meter = RateMeter(log_fcn=None, update_interval=1) self.ingest_rate = options.copy['ingestrate'] self.num_worker_processes = options.copy['numprocesses'] + self.max_pending_chunks = options.copy['maxpendingchunks'] self.chunk_id = 0 + self.parent_cluster = parent_cluster + + def on_fork(self): + """ + Release any parent connections after forking, see CASSANDRA-11749 for details. + """ + if self.parent_cluster: + printdebugmsg("Closing parent cluster sockets") + self.parent_cluster.shutdown() def run(self): pr = profile_on() if PROFILE_ON else None
