From a725d2c4c8ca6d0e914d3dce3ea90ae495fca2c8 Mon Sep 17 00:00:00 2001 From: Bereng Date: Tue, 15 Feb 2022 12:20:16 +0100 Subject: [PATCH] Failing test: UNIT org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1 patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-17283 --- .../cassandra/tools/BulkLoaderTest.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java index f2b18ca411..1ab5ca4d6e 100644 --- a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java +++ b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java @@ -36,7 +36,9 @@ public class BulkLoaderTest extends OfflineToolUtils assertEquals(1, tool.getExitCode()); assertThat(tool.getCleanedStderr(), CoreMatchers.containsString("Missing sstable directory argument")); - assertNoUnexpectedThreadsStarted(new String[] { "ObjectCleanerThread" }); + assertNoUnexpectedThreadsStarted(new String[] { "ObjectCleanerThread", + "Shutdown-checker", + "cluster[0-9]-connection-reaper-[0-9]" }); assertSchemaNotLoaded(); assertCLSMNotLoaded(); assertSystemKSNotLoaded(); @@ -58,7 +60,11 @@ public class BulkLoaderTest extends OfflineToolUtils if (!(tool.getException().getCause().getCause() instanceof NoHostAvailableException)) throw tool.getException(); - assertNoUnexpectedThreadsStarted(new String[]{ "ObjectCleanerThread", "globalEventExecutor-[1-9]-[1-9]", "globalEventExecutor-[1-9]-[1-9]" }); + assertNoUnexpectedThreadsStarted(new String[] { "ObjectCleanerThread", + "globalEventExecutor-[1-9]-[1-9]", + "globalEventExecutor-[1-9]-[1-9]", + "Shutdown-checker", + "cluster[0-9]-connection-reaper-[0-9]" }); assertSchemaNotLoaded(); assertCLSMNotLoaded(); assertSystemKSNotLoaded(); @@ -82,7 +88,11 @@ public class BulkLoaderTest extends OfflineToolUtils if (!(tool.getException().getCause().getCause() instanceof NoHostAvailableException)) throw tool.getException(); - assertNoUnexpectedThreadsStarted(new String[]{ "ObjectCleanerThread", "globalEventExecutor-[1-9]-[1-9]", "globalEventExecutor-[1-9]-[1-9]" }); + assertNoUnexpectedThreadsStarted(new String[] { "ObjectCleanerThread", + "globalEventExecutor-[1-9]-[1-9]", + "globalEventExecutor-[1-9]-[1-9]", + "Shutdown-checker", + "cluster[0-9]-connection-reaper-[0-9]" }); assertSchemaNotLoaded(); assertCLSMNotLoaded(); assertSystemKSNotLoaded(); @@ -106,7 +116,11 @@ public class BulkLoaderTest extends OfflineToolUtils if (!(tool.getException().getCause().getCause() instanceof NoHostAvailableException)) throw tool.getException(); - assertNoUnexpectedThreadsStarted(new String[]{ "ObjectCleanerThread", "globalEventExecutor-[1-9]-[1-9]", "globalEventExecutor-[1-9]-[1-9]" }); + assertNoUnexpectedThreadsStarted(new String[] { "ObjectCleanerThread", + "globalEventExecutor-[1-9]-[1-9]", + "globalEventExecutor-[1-9]-[1-9]", + "Shutdown-checker", + "cluster[0-9]-connection-reaper-[0-9]" }); assertSchemaNotLoaded(); assertCLSMNotLoaded(); assertSystemKSNotLoaded();