This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new b72db2b2c78 MINOR: Delete temporary directories after using them in
RaftManagerTest Updated (#20550)
b72db2b2c78 is described below
commit b72db2b2c7885937878139bcf7ccb06a1268effd
Author: Ryan Dielhenn <[email protected]>
AuthorDate: Thu Sep 18 19:22:05 2025 -0700
MINOR: Delete temporary directories after using them in RaftManagerTest
Updated (#20550)
Follow-up to [#11193](https://github.com/apache/kafka/pull/11193). This
change adds cleanup of the temporary log and metadata directories
created by RaftManagerTest so they are removed after each test run.
Without this cleanup, the directories remain until the entire test suite
completes, leaving extra files in the system temporary directory.
Testing:
- Ran `./gradlew core:test --tests kafka.raft.RaftManagerTest` and
confirmed all tests pass.
Reviewers: TengYao Chi <[email protected]>, Chia-Ping Tsai
<[email protected]>
---
.../scala/unit/kafka/raft/RaftManagerTest.scala | 83 +++++++++++++---------
1 file changed, 49 insertions(+), 34 deletions(-)
diff --git a/core/src/test/scala/unit/kafka/raft/RaftManagerTest.scala
b/core/src/test/scala/unit/kafka/raft/RaftManagerTest.scala
index 38187b11eb8..117c2b63978 100644
--- a/core/src/test/scala/unit/kafka/raft/RaftManagerTest.scala
+++ b/core/src/test/scala/unit/kafka/raft/RaftManagerTest.scala
@@ -30,6 +30,7 @@ import org.apache.kafka.common.Uuid
import org.apache.kafka.common.metrics.Metrics
import org.apache.kafka.common.network.ListenerName
import org.apache.kafka.common.utils.Time
+import org.apache.kafka.common.utils.Utils
import org.apache.kafka.network.SocketServerConfigs
import org.apache.kafka.raft.{Endpoints, MetadataLogConfig, QuorumConfig}
import org.apache.kafka.server.ProcessRole
@@ -126,17 +127,21 @@ class RaftManagerTest {
val logDir = TestUtils.tempDir()
val nodeId = 1
- val raftManager = createRaftManager(
- new TopicPartition("__raft_id_test", 0),
- createConfig(
- processRolesSet,
- nodeId,
- Seq(logDir.toPath),
- None
+ try {
+ val raftManager = createRaftManager(
+ new TopicPartition("__raft_id_test", 0),
+ createConfig(
+ processRolesSet,
+ nodeId,
+ Seq(logDir.toPath),
+ None
+ )
)
- )
- assertEquals(nodeId, raftManager.client.nodeId.getAsInt)
- raftManager.shutdown()
+ assertEquals(nodeId, raftManager.client.nodeId.getAsInt)
+ raftManager.shutdown()
+ } finally {
+ Utils.delete(logDir)
+ }
}
@ParameterizedTest
@@ -155,22 +160,27 @@ class RaftManagerTest {
}
val nodeId = 1
- val raftManager = createRaftManager(
- new TopicPartition("__raft_id_test", 0),
- createConfig(
- Set(ProcessRole.ControllerRole),
- nodeId,
- logDir,
- metadataDir
+ try {
+ val raftManager = createRaftManager(
+ new TopicPartition("__raft_id_test", 0),
+ createConfig(
+ Set(ProcessRole.ControllerRole),
+ nodeId,
+ logDir,
+ metadataDir
+ )
)
- )
- val lockPath =
metadataDir.getOrElse(logDir.head).resolve(LogManager.LOCK_FILE_NAME)
- assertTrue(fileLocked(lockPath))
+ val lockPath =
metadataDir.getOrElse(logDir.head).resolve(LogManager.LOCK_FILE_NAME)
+ assertTrue(fileLocked(lockPath))
- raftManager.shutdown()
+ raftManager.shutdown()
- assertFalse(fileLocked(lockPath))
+ assertFalse(fileLocked(lockPath))
+ } finally {
+ logDir.foreach(p => Utils.delete(p.toFile))
+ metadataDir.foreach(p => Utils.delete(p.toFile))
+ }
}
@Test
@@ -179,22 +189,27 @@ class RaftManagerTest {
val metadataDir = Some(TestUtils.tempDir().toPath)
val nodeId = 1
- val raftManager = createRaftManager(
- new TopicPartition("__raft_id_test", 0),
- createConfig(
- Set(ProcessRole.BrokerRole),
- nodeId,
- logDir,
- metadataDir
+ try {
+ val raftManager = createRaftManager(
+ new TopicPartition("__raft_id_test", 0),
+ createConfig(
+ Set(ProcessRole.BrokerRole),
+ nodeId,
+ logDir,
+ metadataDir
+ )
)
- )
- val lockPath =
metadataDir.getOrElse(logDir.head).resolve(LogManager.LOCK_FILE_NAME)
- assertTrue(fileLocked(lockPath))
+ val lockPath =
metadataDir.getOrElse(logDir.head).resolve(LogManager.LOCK_FILE_NAME)
+ assertTrue(fileLocked(lockPath))
- raftManager.shutdown()
+ raftManager.shutdown()
- assertFalse(fileLocked(lockPath))
+ assertFalse(fileLocked(lockPath))
+ } finally {
+ logDir.foreach(p => Utils.delete(p.toFile))
+ metadataDir.foreach(p => Utils.delete(p.toFile))
+ }
}
def createMetadataLog(config: KafkaConfig): Unit = {
