Merge pull request #33468 from owncloud/fix-repair-filecache-check-ou…

…tput File cache hole check only report storage id once
owncloud · Nov 15, 2018 · 81d5e68 · 81d5e68
2 parents 31f9ad4 + a7e3715
commit 81d5e68
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/private/Repair/RepairMismatchFileCachePath.php b/lib/private/Repair/RepairMismatchFileCachePath.php
@@ -243,9 +243,10 @@ private function reportAffectedStoragesParentIdWrongPath(IOutput $out) {
 
 		$storageIds = [];
 		foreach ($rows as $row) {
-			$storageIds[] = $row['storage'];
+			$storageIds[$row['storage']] = true;
 		}
 
+		$storageIds = \array_keys($storageIds);
 		if (!empty($storageIds)) {
 			$out->warning('The file cache contains entries with invalid path values for the following storage numeric ids: ' . \implode(' ', $storageIds));
 			$out->warning('Please run `occ files:scan --all --repair` to repair'
@@ -271,9 +272,10 @@ private function reportAffectedStoragesNonExistingParentIdEntry(IOutput $out) {
 
 		$storageIds = [];
 		foreach ($rows as $row) {
-			$storageIds[] = $row['storage'];
+			$storageIds[$row['storage']] = true;
 		}
 
+		$storageIds = \array_keys($storageIds);
 		if (!empty($storageIds)) {
 			$out->warning('The file cache contains entries where the parent id does not point to any existing entry for the following storage numeric ids: ' . \implode(' ', $storageIds));
 			$out->warning('Please run `occ files:scan --all --repair` to repair all affected storages');

diff --git a/tests/lib/Repair/RepairMismatchFileCachePathTest.php b/tests/lib/Repair/RepairMismatchFileCachePathTest.php
@@ -216,6 +216,15 @@ public function testRepairEntry($sourceStorageId, $targetStorageId, $targetDir,
 			->method('getSystemValue')
 			->with('version', '0.0.0')
 			->willReturn('10.0.3');
+
+		// test report command first
+		$this->repair->setCountOnly(true);
+		$outputMock->expects($this->at(0))
+			->method('warning')
+			->with($this->logicalAnd($this->stringContains('with invalid path values'), $this->stringContains($sourceStorageId)));
+		$this->repair->run($outputMock);
+		$this->repair->setCountOnly(false);
+
 		if ($repairStoragesOrder === null) {
 			// no storage selected, full repair
 			$this->repair->setStorageNumericId(null);
@@ -552,6 +561,13 @@ public function testRepairParentIdPointingNowhere() {
 			->method('getSystemValue')
 			->with('version', '0.0.0')
 			->willReturn('10.0.3');
+
+		$this->repair->setCountOnly(true);
+		$outputMock->expects($this->at(0))
+			->method('warning')
+			->with($this->logicalAnd($this->stringContains('parent id does not point'), $this->stringContains($storageId)));
+		$this->repair->run($outputMock);
+		$this->repair->setCountOnly(false);
 		$this->repair->run($outputMock);
 
 		// wrong parent root reparented to actual root