Skip to content
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

Jump to bottom

[10] Fix shared storage recursive setup #1008

Merged
merged 6 commits into from
Aug 23, 2016
Merged

[10] Fix shared storage recursive setup #1008

merged 6 commits into from
Aug 23, 2016

Conversation

icewind1991
Copy link
Member

Backport of #1007

Fixes #986

@Mrflow can you check if this fixes the problem for you

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Aug 22, 2016
@icewind1991 icewind1991 added this to the Nextcloud 10.0 milestone Aug 22, 2016
@mention-bot
Copy link

@icewind1991, thanks for your PR! By analyzing the annotation information on this pull request, we identified @rullzer, @PVince81 and @DeepDiver1975 to be potential reviewers

@rullzer
Copy link
Member

rullzer commented Aug 22, 2016

LGTM

@fbaeuerle
Copy link

fbaeuerle commented Aug 22, 2016 •
edited
Loading

checked out 58b810a
did not solve the problem for me.

php-fpm still segfaulting.

here's a stack trace, still getting stack overflows it seems:
https://paste.gnome.org/p0hbpj42m
https://paste.gnome.org/pgo8vtg5b

@icewind1991 icewind1991 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 22, 2016
@icewind1991
Copy link
Member Author

@Mrflow can you retry with the latest commit

@fbaeuerle
Copy link

@icewind1991 that solved the problem. many thanks!

@icewind1991 icewind1991 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 22, 2016
@icewind1991 icewind1991 force-pushed the shared-storage-non-recursive-10 branch from aafcaa4 to d121606 Compare August 22, 2016 17:41
@LukasReschke LukasReschke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 22, 2016
@LukasReschke
Copy link
Member

💣

  Scenario: Retrieving folder quota of shared folder with quota when no quota is set for recipient        # /drone/src/github.com/nextcloud/server/build/integration/features/webdav-related.feature:44
    Given using dav path "remote.php/webdav"                                                              # FeatureContext::usingDavPath()
    And As an "admin"                                                                                     # FeatureContext::asAn()
[Mon Aug 22 18:35:21 2016] ::1:58202 [404]: /ocs/v2.php/cloud/users/user0
[Mon Aug 22 18:35:21 2016] ::1:58203 [200]: /ocs/v1.php/cloud/users
[Mon Aug 22 18:35:22 2016] ::1:58204 [200]: /ocs/v1.php/cloud/users/user0
[Mon Aug 22 18:35:22 2016] ::1:58205 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                               # FeatureContext::assureUserExists()
[Mon Aug 22 18:35:22 2016] ::1:58206 [404]: /ocs/v2.php/cloud/users/user1
[Mon Aug 22 18:35:22 2016] ::1:58207 [200]: /ocs/v1.php/cloud/users
[Mon Aug 22 18:35:23 2016] ::1:58208 [200]: /ocs/v1.php/cloud/users/user1
[Mon Aug 22 18:35:23 2016] ::1:58209 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                               # FeatureContext::assureUserExists()
[Mon Aug 22 18:35:23 2016] ::1:58210 [200]: /ocs/v1.php/cloud/users/user0
    And user "user0" has unlimited quota                                                                  # FeatureContext::userHasUnlimitedQuota()
[Mon Aug 22 18:35:23 2016] ::1:58211 [200]: /ocs/v1.php/cloud/users/user1
    And user "user1" has a quota of "10 MB"                                                               # FeatureContext::userHasAQuotaOf()
    And As an "user1"                                                                                     # FeatureContext::asAn()
[Mon Aug 22 18:35:24 2016] ::1:58212 [201]: /remote.php/webdav/testquota
    And user "user1" created a folder "/testquota"                                                        # FeatureContext::userCreatedAFolder()
[Mon Aug 22 18:35:24 2016] ::1:58213 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And as "user1" creating a share with                                                                  # FeatureContext::asCreatingAShareWith()
      | path        | testquota |
      | shareType   | 0         |
      | permissions | 31        |
      | shareWith   | user0     |
