Handle "storage not available" to show an error message #25037

Merged
merged 2 commits into from Jun 13, 2016

Projects

None yet

4 participants

@jvillafanez
Contributor

OC 9 and 9.1 don't use the modifed file, so this is the latest OC version in which this patch can work.

Fix https://github.com/owncloud/windows_network_drive/issues/376

For OC 9 and 9.1, it shows an error message "error deleting file", which is good enough (although the reason seems to be a bit different, but I guess it's ok)

@mention-bot

By analyzing the blame information on this pull request, we identified @PVince81, @LukasReschke and @DeepDiver1975 to be potential reviewers

@jvillafanez jvillafanez added this to the 8.2.6-current-maintenance milestone Jun 8, 2016
@guruz
Contributor
guruz commented Jun 9, 2016

๐Ÿ‘

@PVince81
Collaborator
PVince81 commented Jun 9, 2016

๐Ÿ‘ makes sense

@PVince81
Collaborator
PVince81 commented Jun 9, 2016
14:35:20     [apply] Parse error: syntax error, unexpected 'OCP' (T_STRING), expecting variable (T_VARIABLE) or '$' in /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux@4/database/sqlite/label/SLAVE/apps/files/ajax/delete.php on line 76
@PVince81
Collaborator
PVince81 commented Jun 9, 2016

@jvillafanez something seems wrong with the tests

@jvillafanez
Contributor

Overlooked typo ๐Ÿ˜ฑ

@PVince81
Collaborator

@jvillafanez and untested ?

@jvillafanez
Contributor

It was tested and working, but I made the changes in another server and then copy the modifed lines to the local repo, and it seems I didn't clean up all the chars the editor added. My mistake.

@PVince81
Collaborator

Some very strange failures that can't be related:

1) Test\Connector\Sabre\File::testPutSingleFile
06:27:41 OCP\Files\NotFoundException: 
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/node.php:84
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/node.php:221
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/node.php:104
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/folder.php:139
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/root.php:346
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/server.php:620
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/testcase.php:248
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:32
06:27:41 
06:27:41 2) Test\Connector\Sabre\File::testPutOverwriteFileTriggersHooks
06:27:41 Sabre\DAV\Exception: fopen(/dev/shm/data-autotest1/user_twmJKkwhNcpUy/files/foo.txt.ocTransferId111689933.part): failed to open stream: No such file or directory
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:516
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:155
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:269
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:333
06:27:41 
06:27:41 Caused by
06:27:41 PHPUnit_Framework_Error_Warning: fopen(/dev/shm/data-autotest1/user_twmJKkwhNcpUy/files/foo.txt.ocTransferId111689933.part): failed to open stream: No such file or directory
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/storage/local.php:261
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:124
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:269
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:333
06:27:41 
06:27:41 3) Test\Connector\Sabre\File::testChunkedPutFailsFinalRename
06:27:41 Sabre\DAV\Exception: file_put_contents(/dev/shm/data-autotest1/user_1YtXQOFX7SmUV/cache/test.txt-chunking-12345-0.2XfC6ovyKEOKF8se.part): failed to open stream: No such file or directory
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:516
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:103
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:519
06:27:41 
06:27:41 Caused by
06:27:41 PHPUnit_Framework_Error_Warning: file_put_contents(/dev/shm/data-autotest1/user_1YtXQOFX7SmUV/cache/test.txt-chunking-12345-0.2XfC6ovyKEOKF8se.part): failed to open stream: No such file or directory
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/storage/local.php:197
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:1022
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:586
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/cache/file.php:110
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/filechunking.php:71
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:373
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/connector/sabre/file.php:101
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:519
06:27:41 
06:27:41 4) Test\Connector\Sabre\File::testDeleteWhenAllowed
06:27:41 opendir(/dev/shm/data-autotest1/user_3mcEmUt4EBkTq/): failed to open dir: No such file or directory
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/storage/local.php:99
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/scanner.php:302
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/scanner.php:337
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/scanner.php:269
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/updater.php:133
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:1039
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:251
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/folder.php:144
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/root.php:339
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/server.php:620
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/testcase.php:248
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:32
06:27:41 
06:27:41 5) Test\Connector\Sabre\File::testDeleteThrowsWhenDeletionFailed
06:27:41 filemtime(): stat failed for /dev/shm/data-autotest1/user_4Dfn2akst8NEB/files
06:27:41 
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/storage/local.php:159
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/updater.php:232
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/cache/updater.php:134
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:1039
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/view.php:467
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/folder.php:165
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/util.php:320
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/util.php:299
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/files/node/root.php:347
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/lib/private/server.php:620
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/testcase.php:248
06:27:41 /var/lib/jenkins/jenkins-slave/workspace/core-ci-linux/database/mysql/label/SLAVE/tests/lib/connector/sabre/file.php:32
06:27:41 
jvillafanez added some commits Jun 8, 2016
@jvillafanez @PVince81 jvillafanez Handle storage not available to show an error message 5a8278d
@jvillafanez @PVince81 jvillafanez Fix typo
8e640fa
@PVince81
Collaborator

Rebased, let's hope it was a temporary glitch

@PVince81 PVince81 merged commit f882f6b into stable8.2 Jun 13, 2016

22 checks passed

Scrutinizer 2 new issues
Details
cla-bot-core Build #4740 succeeded in 34 sec
Details
continuous-integration/php-5.4 Build #4798 succeeded in 21 min
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
core-ci-linux-jsunit/database=sqlite,label=SLAVE Build #62716 succeeded in 47 min
Details
core-ci-linux/database=mysql,label=SLAVE Build #31628 succeeded in 1 hr 16 min
Details
core-ci-linux/database=oci,label=SLAVE Build #31628 succeeded in 1 hr 34 min
Details
core-ci-linux/database=pgsql,label=SLAVE Build #31628 succeeded in 1 hr 15 min
Details
core-ci-linux/database=sqlite,label=SLAVE Build #31628 succeeded in 43 min
Details
ocs-api-integration-tests-ci Build #11510 succeeded in 1 min 43 sec
Details
server-master-linux-externals-ci/database=sqlite,external=smb-silvershell,label=SLAVE Build #11026 succeeded in 31 min
Details
server-master-linux-externals-ci/database=sqlite,external=swift-ceph,label=SLAVE Build #11026 succeeded in 42 min
Details
server-master-linux-externals-ci/database=sqlite,external=webdav-ownCloud,label=SLAVE Build #11026 succeeded in 36 min
Details
server-master-linux-externals-smb-windows-ext-ci/database=sqlite,external=smb-windows,label=master Build #22027 succeeded in 4 min 34 sec
Details
server-master-linux-php7-ci/database=sqlite,label=SLAVE Build #39921 succeeded in 24 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=litmus,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 8 min 16 sec
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@0,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 50 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_basicSync@1,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 21 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_shareLink,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 1 hr 4 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePermissions,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 45 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationGroups,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 15 min
Details
smashbox-on-docker-ci/DOCKER_IMAGE=ubuntu_oc_lamp-git,TEST_NAME=test_sharePropagationInsideGroups,mirallBranch=v2.0.2,slave=SMASH Build #15371 succeeded in 28 min
Details
@PVince81 PVince81 deleted the handle_delete_with_unavailable_storage branch Jun 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment