From 671e7f4c9d82b053fba475aaeaa16a94dc3adad2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 14 May 2021 07:27:57 +0000 Subject: dir_idle: detect files which are gone lei now makes use of this to clean up after unlinked sockets with less delay. This will also be used to maintain mail_sync.sqlite3. --- t/dir_idle.t | 18 +++++++++++++++++- t/fake_inotify.t | 21 +++++++++++++++++---- 2 files changed, 34 insertions(+), 5 deletions(-) (limited to 't') diff --git a/t/dir_idle.t b/t/dir_idle.t index d62eb5a2..969c16e9 100644 --- a/t/dir_idle.t +++ b/t/dir_idle.t @@ -1,6 +1,22 @@ #!perl -w # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ -use Test::More; +use v5.10.1; use strict; use PublicInbox::TestCommon; +use PublicInbox::DS qw(now); +use File::Path qw(make_path); use_ok 'PublicInbox::DirIdle'; +my ($tmpdir, $for_destroy) = tmpdir(); +make_path("$tmpdir/a/b"); +my @x; +my $cb = sub { push @x, \@_ }; +my $di = PublicInbox::DirIdle->new(["$tmpdir/a"], $cb, 1); +PublicInbox::DS->SetLoopTimeout(1000); +my $end = 3 + now; +PublicInbox::DS->SetPostLoopCallback(sub { scalar(@x) == 0 && now < $end }); +tick(0.011); +rmdir("$tmpdir/a/b") or xbail "rmdir $!"; +PublicInbox::DS->EventLoop; +is(scalar(@x), 1, 'got an event') and + is($x[0]->[0]->fullname, "$tmpdir/a/b", 'got expected fullname'); +PublicInbox::DS->Reset; done_testing; diff --git a/t/fake_inotify.t b/t/fake_inotify.t index 5c925ae6..734ddbfb 100644 --- a/t/fake_inotify.t +++ b/t/fake_inotify.t @@ -5,12 +5,12 @@ # Ensure FakeInotify can pick up rename(2) and link(2) operations # used by Maildir writing tools use strict; -use Test::More; use PublicInbox::TestCommon; use_ok 'PublicInbox::FakeInotify'; my $MIN_FS_TICK = 0.011; # for low-res CONFIG_HZ=100 systems my ($tmpdir, $for_destroy) = tmpdir(); mkdir "$tmpdir/new" or BAIL_OUT "mkdir: $!"; +mkdir "$tmpdir/new/rmd" or BAIL_OUT "mkdir: $!"; open my $fh, '>', "$tmpdir/tst" or BAIL_OUT "open: $!"; close $fh or BAIL_OUT "close: $!"; @@ -18,12 +18,12 @@ my $fi = PublicInbox::FakeInotify->new; my $mask = PublicInbox::FakeInotify::MOVED_TO_OR_CREATE(); my $w = $fi->watch("$tmpdir/new", $mask); -select undef, undef, undef, $MIN_FS_TICK; +tick $MIN_FS_TICK; rename("$tmpdir/tst", "$tmpdir/new/tst") or BAIL_OUT "rename: $!"; my @events = map { $_->fullname } $fi->read; is_deeply(\@events, ["$tmpdir/new/tst"], 'rename(2) detected'); -select undef, undef, undef, $MIN_FS_TICK; +tick $MIN_FS_TICK; open $fh, '>', "$tmpdir/tst" or BAIL_OUT "open: $!"; close $fh or BAIL_OUT "close: $!"; link("$tmpdir/tst", "$tmpdir/new/link") or BAIL_OUT "link: $!"; @@ -31,10 +31,23 @@ link("$tmpdir/tst", "$tmpdir/new/link") or BAIL_OUT "link: $!"; is_deeply(\@events, ["$tmpdir/new/link"], 'link(2) detected'); $w->cancel; -select undef, undef, undef, $MIN_FS_TICK; +tick $MIN_FS_TICK; link("$tmpdir/new/tst", "$tmpdir/new/link2") or BAIL_OUT "link: $!"; @events = map { $_->fullname } $fi->read; is_deeply(\@events, [], 'link(2) not detected after cancel'); +$fi->watch("$tmpdir/new", PublicInbox::FakeInotify::IN_DELETE()); + +tick $MIN_FS_TICK; +rmdir("$tmpdir/new/rmd") or xbail "rmdir: $!"; +@events = $fi->read; +is_deeply([map{ $_->fullname }@events], ["$tmpdir/new/rmd"], 'rmdir detected'); +ok($events[0]->IN_DELETE, 'IN_DELETE set on rmdir'); + +tick $MIN_FS_TICK; +unlink("$tmpdir/new/tst") or xbail "unlink: $!"; +@events = grep { ref =~ /Gone/ } $fi->read; +is_deeply([map{ $_->fullname }@events], ["$tmpdir/new/tst"], 'unlink detected'); +ok($events[0]->IN_DELETE, 'IN_DELETE set on unlink'); PublicInbox::DS->Reset; -- cgit v1.2.3-24-ge0c7