[Mon Aug 22 18:35:24 2016] ::1:58214 [401]: /remote.php/webdav/testquota
[Mon Aug 22 18:35:24 2016] call_user_func_array() expects parameter 1 to be a valid callback, class 'OC\Files\Storage\Home' does not have a method 'getSourceStorage' at /drone/src/github.com/nextcloud/server/lib/private/Files/Storage/Wrapper/Wrapper.php#497
[Mon Aug 22 18:35:24 2016] Exception: {"Exception":"Error","Message":"Call to a member function instanceOfStorage() on null","Code":0,"Trace":"#0 \/drone\/src\/github.com\/nextcloud\/server\/apps\/dav\/lib\/Connector\/Sabre\/Directory.php(298): OC_Helper::getStorageInfo('\/user0\/files\/te...', Object(OC\\Files\\FileInfo))\n#1 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/CorePlugin.php(808): OCA\\DAV\\Connector\\Sabre\\Directory->getQuotaInfo()\n#2 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/PropFind.php(98): Sabre\\DAV\\CorePlugin->Sabre\\DAV\\{closure}()\n#3 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/CorePlugin.php(811): Sabre\\DAV\\PropFind->handle('{DAV:}quota-ava...', Object(Closure))\n#4 [internal function]: Sabre\\DAV\\CorePlugin->propFind(Object(Sabre\\DAV\\PropFind), Object(OCA\\DAV\\Connector\\Sabre\\Directory))\n#5 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/event\/lib\/EventEmitterTrait.php(105): call_user_func_array(Array, Array)\n#6 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/Server.php(999): Sabre\\Event\\EventEmitter->emit('propFind', Array)\n#7 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/Server.php(919): Sabre\\DAV\\Server->getPropertiesByNode(Object(Sabre\\DAV\\PropFind), Object(OCA\\DAV\\Connector\\Sabre\\Directory))\n#8 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/CorePlugin.php(334): Sabre\\DAV\\Server->getPropertiesForPath('testquota', Array, 0)\n#9 [internal function]: Sabre\\DAV\\CorePlugin->httpPropFind(Object(Sabre\\HTTP\\Request), Object(Sabre\\HTTP\\Response))\n#10 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/event\/lib\/EventEmitterTrait.php(105): call_user_func_array(Array, Array)\n#11 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/Server.php(459): Sabre\\Event\\EventEmitter->emit('method:PROPFIND', Array)\n#12 \/drone\/src\/github.com\/nextcloud\/server\/3rdparty\/sabre\/dav\/lib\/DAV\/Server.php(248): Sabre\\DAV\\Server->invokeMethod(Object(Sabre\\HTTP\\Request), Object(Sabre\\HTTP\\Response))\n#13 \/drone\/src\/github.com\/nextcloud\/server\/apps\/dav\/appinfo\/v1\/webdav.php(60): Sabre\\DAV\\Server->exec()\n#14 \/drone\/src\/github.com\/nextcloud\/server\/remote.php(165): require_once('\/drone\/src\/gith...')\n#15 {main}","File":"\/drone\/src\/github.com\/nextcloud\/server\/lib\/private\/legacy\/helper.php","Line":599}
[Mon Aug 22 18:35:24 2016] ::1:58215 [500]: /remote.php/webdav/testquota
    Then as "user0" gets properties of folder "/testquota" with                                           # FeatureContext::asGetsPropertiesOfFolderWith()
      | {DAV:}quota-available-bytes |
      HTTP error: 500 (Sabre\DAV\Exception)
    And the single response should contain a property "{DAV:}quota-available-bytes" with value "10485429" # FeatureContext::theSingleResponseShouldContainAPropertyWithValue()
[Mon Aug 22 18:35:24 2016] ::1:58216 [200]: /ocs/v1.php/cloud/users/user0
[Mon Aug 22 18:35:24 2016] ::1:58217 [404]: /ocs/v2.php/cloud/users/user0
[Mon Aug 22 18:35:24 2016] ::1:58218 [200]: /ocs/v1.php/cloud/users/user1
[Mon Aug 22 18:35:25 2016] ::1:58219 [404]: /ocs/v2.php/cloud/users/user1
[Mon Aug 22 18:35:25 2016] ::1:58220 [401]: /remote.php/webdav/myFileToComment.txt
[Mon Aug 22 18:35:25 2016] ::1:58221 [207]: /remote.php/dav/systemtags/
[Mon Aug 22 18:35:25 2016] ::1:58222 [401]: /remote.php/webdav/myFileToTag.txt
[Mon Aug 22 18:35:25 2016] ::1:58223 [404]: /remote.php/dav/addressbooks/users/admin/MyAddressbook
[Mon Aug 22 18:35:25 2016] ::1:58224 [404]: /remote.php/dav/calendars/admin/MyCalendar

@icewind1991 icewind1991 force-pushed the shared-storage-non-recursive-10 branch from d121606 to dacf231 Compare August 23, 2016 10:11
@icewind1991 icewind1991 force-pushed the shared-storage-non-recursive-10 branch from dacf231 to fa980af Compare August 23, 2016 11:59
@icewind1991
Copy link
Member Author

tests all green, please review @LukasReschke @rullzer

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Aug 23, 2016
@rullzer
Copy link
Member

rullzer commented Aug 23, 2016

Whee 👍

@icewind1991 icewind1991 removed the 2. developing Work in progress label Aug 23, 2016
@LukasReschke
Copy link
Member

LGTM

@LukasReschke LukasReschke merged commit 805fc22 into stable10 Aug 23, 2016
@LukasReschke LukasReschke deleted the shared-storage-non-recursive-10 branch August 23, 2016 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
3. to review Waiting for reviews high
Projects
None yet
Milestone
Nextcloud 10.0
Development

Successfully merging this pull request may close these issues.
5 participants
@icewind1991 @mention-bot @rullzer @fbaeuerle @LukasReschke