Skip to content

checkDiskSpace: df по пути вместо Storage::getAllHdd — фикс для syste… #55

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
boffart merged 1 commit into from
Apr 24, 2026
Merged

checkDiskSpace: df по пути вместо Storage::getAllHdd — фикс для syste… #55

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
87 changes: 19 additions & 68 deletions Lib/Backup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,24 +232,12 @@ public static function unpackUploadedImgConf($data): PBXApiResult
return $res;
}

// Проверка свободного места на диске перед распаковкой.
$uploadedFileSize = filesize($data['temp_file']);
$storage = new Storage();
$storageData = $storage->getAllHdd();
$mountPoint = '';
Storage::isStorageDiskMounted('', $mountPoint);
$freeSpace = 0;
foreach ($storageData as $disk) {
if (($disk['mounted'] ?? '') === $mountPoint) {
$freeSpace = intval($disk['free_space']) * 1024 * 1024; // MB → bytes
break;
}
}
// Для распаковки нужно минимум 2x размер файла (архив + содержимое) + 500MB запас.
$requiredSpace = ($uploadedFileSize * 2) + (500 * 1024 * 1024);
if ($freeSpace > 0 && $freeSpace < $requiredSpace) {
$freeSpaceMB = round($freeSpace / 1024 / 1024);
$requiredMB = round($requiredSpace / 1024 / 1024);
// Проверка свободного места перед распаковкой: нужно ≥ 2x размер файла
// (архив + содержимое) + 500 MB запас.
$uploadedFileSizeMB = intval(filesize($data['temp_file']) / 1024 / 1024);
$freeSpaceMB = self::getFreeSpaceOnMountPoint($backupDir);
$requiredMB = ($uploadedFileSizeMB * 2) + 500;
if ($freeSpaceMB > 0 && $freeSpaceMB < $requiredMB) {
$res->messages[] = "Not enough disk space. Free: {$freeSpaceMB} MB, required: {$requiredMB} MB";
return $res;
}
Expand Down Expand Up @@ -1212,63 +1200,26 @@ public function checkDiskSpace():bool
}
$needSpace += intval($estimatedSize->getResult()['data'][$key]);
}
if($this->remote === true){
// Это резервное копирование на удаленнный сервер.
$freeSpace = $this->getFreeSpaceOnMountPoint($this->dirs['backup']);
}else{
// Резервное копирование на локальный диск.
if(Util::isDocker()){
$freeSpaceData = $this->getDockerHdd();
}else{
$storage = new Storage();
$freeSpaceData = $storage->getAllHdd();
}
// Ищем основной storage-диск (реальная FS, не FUSE/tmpfs).
foreach ($freeSpaceData as $storageData){
$mounted = trim($storageData['mounted'] ?? '');
if (strpos($mounted, '/storage/usbdisk') === 0) {
$freeSpace = intval($storageData['free_space']);
break;
}
}
}
// df по фактическому пути — работает и для выделенного диска, и для
// system-disk (когда /storage/usbdisk1 — раздел системного диска).
$freeSpace = self::getFreeSpaceOnMountPoint($this->dirs['backup']);

return ($freeSpace > $needSpace && ($freeSpace - $needSpace) > 500);
}

private function getDockerHdd():array{
$out = [];
$grepPath = Util::which('grep');
$dfPath = Util::which('df');
$awkPath = Util::which('awk');
Processes::mwExec(
"{$dfPath} -k /storage | {$awkPath} '{ print \$1 \"|\" $3 \"|\" \$4} ' | {$grepPath} -v 'Available'",
$out
);
$res_disks = [];
$disk_data = explode('|', implode(" ", $out));
if (count($disk_data) >= 3) {
$m_size = round(($disk_data[1] + $disk_data[2]) / 1024, 1);
$res_disks[] = [
'id' => $disk_data[0],
'size' => "" . $m_size,
'size_text' => "" . $m_size . " Mb",
'vendor' => 'Docker',
'mounted' => '/storage/usbdisk1/',
'free_space' => round($disk_data[2] / 1024, 1),
'partitions' => [],
'sys_disk' => true,
];
}
return $res_disks;
}

private function getFreeSpaceOnMountPoint($mountPoint):string{
/**
* Возвращает свободное место в MB по фактическому пути (df сам резолвит
* подкаталог в точку монтирования). `timeout 3` защищает от зависания
* на stale FUSE/FTP/SFTP маунте.
*/
private static function getFreeSpaceOnMountPoint(string $mountPoint): int
{
$pathDf = Util::which('df');
$pathGrep = Util::which('grep');
$pathTail = Util::which('tail');
$pathAwk = Util::which('awk');
$pathTimeout = Util::which('timeout');
$escapedMountPoint = escapeshellarg($mountPoint);
return (string)intval(shell_exec("$pathDf -m -a -P | $pathGrep $escapedMountPoint | $pathAwk '{print $4}'"));
return intval(shell_exec("$pathTimeout 3 $pathDf -m -P $escapedMountPoint 2>/dev/null | $pathTail -n 1 | $pathAwk '{print \$4}'"));
}

/**
Expand Down
Loading