From 003a2e7e158a734e15cd8cfe9f3b1bc83a528cfd Mon Sep 17 00:00:00 2001 From: Alan Wang Date: Thu, 16 Jul 2026 14:50:07 -0700 Subject: [PATCH] Fixed failing test --- .../distributed/test/tracking/TrackedImportFailureTest.java | 4 +++- .../distributed/test/tracking/TrackedTransferTestBase.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedImportFailureTest.java b/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedImportFailureTest.java index 9d6d0a8f72..c669a18ea1 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedImportFailureTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedImportFailureTest.java @@ -332,7 +332,9 @@ public class TrackedImportFailureTest extends TrackedTransferTestBase // Await cleanup of failed stream Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS); - assertPendingDirs(cluster, (File pendingUuidDir) -> { + // We exclude the missed instance because the SSTables streamed to the pending directory + // are not linked to LocalTransfers and hence cleanup does not know which SSTables to cleanup + assertPendingDirs(cluster.stream().filter(instance -> instance != missed).collect(Collectors.toList()), (File pendingUuidDir) -> { Assertions.assertThat(pendingUuidDir.listUnchecked(File::isFile)).isEmpty(); }); diff --git a/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedTransferTestBase.java b/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedTransferTestBase.java index c292b8ed79..6112c0631f 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedTransferTestBase.java +++ b/test/distributed/org/apache/cassandra/distributed/test/tracking/TrackedTransferTestBase.java @@ -196,12 +196,12 @@ public abstract class TrackedTransferTestBase extends TestBaseImpl assertPendingDirs(validate, KEYSPACE, forPendingUuidDir); } - protected static void assertPendingDirs(Iterable validate, String keysapce, IIsolatedExecutor.SerializableConsumer forPendingUuidDir) + protected static void assertPendingDirs(Iterable validate, String keyspace, IIsolatedExecutor.SerializableConsumer forPendingUuidDir) { for (IInvokableInstance instance : validate) { instance.runOnInstance(() -> { - Set allPendingDirs = ColumnFamilyStore.getIfExists(keysapce, TABLE).getDirectories().getPendingLocations(); + Set allPendingDirs = ColumnFamilyStore.getIfExists(keyspace, TABLE).getDirectories().getPendingLocations(); for (File pendingDir : allPendingDirs) { File[] pendingUuidDirs = pendingDir.listUnchecked(File::isDirectory);