[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af9b9cd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af9b9cd5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af9b9cd5 Branch: refs/heads/trunk Commit: af9b9cd5ae248746475ada5434d08370148bbce0 Parents: 4111e4f bd4cab2 Author: Josh McKenzie Authored: Fri Apr 1 11:51:13 2016 -0400 Committer: Josh McKenzie Committed: Fri Apr 1 11:52:45 2016 -0400 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 134 ++-- .../org/apache/cassandra/db/Directories.java| 16 +- src/java/org/apache/cassandra/db/Memtable.java | 29 +++- .../db/commitlog/CommitLogSegmentManager.java | 4 +- .../cassandra/io/util/DiskAwareRunnable.java| 54 --- .../apache/cassandra/cql3/OutOfSpaceTest.java | 157 +++ 7 files changed, 276 insertions(+), 119 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af9b9cd5/CHANGES.txt -- diff --cc CHANGES.txt index b542a67,b9376bc..73d9ab5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -109,9 -75,9 +109,10 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: + * Fix out-of-space error treatment in memtable flushing (CASSANDRA-11448). * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) http://git-wip-us.apache.org/repos/asf/cassandra/blob/af9b9cd5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index f193c4d,aa12b80..6e01b34 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -910,6 -893,7 +910,7 @@@ public class ColumnFamilyStore implemen final OpOrder.Barrier writeBarrier; final CountDownLatch latch = new CountDownLatch(1); final ReplayPosition lastReplayPosition; -volatile FSWriteError flushFailure = null; ++volatile Throwable flushFailure = null; private PostFlush(boolean flushSecondaryIndexes, OpOrder.Barrier writeBarrier, ReplayPosition lastReplayPosition) { @@@ -951,6 -936,9 +953,9 @@@ } metric.pendingFlushes.dec(); + + if (flushFailure != null) -throw flushFailure; ++throw Throwables.propagate(flushFailure); } } @@@ -1050,81 -1038,26 +1055,106 @@@ metric.memtableSwitchCount.inc(); - for (Memtable memtable : memtables) + try { - List> futures = new ArrayList<>(); - long totalBytesOnDisk = 0; - long maxBytesOnDisk = 0; - long minBytesOnDisk = Long.MAX_VALUE; - List sstables = new ArrayList<>(); - try (LifecycleTransaction txn = LifecycleTransaction.offline(OperationType.FLUSH)) + for (Memtable memtable : memtables) + { -// flush the memtable - MoreExecutors.sameThreadExecutor().execute(memtable.flushRunnable()); -reclaim(memtable); ++flushMemtable(memtable); + } + } -catch (FSWriteError e) ++catch (Throwable t) + { -JVMStabilityInspector.inspectThrowable(e); -// If we weren't killed, try to continue work but do not allow CommitLog to be discarded. -postFlush.flushFailure = e; ++JVMStabilityInspector.inspectThrowable(t); ++postFlush.flushFailure = t; + } - + // signal the post-flush we've done our work + postFlush.latch.countDown(); + } + ++public void flushMemtable(Memtable memtable) ++{ ++List> futures = new ArrayList<>(); ++long totalBytesOnDisk = 0; ++long maxBytesOnDisk = 0; ++long minBytesOnDisk = Long.MAX_VALUE; ++List sstables = new ArrayList<>(); ++try (Life
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fbdce81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fbdce81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fbdce81 Branch: refs/heads/trunk Commit: 7fbdce812d268fb8681e8b553cf521f9e47a3531 Parents: 9b1968f 202786e Author: Yuki Morishita Authored: Wed Mar 30 16:51:51 2016 -0500 Committer: Yuki Morishita Committed: Wed Mar 30 16:51:51 2016 -0500 -- --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bed6aae0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bed6aae0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bed6aae0 Branch: refs/heads/trunk Commit: bed6aae00e271846184d9ba7317d4e038701ca86 Parents: daf7606 c9e81ea Author: Aleksey Yeschenko Authored: Tue Mar 29 17:57:35 2016 +0100 Committer: Aleksey Yeschenko Committed: Tue Mar 29 17:57:35 2016 +0100 -- --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a250854 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a250854 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a250854 Branch: refs/heads/trunk Commit: 0a2508544069f035dc43a81b8700c0b7bf2d28e3 Parents: c7ef7c9 0c91977 Author: Marcus Eriksson Authored: Tue Mar 29 11:05:46 2016 +0200 Committer: Marcus Eriksson Committed: Tue Mar 29 11:05:46 2016 +0200 -- CHANGES.txt | 2 + .../apache/cassandra/db/ColumnFamilyStore.java | 20 - .../db/compaction/CompactionManager.java| 44 +--- .../cassandra/service/StorageService.java | 30 ++--- .../cassandra/service/StorageServiceMBean.java | 8 .../org/apache/cassandra/tools/NodeProbe.java | 38 ++--- .../cassandra/tools/nodetool/Cleanup.java | 9 +++- .../tools/nodetool/RelocateSSTables.java| 8 +++- .../apache/cassandra/tools/nodetool/Scrub.java | 13 -- .../tools/nodetool/UpgradeSSTable.java | 10 - .../org/apache/cassandra/db/CleanupTest.java| 6 +-- .../unit/org/apache/cassandra/db/ScrubTest.java | 16 +++ 12 files changed, 141 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a250854/CHANGES.txt -- diff --cc CHANGES.txt index 2907df9,fdc873e..3e69959 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -25,43 -23,14 +25,45 @@@ Merged from 2.2 * Only log yaml config once, at startup (CASSANDRA-11217) * Reference leak with parallel repairs on the same table (CASSANDRA-11215) Merged from 2.1: + * Add a -j parameter to scrub/cleanup/upgradesstables to state how +many threads to use (CASSANDRA-11179) - * Backport CASSANDRA-10679 (CASSANDRA-9598) - * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) -3.0.4 - * Preserve order for preferred SSL cipher suites (CASSANDRA-11164) + +3.4 + * (cqlsh) add cqlshrc option to always connect using ssl (CASSANDRA-10458) + * Cleanup a few resource warnings (CASSANDRA-11085) + * Allow custom tracing implementations (CASSANDRA-10392) + * Extract LoaderOptions to be able to be used from outside (CASSANDRA-10637) + * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205) + * fix TrackerTest to handle new notifications (CASSANDRA-11178) + * add SASI validation for partitioner and complex columns (CASSANDRA-11169) + * Add caching of encrypted credentials in PasswordAuthenticator (CASSANDRA-7715) + * fix SASI memtable switching on flush (CASSANDRA-11159) + * Remove duplicate offline compaction tracking (CASSANDRA-11148) + * fix EQ semantics of analyzed SASI indexes (CASSANDRA-11130) + * Support long name output for nodetool commands (CASSANDRA-7950) + * Encrypted hints (CASSANDRA-11040) + * SASI index options validation (CASSANDRA-11136) + * Optimize disk seek using min/max column name meta data when the LIMIT clause is used + (CASSANDRA-8180) + * Add LIKE support to CQL3 (CASSANDRA-11067) + * Generic Java UDF types (CASSANDRA-10819) + * cqlsh: Include sub-second precision in timestamps by default (CASSANDRA-10428) + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) +Merged from 3.0: * MV should only query complex columns included in the view (CASSANDRA-11069) * Failed aggregate creation breaks server permanently (CASSANDRA-11064) * Add sstabledump tool (CASSANDRA-7464) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a250854/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index fbfb7ee,a1db5b5..f193c4d --- a/src/java/org/apache/cassandra/db/
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7ef7c91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7ef7c91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7ef7c91 Branch: refs/heads/trunk Commit: c7ef7c91c24036e2fdfbc94b5681844c37be1e33 Parents: acc2f89 3efc609 Author: Josh McKenzie Authored: Mon Mar 28 13:55:54 2016 -0400 Committer: Josh McKenzie Committed: Mon Mar 28 13:55:54 2016 -0400 -- pylib/cqlshlib/copyutil.py | 98 + 1 file changed, 69 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7ef7c91/pylib/cqlshlib/copyutil.py --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76241eb0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76241eb0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76241eb0 Branch: refs/heads/trunk Commit: 76241eb02158824a979fc2ee6846d6a3f8d499f2 Parents: 1ee5502 5e722ee Author: Yuki Morishita Authored: Tue Mar 22 16:10:08 2016 -0500 Committer: Yuki Morishita Committed: Tue Mar 22 16:10:08 2016 -0500 -- --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d526ad79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d526ad79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d526ad79 Branch: refs/heads/trunk Commit: d526ad79d7971a5d9ad730c232e56343e2b3b377 Parents: 807597f 8d101fd Author: Sylvain Lebresne Authored: Thu Mar 17 10:21:58 2016 +0100 Committer: Sylvain Lebresne Committed: Thu Mar 17 10:21:58 2016 +0100 -- doc/cql3/CQL.textile | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d526ad79/doc/cql3/CQL.textile --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc6b2b3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc6b2b3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc6b2b3d Branch: refs/heads/trunk Commit: fc6b2b3d4bc18406e9d93bd0bf0a0f4080cf93f2 Parents: caad327 dcc57d0 Author: Marcus Eriksson Authored: Wed Mar 16 10:49:20 2016 +0100 Committer: Marcus Eriksson Committed: Wed Mar 16 10:49:20 2016 +0100 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/SinglePartitionReadCommand.java | 5 - 2 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc6b2b3d/CHANGES.txt -- diff --cc CHANGES.txt index a71d4c6,87691f9..7acb24d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -91,9 -58,9 +91,10 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: + * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc6b2b3d/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10d61d46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10d61d46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10d61d46 Branch: refs/heads/trunk Commit: 10d61d46d36484ae0ae77108531528be5ba27619 Parents: f27ab29 c9d2b7a Author: Yuki Morishita Authored: Thu Mar 10 13:03:15 2016 -0600 Committer: Yuki Morishita Committed: Thu Mar 10 13:03:15 2016 -0600 -- CHANGES.txt | 1 + conf/cassandra.yaml | 7 +++ .../net/IncomingStreamingConnection.java| 5 + .../cassandra/streaming/ConnectionHandler.java | 21 +--- .../cassandra/streaming/StreamSession.java | 2 ++ 5 files changed, 25 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10d61d46/CHANGES.txt -- diff --cc CHANGES.txt index 68f5714,4c00994..292ebb5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -88,9 -56,9 +88,10 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: + * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) http://git-wip-us.apache.org/repos/asf/cassandra/blob/10d61d46/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10d61d46/src/java/org/apache/cassandra/streaming/StreamSession.java --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d1b1b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d1b1b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d1b1b0 Branch: refs/heads/trunk Commit: 17d1b1b0438c07778b34f6100c9c1fec1b4b210a Parents: 719f584 c2b47ba Author: Sylvain Lebresne Authored: Tue Mar 8 17:22:14 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Mar 8 17:22:14 2016 +0100 -- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 2 files changed, 7 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/CHANGES.txt -- diff --cc CHANGES.txt index c88ae54,384e7ea..72ce859 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -84,9 -52,11 +84,12 @@@ Merged from 2.2 * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397) * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124) Merged from 2.1: + * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) + * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) + * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176) * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371) * Only notify if repair status changed (CASSANDRA-11172) * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/719f584e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/719f584e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/719f584e Branch: refs/heads/trunk Commit: 719f584eab974bd66d8a64e5a938a7b5e441669a Parents: 6329d54 504760c Author: Sylvain Lebresne Authored: Tue Mar 8 10:42:01 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Mar 8 10:42:01 2016 +0100 -- src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 1 file changed, 4 insertions(+) --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eef2b189 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eef2b189 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eef2b189 Branch: refs/heads/cassandra-3.5 Commit: eef2b189c0c17213508276237c226bfcd273b0ca Parents: ad8673c 34b07a7 Author: Yuki Morishita Authored: Mon Mar 7 12:47:14 2016 -0600 Committer: Yuki Morishita Committed: Mon Mar 7 12:47:14 2016 -0600 -- --