Skip to content

actiondfs: preserve directory iteration while deleting staged entries #39

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
zbarsky-openai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

actiondfs: preserve directory iteration while deleting staged entries #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions kernel/actiondfs/actiondfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,6 +3115,10 @@ static int actiondfs_open_stage_file(struct inode *inode,
if ((dir_file->stage_file || dir_file->stage_eof) &&
dir_file->stage_generation == generation)
return 0;
if (dir_file->stage_file && !dir_file->stage_eof) {
dir_file->stage_generation = generation;
return 0;
}
if (dir_file->stage_file || dir_file->stage_eof)
actiondfs_reset_stage_file(dir_file);
dir_file->stage_generation = generation;
Expand Down
28 changes: 28 additions & 0 deletions tools/e2e_action_tool.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,34 @@ fn exerciseDirectoryIteration(io: std.Io, dir: std.Io.Dir) !void {
try dir.deleteFile(io, name);
}

try dir.createDirPath(io, "delete-during-iteration");
{
var deleting_dir = try dir.openDir(io, "delete-during-iteration", .{ .iterate = true });
defer deleting_dir.close(io);
const deletion_count = 1536;
for (0..deletion_count) |index| {
var name_buffer: [96]u8 = undefined;
const name = try std.fmt.bufPrint(
&name_buffer,
"delete-{d:0>4}-long-directory-entry-for-multiple-getdents-buffers.txt",
.{index},
);
try writeDefaultFile(io, deleting_dir, name, "");
}

var deleting = deleting_dir.iterate();
var deleted: usize = 0;
while (try deleting.next(io)) |entry| {
try deleting_dir.deleteFile(io, entry.name);
deleted += 1;
}
try requireFilesystem(
deleted == deletion_count,
"directory iteration skipped staged entries while deleting them",
);
}
try dir.deleteDir(io, "delete-during-iteration");

try writeDefaultFile(io, dir, "created-after-rewind.txt", "created after the initial directory listing\n");
try expectDirectoryEntry(io, dir, "created-after-rewind.txt", .file, true);

Expand Down