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.

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

[stable19] add mount point to quota warning message #23168

Merged
merged 3 commits into from
Nov 12, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Oct 4, 2020

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #22913

@rullzer rullzer added the 3. to review Waiting for reviews label Oct 5, 2020
@MorrisJobke
Copy link
Member

When fixing the conflicts please also add #23193

@rullzer rullzer mentioned this pull request Oct 6, 2020
3 tasks
@R0Wi
Copy link
Member

R0Wi commented Oct 10, 2020

@MorrisJobke @rullzer @skjnldsv since #22913 was merged i get the following error on my NC20 dev instance:

{
   "reqId":"kjRkrtvjauz1r74ZhJkY",
   "level":3,
   "time":"2020-10-10T14:22:24+00:00",
   "remoteAddr":"::1",
   "user":"robin",
   "app":"PHP",
   "method":"GET",
   "url":"/nextcloud/index.php/apps/files/ajax/getstoragestats.php?dir=%2F",
   "message":{
      "Exception":"Error",
      "Message":"Undefined offset: 3 at /var/www/html/nextcloud/lib/private/legacy/OC_Helper.php#548",
      "Code":0,
      "Trace":[
         {
            "file":"/var/www/html/nextcloud/lib/private/legacy/OC_Helper.php",
            "line":548,
            "function":"onError",
            "class":"OC\\Log\\ErrorHandler",
            "type":"::"
         },
         {
            "file":"/var/www/html/nextcloud/apps/files/lib/Helper.php",
            "line":51,
            "function":"getStorageInfo",
            "class":"OC_Helper",
            "type":"::"
         },
         {
            "file":"/var/www/html/nextcloud/apps/files/lib/Controller/AjaxController.php",
            "line":47,
            "function":"buildFileStorageStatistics",
            "class":"OCA\\Files\\Helper",
            "type":"::"
         },
         {
            "file":"/var/www/html/nextcloud/lib/private/AppFramework/Http/Dispatcher.php",
            "line":169,
            "function":"getStorageStats",
            "class":"OCA\\Files\\Controller\\AjaxController",
            "type":"->"
         },
         {
            "file":"/var/www/html/nextcloud/lib/private/AppFramework/Http/Dispatcher.php",
            "line":100,
            "function":"executeController",
            "class":"OC\\AppFramework\\Http\\Dispatcher",
            "type":"->"
         },
         {
            "file":"/var/www/html/nextcloud/lib/private/AppFramework/App.php",
            "line":152,
            "function":"dispatch",
            "class":"OC\\AppFramework\\Http\\Dispatcher",
            "type":"->"
         },
         {
            "file":"/var/www/html/nextcloud/lib/private/Route/Router.php",
            "line":308,
            "function":"main",
            "class":"OC\\AppFramework\\App",
            "type":"::"
         },
         {
            "file":"/var/www/html/nextcloud/lib/base.php",
            "line":1009,
            "function":"match",
            "class":"OC\\Route\\Router",
            "type":"->"
         },
         {
            "file":"/var/www/html/nextcloud/index.php",
            "line":37,
            "function":"handleRequest",
            "class":"OC",
            "type":"::"
         }
      ],
      "File":"/var/www/html/nextcloud/lib/private/Log/ErrorHandler.php",
      "Line":91,
      "CustomMessage":"--"
   },
   "userAgent":"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36",
   "version":"20.0.0.9"
}

Debugged it and it seems like $mount->getMountPoint() sometimes returns values with just two slashes (in my case it returned /robin/ which created the mentioned error).

So maybe this should be fixed first before backporting to NC19. Should i create a separate issue or is this on your radar now? :-)

@R0Wi R0Wi requested a review from skjnldsv October 10, 2020 14:38
@rullzer rullzer mentioned this pull request Nov 9, 2020
1 task
makes it more clear to the user what the quota applies to

Signed-off-by: Robin Appelman <[email protected]>
@icewind1991 icewind1991 force-pushed the backport/22913/stable19 branch from 7c2e09e to f70abf4 Compare November 12, 2020 13:39
rullzer and others added 2 commits November 12, 2020 14:43
Signed-off-by: Roeland Jago Douma <[email protected]>
@icewind1991
Copy link
Member

rebased and included #23193 and #23606

@faily-bot
Copy link

faily-bot bot commented Nov 12, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 35436: failure

mysql8.0-php7.2

Show full log
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Share20\DefaultShareProviderTest::testGetSharedWithGroupWithNode with data set #1 ('smb::whatever', 'files/test.txt', 'files/test2.txt')
Failed asserting that actual size 0 matches expected size 1.

/drone/src/tests/lib/Share20/DefaultShareProviderTest.php:1211

@rullzer rullzer merged commit 38b0606 into stable19 Nov 12, 2020
@rullzer rullzer deleted the backport/22913/stable19 branch November 12, 2020 14:22
@MorrisJobke
Copy link
Member

/backport to stable18

@backportbot-nextcloud
Copy link
Author

The backport to stable18 failed. Please do this backport manually.

@MorrisJobke
Copy link
Member

#24078

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants