Wait for cron to finish before running upgrade command

* fixes #9562

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

2 files changed, 10 insertions, 2 deletions

diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 5a2deea0b6c..f6f33783684 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -99,7 +99,8 @@ class Upgrade extends Command {
 					$this->config,
 					\OC::$server->getIntegrityCodeChecker(),
 					$this->logger,
-					$this->installer
+					$this->installer,
+					\OC::$server->getJobList()
 			);
 
 			$dispatcher = \OC::$server->getEventDispatcher();
@@ -191,6 +192,9 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'maintenanceActive', function () use($output) {
 				$output->writeln('<info>Maintenance mode is kept active</info>');
 			});
+			$updater->listen('\OC\Updater', 'waitForCronToFinish', function () use($output) {
+				$output->writeln('<info>Waiting for cron to finish (checks again in 5 seconds)...</info>');
+			});
 			$updater->listen('\OC\Updater', 'updateEnd',
 				function ($success) use($output, $self) {
 					if ($success) {
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6ec6b71731d..c1210eaa5b7 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -119,7 +119,8 @@ if (\OCP\Util::needUpgrade()) {
 			$config,
 			\OC::$server->getIntegrityCodeChecker(),
 			$logger,
-			\OC::$server->query(\OC\Installer::class)
+			\OC::$server->query(\OC\Installer::class),
+			\OC::$server->getJobList()
 	);
 	$incompatibleApps = [];
 
@@ -152,6 +153,9 @@ if (\OCP\Util::needUpgrade()) {
 	$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
 	});
+	$updater->listen('\OC\Updater', 'waitForCronToFinish', function () use ($eventSource, $l) {
+		$eventSource->send('success', (string)$l->t('Waiting for cron to finish (checks again in 5 seconds)...'));
+	});
 	$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
 		$eventSource->send('success', (string)$l->t('Updating database schema'));
 	});