This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cep-15-accord by this push:
new fd1d6a437b Fix flusher shutdown; ignore repair test
fd1d6a437b is described below
commit fd1d6a437b85e41f8e35f82c4da45a38671add96
Author: Alex Petrov <[email protected]>
AuthorDate: Wed Aug 28 17:18:36 2024 +0200
Fix flusher shutdown; ignore repair test
---
src/java/org/apache/cassandra/journal/Flusher.java | 2 +-
.../distributed/test/accord/AccordIncrementalRepairTest.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/java/org/apache/cassandra/journal/Flusher.java
b/src/java/org/apache/cassandra/journal/Flusher.java
index d95573d1ad..709c68615b 100644
--- a/src/java/org/apache/cassandra/journal/Flusher.java
+++ b/src/java/org/apache/cassandra/journal/Flusher.java
@@ -105,7 +105,7 @@ final class Flusher<K, V>
flushExecutor.awaitTermination(1, MINUTES);
if (fsyncExecutor != null)
{
- fsyncExecutor.shutdown();
+ fsyncExecutor.shutdownNow(); // `now` to interrupt potentially
parked runnable
fsyncExecutor.awaitTermination(1, MINUTES);
}
}
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java
index 452d9dc53a..f6193c74f8 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordIncrementalRepairTest.java
@@ -32,6 +32,7 @@ import com.google.common.collect.Iterables;
import org.junit.After;
import org.junit.Assert;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -248,6 +249,10 @@ public class AccordIncrementalRepairTest extends
AccordTestBase
return txnId;
}
+ // TODO (required): After conversation with Ariel: it's a known issue that
I am not sure we need to fix now.
+ // The problem is that we don't flush after Accord repair, but before
data repair when running incremental
+ // repair so it doesn't see the repaired sstables it is checking for.
+ @Ignore
@Test
public void txnRepairTest() throws Throwable
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
