This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 57a7b8a70ddcc4e5a690e22f67166a63afb74b3a
Merge: 0aad2e9 78f5057
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Thu Jan 6 14:31:54 2022 -0700
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 1 +
.../db/compaction/CompactionExecutorTest.java | 32 +++++++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --cc CHANGES.txt
index 0fd51ec,3e5dc2b..c84e643
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -45,24 -27,19 +45,25 @@@ Merged from 3.0
* Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085)
* Avoid removing batch when it's not created during view replication
(CASSANDRA-16175)
* Make the addition of regular column to COMPACT tables throw an
InvalidRequestException (CASSANDRA-14564)
- * Fix materialized view schema backup as table (CASSANDRA-12734)
- * Avoid signaling DigestResolver until the minimum number of responses are
guaranteed to be visible (CASSANDRA-16883)
- * Fix secondary indexes on primary key columns skipping some writes
(CASSANDRA-16868)
- * Fix incorrect error message in LegacyLayout (CASSANDRA-15136)
- * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
- * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID()
(CASSANDRA-16578)
- * Remove mutation data from error log message (CASSANDRA-16817)
+ * Race in CompactionExecutorTest (CASSANDRA-17239)
-Merged from 2.2:
- * Add python2 location to RPMs (CASSANDRA-16822)
-
-3.11.11
+4.0.1
+ * Tolerate missing DNS entry when completing a host replacement
(CASSANDRA-16873)
+ * Harden PrunableArrayQueue against Pruner implementations that might throw
exceptions (CASSANDRA-16866)
+ * Move RepairedDataInfo to the execution controller rather than the
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
+ * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
+ * Remove assumption that all urgent messages are small (CASSANDRA-16877)
+ * ArrayClustering.unsharedHeapSize does not include the data so undercounts
the heap size (CASSANDRA-16845)
+ * Improve help, doc and error messages about sstabledump -k and -x arguments
(CASSANDRA-16818)
+ * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
+ * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
+ * Improve DiagnosticEventService.publish(event) logging message of events
(CASSANDRA-16749)
+ * Cleanup dependency scopes (CASSANDRA-16704)
+ * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues()
thread-safe (CASSANDRA-16707)
+Merged from 3.11:
+ * Validate SASI tokenizer options before adding index to schema
(CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row,
which really means partition (CASSANDRA-16835)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer
(CASSANDRA-16072)
* Make cqlsh use the same set of reserved keywords than the server uses
(CASSANDRA-15663)
* Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
* Enable tombstone compactions when unchecked_tombstone_compaction is set in
TWCS (CASSANDRA-14496)
diff --cc
test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
index ab3d9e5,918d58c..cca2997
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
@@@ -63,9 -69,14 +70,14 @@@ public class CompactionExecutorTes
public void destroy() throws Exception
{
executor.shutdown();
- executor.awaitTermination(1, TimeUnit.MINUTES);
+ Assert.assertTrue(executor.awaitTermination(1, TimeUnit.MINUTES));
}
+ void awaitExecution() throws Exception
+ {
+ assert afterExecuteCompleted.await(10, TimeUnit.SECONDS) :
"afterExecute failed to complete";
+ }
+
@Test
public void testFailedRunnable() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
