Skip to content

Fix flaky FileIOTest.testMatchWatchForNewFiles test under CI filesystems #38047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bvolpato wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix flaky FileIOTest.testMatchWatchForNewFiles test under CI filesystems #38047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ade6a7
Fix flaky FileIOTest.testMatchWatchForNewFiles test under CI filesystems
bvolpato Apr 2, 2026
2d8a2bb
Stabilize FileIOTest updated-file timestamp assertions
bvolpato May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/io/FileIOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,10 @@ public void testMatchAllDisallowEmptyNonWildcard() throws IOException {
/** DoFn that copy test files from source to watch path. */
private static class CopyFilesFn
extends DoFn<KV<String, MatchResult.Metadata>, MatchResult.Metadata> {
public CopyFilesFn(Path sourcePath, Path watchPath) {
public CopyFilesFn(Path sourcePath, Path watchPath, long baseTimestampMillis) {
this.sourcePathStr = sourcePath.toString();
this.watchPathStr = watchPath.toString();
this.baseTimestampMillis = baseTimestampMillis;
}

@StateId("count")
Expand All @@ -249,16 +250,24 @@ public void processElement(ProcessContext context, @StateId("count") ValueState<
context.output(Objects.requireNonNull(context.element()).getValue());

CopyOption[] cpOptions = {StandardCopyOption.COPY_ATTRIBUTES};
CopyOption[] updOptions = {StandardCopyOption.REPLACE_EXISTING};
CopyOption[] updOptions = {
StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES
};
final Path sourcePath = Paths.get(sourcePathStr);
final Path watchPath = Paths.get(watchPathStr);

if (0 == current) {
Thread.sleep(100);
// Ensure overwrite updates get a distinct mtime even when COPY_ATTRIBUTES is enabled.
Files.setLastModifiedTime(
sourcePath.resolve("first"), FileTime.fromMillis(baseTimestampMillis + 2000));
Files.copy(sourcePath.resolve("first"), watchPath.resolve("first"), updOptions);
Files.copy(sourcePath.resolve("second"), watchPath.resolve("second"), cpOptions);
} else if (1 == current) {
Thread.sleep(100);
FileTime updateTime = FileTime.fromMillis(baseTimestampMillis + 4000);
Files.setLastModifiedTime(sourcePath.resolve("first"), updateTime);
Files.setLastModifiedTime(sourcePath.resolve("second"), updateTime);
Files.copy(sourcePath.resolve("first"), watchPath.resolve("first"), updOptions);
Files.copy(sourcePath.resolve("second"), watchPath.resolve("second"), updOptions);
Files.copy(sourcePath.resolve("third"), watchPath.resolve("third"), cpOptions);
Expand All @@ -269,6 +278,7 @@ public void processElement(ProcessContext context, @StateId("count") ValueState<
// Member variables need to be serializable.
private final String sourcePathStr;
private final String watchPathStr;
private final long baseTimestampMillis;
}

@Test
Expand All @@ -280,6 +290,12 @@ public void testMatchWatchForNewFiles() throws IOException, InterruptedException
Files.write(sourcePath.resolve("first"), new byte[42]);
Files.write(sourcePath.resolve("second"), new byte[37]);
Files.write(sourcePath.resolve("third"), new byte[99]);
// Keep controlled mtimes in the past so updates are distinct without future timestamps.
long baseTimestampMillis = System.currentTimeMillis() - Duration.standardMinutes(1).getMillis();
FileTime baseTimestamp = FileTime.fromMillis(baseTimestampMillis);
Files.setLastModifiedTime(sourcePath.resolve("first"), baseTimestamp);
Files.setLastModifiedTime(sourcePath.resolve("second"), baseTimestamp);
Files.setLastModifiedTime(sourcePath.resolve("third"), baseTimestamp);

// Create a "watch" directory that the pipeline will copy files into.
final Path watchPath = tmpFolder.getRoot().toPath().resolve("watch");
Expand Down Expand Up @@ -334,7 +350,7 @@ public void testMatchWatchForNewFiles() throws IOException, InterruptedException
TypeDescriptors.strings(),
TypeDescriptor.of(MatchResult.Metadata.class)))
.via((metadata) -> KV.of("dumb key", metadata)))
.apply(ParDo.of(new CopyFilesFn(sourcePath, watchPath)));
.apply(ParDo.of(new CopyFilesFn(sourcePath, watchPath, baseTimestampMillis)));

assertEquals(PCollection.IsBounded.UNBOUNDED, matchMetadata.isBounded());
assertEquals(PCollection.IsBounded.UNBOUNDED, matchAllMetadata.isBounded());
Expand Down
Loading