danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8302 from kkmuffme/fix-cache-directory-race-conditions

Browse Source 
fix race conditions causing notices if directory does not exist
This commit is contained in:
orklah 2022-07-25 19:04:37 +02:00 committed by GitHub
commit d7cd84c4eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Psalm/Config.php
View File

@ -52,6 +52,7 @@ use function assert;
use function basename;
use function chdir;
use function class_exists;
use function clearstatcache;
use function count;
use function dirname;
use function error_log;
@ -2274,6 +2275,7 @@ class Config
public static function removeCacheDirectory(string $dir): void
{
clearstatcache(true, $dir);
if (is_dir($dir)) {
$objects = scandir($dir, SCANDIR_SORT_NONE);
@ -2282,17 +2284,29 @@ class Config
}
foreach ($objects as $object) {
if ($object !== '.' && $object !== '..') {
if (filetype($dir . '/' . $object) === 'dir') {
self::removeCacheDirectory($dir . '/' . $object);
} else {
unlink($dir . '/' . $object);
}
if ($object === '.' || $object === '..') {
continue;
}
// if it was deleted in the meantime/race condition with other psalm process
if (!file_exists($dir . '/' . $object)) {
continue;
}
if (filetype($dir . '/' . $object) === 'dir') {
self::removeCacheDirectory($dir . '/' . $object);
} else {
unlink($dir . '/' . $object);
}
}
reset($objects);
rmdir($dir);
// may have been removed in the meantime
clearstatcache(true, $dir);
if (is_dir($dir)) {
rmdir($dir);
}
}
}

8
src/Psalm/Internal/Provider/ParserCacheProvider.php
View File

@ -7,6 +7,7 @@ use PhpParser\Node\Stmt;
use Psalm\Config;
use RuntimeException;
use function clearstatcache;
use function error_log;
use function fclose;
use function file_get_contents;
@ -302,6 +303,13 @@ class ParserCacheProvider
return;
}
// directory was removed
// most likely due to a race condition with other psalm instances that were manually started at the same time
clearstatcache(true, $root_cache_directory);
if (!is_dir($root_cache_directory)) {
return;
}
$file_content_hashes = $this->new_file_content_hashes + $this->getExistingFileContentHashes();
$file_hashes_path = $root_cache_directory . DIRECTORY_SEPARATOR . self::FILE_HASHES;