Skip to content

[stable27] dont reuse etag for folders marked explicitly unscanned #43246

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

Merged
Altahrim merged 4 commits into from
Feb 9, 2024
Merged

[stable27] dont reuse etag for folders marked explicitly unscanned #43246

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90c57a6
dont reuse etag for folders marked explicitly unscanned
icewind1991 Nov 7, 2023
0b0efed
add test for updating etag with unchanged mtime
icewind1991 Nov 7, 2023
14678e6
add test for updating etag with unchanged mtime in child folder
icewind1991 Nov 22, 2023
7c8d71d
also updated parent etags when a changed etag is detected during scan…
icewind1991 Nov 22, 2023
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
Prev Previous commit
Next Next commit
add test for updating etag with unchanged mtime in child folder 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Jan 31, 2024
commit 14678e6bca964561189164c03385d8a707ddfc7f
25 changes: 25 additions & 0 deletions tests/lib/Files/Cache/ScannerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,29 @@ public function testNoETagUnscannedFolder() {
$newFolderEntry = $this->cache->get('folder');
$this->assertNotEquals($newFolderEntry->getEtag(), $oldFolderEntry->getEtag());
}

public function testNoETagUnscannedSubFolder() {
$this->fillTestFolders();
$this->storage->mkdir('folder/sub');

$this->scanner->scan('');

$oldFolderEntry1 = $this->cache->get('folder');
$oldFolderEntry2 = $this->cache->get('folder/sub');
// create a new file in a folder by keeping the mtime unchanged, but mark the folder as unscanned
$this->storage->file_put_contents('folder/sub/new.txt', 'foo');
$this->storage->touch('folder/sub', $oldFolderEntry1->getMTime());

// we only mark the direct parent as unscanned, which is the current "notify" behavior
$this->cache->update($oldFolderEntry2->getId(), ['size' => -1]);

$this->scanner->scan('');

$this->cache->inCache('folder/new.txt');

$newFolderEntry1 = $this->cache->get('folder');
$this->assertNotEquals($newFolderEntry1->getEtag(), $oldFolderEntry1->getEtag());
$newFolderEntry2 = $this->cache->get('folder/sub');
$this->assertNotEquals($newFolderEntry2->getEtag(), $oldFolderEntry2->getEtag());
}
}