Skip to content

Allow to run occ preview:repair in parallel #22911

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
merged 3 commits into from
Sep 18, 2020
Merged

Allow to run occ preview:repair in parallel #22911

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faab3e7
Allow to run occ preview:repair in parallel
MorrisJobke Sep 17, 2020
617b3f7
Show lock messages only in verbose mode
MorrisJobke Sep 17, 2020
24744dc
Migrate verbose messages to inline syntax of writeln()
MorrisJobke Sep 17, 2020
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
34 changes: 22 additions & 12 deletions core/Command/Preview/Repair.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
use OCP\Files\NotFoundException;
use OCP\IConfig;
use OCP\ILogger;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
Expand All @@ -54,11 +56,14 @@ class Repair extends Command {
private $memoryLimit;
/** @var int */
private $memoryTreshold;
/** @var ILockingProvider */
private $lockingProvider;

public function __construct(IConfig $config, IRootFolder $rootFolder, ILogger $logger, IniGetWrapper $phpIni) {
public function __construct(IConfig $config, IRootFolder $rootFolder, ILogger $logger, IniGetWrapper $phpIni, ILockingProvider $lockingProvider) {
$this->config = $config;
$this->rootFolder = $rootFolder;
$this->logger = $logger;
$this->lockingProvider = $lockingProvider;

$this->memoryLimit = $phpIni->getBytes('memory_limit');
$this->memoryTreshold = $this->memoryLimit - 25 * 1024 * 1024;
Expand Down Expand Up @@ -95,8 +100,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$output->writeln("");
}

$verbose = $output->isVerbose();

$instanceId = $this->config->getSystemValueString('instanceid');

$output->writeln("This will migrate all previews from the old preview location to the new one.");
Expand Down Expand Up @@ -218,14 +221,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
return 1;
}

$lockName = 'occ preview:repair lock ' . $oldPreviewFolder->getId();
try {
$section1->writeln(" Locking \"$lockName\" …", OutputInterface::VERBOSITY_VERBOSE);
$this->lockingProvider->acquireLock($lockName, ILockingProvider::LOCK_EXCLUSIVE);
} catch (LockedException $e) {
$section1->writeln(" Skipping because it is locked - another process seems to work on this …");
continue;
}

$previews = $oldPreviewFolder->getDirectoryListing();
if ($previews !== []) {
try {
$this->rootFolder->get("appdata_$instanceId/preview/$newFoldername");
} catch (NotFoundException $e) {
if ($verbose) {
$section1->writeln(" Create folder preview/$newFoldername");
}
$section1->writeln(" Create folder preview/$newFoldername", OutputInterface::VERBOSITY_VERBOSE);
if (!$dryMode) {
$this->rootFolder->newFolder("appdata_$instanceId/preview/$newFoldername");
}
Expand All @@ -240,9 +250,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$progressBar->advance();
continue;
}
if ($verbose) {
$section1->writeln(" Move preview/$name/$previewName to preview/$newFoldername");
}
$section1->writeln(" Move preview/$name/$previewName to preview/$newFoldername", OutputInterface::VERBOSITY_VERBOSE);
if (!$dryMode) {
try {
$preview->move("appdata_$instanceId/preview/$newFoldername/$previewName");
Expand All @@ -253,9 +261,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}
}
if ($oldPreviewFolder->getDirectoryListing() === []) {
if ($verbose) {
$section1->writeln(" Delete empty folder preview/$name");
}
$section1->writeln(" Delete empty folder preview/$name", OutputInterface::VERBOSITY_VERBOSE);
if (!$dryMode) {
try {
$oldPreviewFolder->delete();
Expand All @@ -264,6 +270,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
}
}
}

$this->lockingProvider->releaseLock($lockName, ILockingProvider::LOCK_EXCLUSIVE);
$section1->writeln(" Unlocked", OutputInterface::VERBOSITY_VERBOSE);

$section1->writeln(" Finished migrating previews of file with fileId $name …");
$progressBar->advance();
}
Expand Down