Skip to content

Commit

Permalink
fix(CardDAV): only run upgrade sync if 1000 users or less
Browse files Browse the repository at this point in the history 
Signed-off-by: Anna Larch <[email protected]>
  • Loading branch information
@miaulalala
miaulalala committed Aug 16, 2023
1 parent f3fa006 commit bae28b6
Show file tree
Hide file tree
Showing 11 changed files with 137 additions and 83 deletions.
9 changes: 3 additions & 6 deletions apps/dav/lib/Command/SyncSystemAddressBook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,18 @@
namespace OCA\DAV\Command;

use OCA\DAV\CardDAV\SyncService;
use OCP\IConfig;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

class SyncSystemAddressBook extends Command {

/** @var SyncService */
private $syncService;

/**
* @param SyncService $syncService
*/
public function __construct(SyncService $syncService) {
public function __construct(private SyncService $syncService, private IConfig $config) {
parent::__construct();
$this->syncService = $syncService;
}

protected function configure() {
Expand All @@ -62,6 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

$progress->finish();
$output->writeln('');
$this->config->deleteAppValue('dav', 'upgrade_dav_sync_run');
return 0;
}
}
22 changes: 15 additions & 7 deletions apps/dav/lib/Migration/Version1027Date20230504122946.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
use Closure;
use OCA\DAV\CardDAV\SyncService;
use OCP\DB\ISchemaWrapper;
use OCP\IConfig;
use OCP\IUserManager;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
use Psr\Container\ContainerExceptionInterface;
Expand All @@ -37,22 +39,28 @@
use Throwable;

class Version1027Date20230504122946 extends SimpleMigrationStep {
private SyncService $syncService;
private LoggerInterface $logger;

public function __construct(SyncService $syncService, LoggerInterface $logger) {
$this->syncService = $syncService;
$this->logger = $logger;
}
public function __construct(private SyncService $syncService,
private LoggerInterface $logger,
private IUserManager $userManager,
private IConfig $config) {}
/**
* @param IOutput $output
* @param Closure(): ISchemaWrapper $schemaClosure
* @param array $options
*/
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
if($this->userManager->countUsers() > 1000) {
$this->logger->info('Could not sync system address books during update as too many user records found. Please call occ dav:sync-system-addressbook manually.');
$this->config->setAppValue('dav', 'upgrade_dav_sync_run', 'no');
$output->info('System address book sync failed. See logs for details');
return;
}

try {
$this->syncService->syncInstance();
$this->config->deleteAppValue('dav', 'upgrade_dav_sync_run');
} catch (Throwable $e) {
$this->config->setAppValue('dav', 'upgrade_dav_sync_run', 'no');
$this->logger->error('Could not sync system address books during update', [
'exception' => $e,
]);
Expand Down
108 changes: 55 additions & 53 deletions apps/settings/composer/composer/ClassLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,63 +45,66 @@ class ClassLoader
/** @var \Closure(string):void */
private static $includeFile;

/** @var string|null */
/** @var ?string */
private $vendorDir;

// PSR-4
/**
* @var array<string, array<string, int>>
* @var array[]
* @psalm-var array<string, array<string, int>>
*/
private $prefixLengthsPsr4 = array();
/**
* @var array<string, list<string>>
* @var array[]
* @psalm-var array<string, array<int, string>>
*/
private $prefixDirsPsr4 = array();
/**
* @var list<string>
* @var array[]
* @psalm-var array<string, string>
*/
private $fallbackDirsPsr4 = array();

// PSR-0
/**
* List of PSR-0 prefixes
*
* Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
*
* @var array<string, array<string, list<string>>>
* @var array[]
* @psalm-var array<string, array<string, string[]>>
*/
private $prefixesPsr0 = array();
/**
* @var list<string>
* @var array[]
* @psalm-var array<string, string>
*/
private $fallbackDirsPsr0 = array();

/** @var bool */
private $useIncludePath = false;

/**
* @var array<string, string>
* @var string[]
* @psalm-var array<string, string>
*/
private $classMap = array();

/** @var bool */
private $classMapAuthoritative = false;

/**
* @var array<string, bool>
* @var bool[]
* @psalm-var array<string, bool>
*/
private $missingClasses = array();

/** @var string|null */
/** @var ?string */
private $apcuPrefix;

/**
* @var array<string, self>
* @var self[]
*/
private static $registeredLoaders = array();

/**
* @param string|null $vendorDir
* @param ?string $vendorDir
*/
public function __construct($vendorDir = null)
{
Expand All @@ -110,7 +113,7 @@ public function __construct($vendorDir = null)
}

/**
* @return array<string, list<string>>
* @return string[]
*/
public function getPrefixes()
{
Expand All @@ -122,39 +125,44 @@ public function getPrefixes()
}

/**
* @return array<string, list<string>>
* @return array[]
* @psalm-return array<string, array<int, string>>
*/
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}

/**
* @return list<string>
* @return array[]
* @psalm-return array<string, string>
*/
public function getFallbackDirs()
{
return $this->fallbackDirsPsr0;
}

/**
* @return list<string>
* @return array[]
* @psalm-return array<string, string>
*/
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}

/**
* @return array<string, string> Array of classname => path
* @return string[] Array of classname => path
* @psalm-return array<string, string>
*/
public function getClassMap()
{
return $this->classMap;
}

/**
* @param array<string, string> $classMap Class to filename map
* @param string[] $classMap Class to filename map
* @psalm-param array<string, string> $classMap
*
* @return void
*/
Expand All @@ -171,25 +179,24 @@ public function addClassMap(array $classMap)
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The prefix
* @param list<string>|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
* @param string $prefix The prefix
* @param string[]|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*
* @return void
*/
public function add($prefix, $paths, $prepend = false)
{
$paths = (array) $paths;
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
$paths,
(array) $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
$paths
(array) $paths
);
}

