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

Do not exit if available space cannot be determined on file transfer #21775

Merged
merged 2 commits into from
Aug 11, 2020

Conversation

juliusknorr
Copy link
Member

Otherwise transfering files on primary object storage fails as the free space cannot be determined. I'm not fully sure if there are other cases where a -2 might happen for the free_space call and where we should then block file transfer but I think it makes sense to just allow it in such cases.

@MorrisJobke
Copy link
Member

For the record: -2 is "space unknown":

public const SPACE_UNKNOWN = -2;

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine with me

@MorrisJobke MorrisJobke added this to the Nextcloud 20 milestone Jul 9, 2020
@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 10, 2020
juliusknorr and others added 2 commits August 11, 2020 08:14
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@juliusknorr juliusknorr force-pushed the bugfix/noid/transfer-object-storage branch from 82c25d6 to 4e297d7 Compare August 11, 2020 06:14
@faily-bot
Copy link

faily-bot bot commented Aug 11, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31585: failure

acceptance-app-files

  • tests/acceptance/features/app-files.feature:262
Show full log
  Scenario: unmarking a file as favorite causes the file list to be sorted again                          # /drone/src/tests/acceptance/features/app-files.feature:262
    Given I am logged in                                                                                  # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "A name alphabetically lower than welcome.txt"                        # FileListContext::iCreateANewFolderNamed()
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    And I close the details view                                                                          # FilesAppContext::iCloseTheDetailsView()
    And I see that the details view is closed                                                             # FilesAppContext::iSeeThatTheDetailsViewIsClosed()
    And I mark "welcome.txt" as favorite                                                                  # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                    # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I see that "welcome.txt" precedes "A name alphabetically lower than welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()
    When I unmark "welcome.txt" as favorite                                                               # FileListContext::iUnmarkAsFavorite()
    Then I see that "welcome.txt" is not marked as favorite                                               # FileListContext::iSeeThatIsNotMarkedAsFavorite()
      Not favorited state icon for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that "A name alphabetically lower than welcome.txt" precedes "welcome.txt" in the file list # FileListContext::iSeeThatPrecedesInTheFileList()

@MorrisJobke MorrisJobke merged commit 5d3ecfd into master Aug 11, 2020
@MorrisJobke MorrisJobke deleted the bugfix/noid/transfer-object-storage branch August 11, 2020 09:08
@MorrisJobke
Copy link
Member

/backport to stable19

@MorrisJobke
Copy link
Member

/backport to stable18

@MorrisJobke
Copy link
Member

/backport to stable17

@backportbot-nextcloud
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants