SharedStorage to new sharing code + cleanup #23919

rullzer · 2016-04-11T14:19:53Z

This (big) PR will move the sharedstorage over to the share manager. Since this is not a 1 on 1 transformation this will cleanup the shared storage (and simplify it!) as well.

TODO:

Get rid of the old share
Get rid of functions that are covered in the jail
Get rid of all node API usage
Squash

CC: @icewind1991

mention-bot · 2016-04-11T14:19:56Z

By analyzing the blame information on this pull request, we identified @icewind1991, @MTGap and @schiesbn to be potential reviewers

rullzer · 2016-04-11T14:20:36Z

apps/files_sharing/lib/scanner.php

@@ -42,7 +42,7 @@ class SharedScanner extends Scanner {
 	 */
 	public function getData($path) {
 		$data = parent::getData($path);
-		$sourcePath = $this->storage->getSourcePath($path);
+		$sourcePath = '/' . $this->storage->getOwner($path) . '/' . $this->storage->getSourcePath($path);


This needs to be handled cleaner

rullzer · 2016-04-15T07:30:44Z

Ok all seems well. Commits are reorderd and squashed.
Probably best to review per commits (as the uit test fixes are the largest).

@nickvergessen could you see if activities and admin_audit still behave as expected?

Please review: @icewind1991 @PVince81 @MorrisJobke @DeepDiver1975

icewind1991 · 2016-04-15T10:04:30Z

apps/files_sharing/lib/scanner.php

+		if ($data === null) {
+			return null;
+		}
+		$sourcePath = '/' . $this->storage->getOwner($path) . '/' . $this->storage->getSourcePath($path);


I think this only works for the home storage.

Also it shouldn't be needed, you can get $sourceStorage and $internalPath from the storage without first going trough the absolute path

yes you are right. let me see if I can fix that a bit cleaner

A fixed $storage->resolvePath is what you want

PVince81 · 2016-04-18T08:36:04Z

apps/files_sharing/lib/cache.php

@@ -102,4 +102,8 @@ protected function formatCacheEntry($entry) {
 	public function clear() {
 		// Not a valid action for Shared Cache
 	}
+
+	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+		parent::moveFromCache($sourceCache, $sourcePath, $this->storage->getSourcePath($targetPath));


was this missing in the past ? Or is this addition specific to this PR's changes ?

In the past we used the parents function. but now we can't directly because we need to translate the path first.

This should be moved to CacheJail

No. Because in the cache jail we don't that it is a shared storage. So we don't know that it has getSourcePath

UHm I mean a jail storage...

Or... can we assume that the storage of a cachejail is always a jail?

CacheJail has it's own getSourcePath

O stupid me. Ok will fix.

nickvergessen · 2016-04-18T13:02:12Z

admin_audit and activity still work

icewind1991 · 2016-04-18T16:53:22Z

apps/files_sharing/lib/sharedstorage.php

+	 * @return bool
+	 */
+	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+		return parent::moveFromStorage($sourceStorage, $sourceInternalPath, $this->getSourcePath($targetInternalPath));


These can also be moved to the parent

icewind1991 · 2016-04-18T16:56:03Z

Code looks good otherwise

icewind1991 · 2016-04-19T12:27:33Z

👍

MorrisJobke · 2016-04-20T11:43:20Z

I can't judge on the code, but the sharing still works fine (federated shares, link shares, internal shares) So here is my 👍

nickvergessen · 2016-04-25T13:57:28Z

lib/private/files/config/lazystoragemountinfo.php

+	 */
+	public function getStorageId() {
+		if (!$this->storageId) {
+			$this->storageId = $this->mount->getStorage()->getStorageCache()->getNumericId();


what is this actually done for, the value seems unused? should it be returned?

PVince81 · 2016-06-20T13:50:02Z

Regression: #25186

PVince81 · 2016-07-05T09:04:29Z

Partial backport (well, only a very small part) to stable9: #25360

PVince81 · 2016-08-09T12:09:47Z

Another nasty regression: #25557

Somehow the introduction of LazyStorageMountInfo completely discarded the workaround we had to prevent recursion with shared mounts from #22945

DeepDiver1975 · 2016-08-09T12:18:23Z

Another nasty regression: #25557

#25703 as well

lock · 2019-08-05T02:02:15Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

rullzer added 2 - Developing feature:sharing technical debt labels Apr 11, 2016

rullzer added this to the 9.1-current milestone Apr 11, 2016

rullzer reviewed Apr 11, 2016
View reviewed changes

rullzer force-pushed the cyclyc-share-dep-example branch from 9aba49c to 4827c43 Compare April 11, 2016 14:23

rullzer mentioned this pull request Apr 13, 2016

Add LazyRootFolder #23963

Merged

rullzer force-pushed the cyclyc-share-dep-example branch 2 times, most recently from 60a523f to c57234a Compare April 13, 2016 12:57

rullzer mentioned this pull request Apr 13, 2016

Sharing 2.0 internals #22209

Open

19 tasks

rullzer force-pushed the cyclyc-share-dep-example branch 4 times, most recently from e45ffa4 to f10bec3 Compare April 15, 2016 07:02

rullzer added 3 - To Review and removed 2 - Developing labels Apr 15, 2016

icewind1991 reviewed Apr 15, 2016
View reviewed changes

rullzer force-pushed the cyclyc-share-dep-example branch from f10bec3 to b2dfc46 Compare April 15, 2016 10:40

icewind1991 force-pushed the cyclyc-share-dep-example branch from c6b8d95 to 531f7cb Compare April 15, 2016 12:20

rullzer force-pushed the cyclyc-share-dep-example branch from 531f7cb to 8ad4335 Compare April 15, 2016 15:15

PVince81 reviewed Apr 18, 2016
View reviewed changes

icewind1991 reviewed Apr 18, 2016
View reviewed changes

rullzer force-pushed the cyclyc-share-dep-example branch from 8ad4335 to ff3ffc3 Compare April 18, 2016 19:03

icewind1991 and others added 8 commits April 19, 2016 14:04

cache the scanner/updater/cache in the wrapper storage

3f95d44

Move SharedStorage et al over to the shareManager and jail

6123bad

Fix related logic

afa37d3

Fix tests

92abb5f

Fix resolve path

c98fef8

Only construct the storage when we start using it

2f1c62c

Move copy- and moveFromStorage to jail

f27d7cb

Move moveFromCache to CacheJail

b53d659

rullzer force-pushed the cyclyc-share-dep-example branch from ff3ffc3 to b53d659 Compare April 19, 2016 12:04

MorrisJobke added 4 - To release and removed 3 - To Review labels Apr 20, 2016

DeepDiver1975 merged commit cd01c44 into master Apr 20, 2016

DeepDiver1975 deleted the cyclyc-share-dep-example branch April 20, 2016 18:37

nickvergessen mentioned this pull request Apr 25, 2016

Can not wrap storage of owner anymore #24249

Closed

nickvergessen reviewed Apr 25, 2016
View reviewed changes

PVince81 mentioned this pull request Jul 20, 2016

Group shares with same source and target #25113

Merged

3 tasks

PVince81 mentioned this pull request Aug 15, 2016

Bogus shared:: storage entry in oc_storages #24106

Closed

This was referenced Jan 10, 2017

[stable9] Backport lazy init of shared mount/storage #26911

Closed

[stable9] Backport lazy init of shared storage/mount #26912

Merged

lock bot locked as resolved and limited conversation to collaborators Aug 5, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SharedStorage to new sharing code + cleanup #23919

SharedStorage to new sharing code + cleanup #23919

rullzer commented Apr 11, 2016 •

edited

Loading

mention-bot commented Apr 11, 2016

rullzer Apr 11, 2016

rullzer commented Apr 15, 2016

icewind1991 Apr 15, 2016

rullzer Apr 15, 2016

icewind1991 Apr 15, 2016

PVince81 Apr 18, 2016

rullzer Apr 18, 2016

icewind1991 Apr 18, 2016

rullzer Apr 18, 2016

rullzer Apr 18, 2016

rullzer Apr 18, 2016

icewind1991 Apr 19, 2016

rullzer Apr 19, 2016

rullzer Apr 19, 2016

nickvergessen commented Apr 18, 2016

icewind1991 Apr 18, 2016

rullzer Apr 18, 2016

icewind1991 commented Apr 18, 2016

icewind1991 commented Apr 19, 2016

MorrisJobke commented Apr 20, 2016

nickvergessen Apr 25, 2016

PVince81 commented Jun 20, 2016

PVince81 commented Jul 5, 2016

PVince81 commented Aug 9, 2016

DeepDiver1975 commented Aug 9, 2016

lock bot commented Aug 5, 2019

SharedStorage to new sharing code + cleanup #23919

SharedStorage to new sharing code + cleanup #23919

Conversation

rullzer commented Apr 11, 2016 • edited Loading

mention-bot commented Apr 11, 2016

Choose a reason for hiding this comment

rullzer commented Apr 15, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nickvergessen commented Apr 18, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

icewind1991 commented Apr 18, 2016

icewind1991 commented Apr 19, 2016

MorrisJobke commented Apr 20, 2016

Choose a reason for hiding this comment

PVince81 commented Jun 20, 2016

PVince81 commented Jul 5, 2016

PVince81 commented Aug 9, 2016

DeepDiver1975 commented Aug 9, 2016

lock bot commented Aug 5, 2019

rullzer commented Apr 11, 2016 •

edited

Loading