You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2020/03/18 18:38:52 UTC
[kafka] branch 2.5 updated: HOTFIX: do not rely on file modified
time in StateDirectoryTest
This is an automated email from the ASF dual-hosted git repository.
guozhang pushed a commit to branch 2.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/2.5 by this push:
new 45e0d07 HOTFIX: do not rely on file modified time in StateDirectoryTest
45e0d07 is described below
commit 45e0d07c8afa7d02798c8518e2d260102f792fa4
Author: Guozhang Wang <wa...@gmail.com>
AuthorDate: Wed Mar 18 11:38:19 2020 -0700
HOTFIX: do not rely on file modified time in StateDirectoryTest
---
.../streams/processor/internals/StateDirectoryTest.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java
index 34a4076..7eeedd0 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/StateDirectoryTest.java
@@ -42,6 +42,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import static org.apache.kafka.common.utils.Utils.mkSet;
+import static org.apache.kafka.streams.processor.internals.StateDirectory.LOCK_FILE_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -108,7 +109,7 @@ public class StateDirectoryTest {
try (
final FileChannel channel = FileChannel.open(
- new File(taskDirectory, StateDirectory.LOCK_FILE_NAME).toPath(),
+ new File(taskDirectory, LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE, StandardOpenOption.WRITE)
) {
channel.tryLock();
@@ -164,10 +165,10 @@ public class StateDirectoryTest {
try (
final FileChannel channel1 = FileChannel.open(
- new File(task1Dir, StateDirectory.LOCK_FILE_NAME).toPath(),
+ new File(task1Dir, LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE);
- final FileChannel channel2 = FileChannel.open(new File(task2Dir, StateDirectory.LOCK_FILE_NAME).toPath(),
+ final FileChannel channel2 = FileChannel.open(new File(task2Dir, LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE)
) {
@@ -195,7 +196,7 @@ public class StateDirectoryTest {
try (
final FileChannel channel = FileChannel.open(
- new File(taskDirectory, StateDirectory.LOCK_FILE_NAME).toPath(),
+ new File(taskDirectory, LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE)
) {
@@ -270,7 +271,7 @@ public class StateDirectoryTest {
}
@Test
- public void shouldOnlyListNonEmptyTaskDirectories() {
+ public void shouldOnlyListNonEmptyTaskDirectories() throws IOException {
TestUtils.tempDirectory(stateDir.toPath(), "foo");
final File taskDir1 = directory.directoryForTask(new TaskId(0, 0));
final File taskDir2 = directory.directoryForTask(new TaskId(0, 1));
@@ -283,7 +284,7 @@ public class StateDirectoryTest {
assertEquals(mkSet(taskDir1), Arrays.stream(
directory.listNonEmptyTaskDirectories()).collect(Collectors.toSet()));
- directory.cleanRemovedTasks(0L);
+ Utils.delete(taskDir1, Collections.singletonList(new File(taskDir1, LOCK_FILE_NAME)));
assertEquals(mkSet(taskDir1, taskDir2), Arrays.stream(
directory.listAllTaskDirectories()).collect(Collectors.toSet()));
@@ -315,7 +316,7 @@ public class StateDirectoryTest {
try (
final FileChannel channel = FileChannel.open(
- new File(directory.globalStateDir(), StateDirectory.LOCK_FILE_NAME).toPath(),
+ new File(directory.globalStateDir(), LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE)
) {
@@ -335,7 +336,7 @@ public class StateDirectoryTest {
try (
final FileChannel channel = FileChannel.open(
- new File(directory.globalStateDir(), StateDirectory.LOCK_FILE_NAME).toPath(),
+ new File(directory.globalStateDir(), LOCK_FILE_NAME).toPath(),
StandardOpenOption.CREATE,
StandardOpenOption.WRITE)
) {