Expand All @@ -198,19 +205,19 @@ public function add($prefix, $paths, $prepend = false)

$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = $paths;
$this->prefixesPsr0[$first][$prefix] = (array) $paths;

return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$paths,
(array) $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
$paths
(array) $paths
);
}
}
Expand All @@ -219,28 +226,27 @@ public function add($prefix, $paths, $prepend = false)
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param list<string>|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param string[]|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*
* @return void
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
$paths = (array) $paths;
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
$paths,
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
$paths
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
Expand All @@ -250,18 +256,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = $paths;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$paths,
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
$paths
(array) $paths
);
}
}
Expand All @@ -270,8 +276,8 @@ public function addPsr4($prefix, $paths, $prepend = false)
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param list<string>|string $paths The PSR-0 base directories
* @param string $prefix The prefix
* @param string[]|string $paths The PSR-0 base directories
*
* @return void
*/
Expand All @@ -288,8 +294,8 @@ public function set($prefix, $paths)
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param list<string>|string $paths The PSR-4 base directories
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param string[]|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*
Expand Down Expand Up @@ -423,8 +429,7 @@ public function unregister()
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
$includeFile = self::$includeFile;
$includeFile($file);
(self::$includeFile)($file);

return true;
}
Expand Down Expand Up @@ -475,9 +480,9 @@ public function findFile($class)
}

/**
* Returns the currently registered loaders keyed by their corresponding vendor directories.
* Returns the currently registered loaders indexed by their corresponding vendor directories.
*
* @return array<string, self>
* @return self[]
*/
public static function getRegisteredLoaders()
{
Expand Down Expand Up @@ -555,10 +560,7 @@ private function findFileWithExtension($class, $ext)
return false;
}

/**
* @return void
*/
private static function initializeIncludeClosure()
private static function initializeIncludeClosure(): void
{
if (self::$includeFile !== null) {
return;
Expand All @@ -572,8 +574,8 @@ private static function initializeIncludeClosure()
* @param string $file
* @return void
*/
self::$includeFile = \Closure::bind(static function($file) {
self::$includeFile = static function($file) {
include $file;
}, null, null);
};
}
}
Loading

0 comments on commit bae28b6

Please sign in to comment.