RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

tail: improve support for polling

Browse source 
* Fix a timing related bug with polling (---disable-inotify) where some
Events weren't delivered fast enough by `Notify::PollWatcher` to pass all
of tests/tail-2/retry.sh and test_tail::{test_retry4, retry7}.

* uu_tail now reverts to polling automatically if inotify backend reports
too many open files (this mimics the behavior of GNU's tail).
This commit is contained in:
Jan Scheer 2022-04-30 12:02:42 +02:00
parent 5331a10a7b
commit 90a0226844
No known key found for this signature in database
GPG key ID: C62AD4C29E2B9828
2 changed files with 78 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/by-util/test_tail.rs
View file

@ -778,8 +778,8 @@ fn test_retry4() {
tail: 'missing' has appeared; following new file\n\
tail: missing: file truncated\n";
let expected_stdout = "X1\nX\n";
let delay = 1000;
let mut args = vec!["--follow=descriptor", "--retry", missing, "--use-polling"];
let delay = 100;
let mut args = vec!["-s.1", "--max-unchanged-stats=1", "--follow=descriptor", "--retry", missing, "---disable-inotify"];
for _ in 0..2 {
let mut p = ts.ucmd().args(&args).run_no_wait();
@ -787,9 +787,9 @@ fn test_retry4() {
at.touch(missing);
sleep(Duration::from_millis(delay));
at.truncate(missing, "X1\n");
sleep(Duration::from_millis(3 * delay));
sleep(Duration::from_millis(delay));
at.truncate(missing, "X\n");
sleep(Duration::from_millis(3 * delay));
sleep(Duration::from_millis(delay));
p.kill().unwrap();
@ -1089,7 +1089,7 @@ fn test_follow_descriptor_vs_rename1() {
"-s.1",
"--max-unchanged-stats=1",
file_a,
"--disable-inotify",
"---disable-inotify",
];
let delay = 500;
@ -1143,7 +1143,7 @@ fn test_follow_descriptor_vs_rename2() {
file_a,
file_b,
"--verbose",
"--disable-inotify",
"---disable-inotify",
];
let delay = 100;