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

Auto enable market app on update and improve app update logging #27930

Merged
merged 4 commits into from May 18, 2017

Conversation

Projects
None yet
2 participants
@tomneedham
Member

tomneedham commented May 18, 2017

Description

  • Enables the market app when upgrading to use it for updating apps and finding apps that are unbundled to the marketplace now but are still in use.

Related Issue

  • Upgrading to 10.0.1 from 9.x

Motivation and Context

Otherwise we get this:
screen shot 2017-05-18 at 10 28 04
which is actually caused by the market app not being enabled

How Has This Been Tested?

  • tests with 9.1.4 updating to 10.0.x with user_ldap installed and enabled

Screenshots (if appropriate):

current output with additional messages:
screen shot 2017-05-18 at 12 09 33

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

TODO

  • testing & thinking

@tomneedham tomneedham added this to the 10.0.1 milestone May 18, 2017

@tomneedham tomneedham self-assigned this May 18, 2017

@tomneedham tomneedham requested review from PVince81, VicDeo and DeepDiver1975 May 18, 2017

Show outdated Hide outdated lib/private/Repair/Apps.php
if ($isMarketEnabled && $isCoreUpdate) {
$this->loadApp('market');
try {
if($isCoreUpdate) {

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

also need to check if we're updating from OC < 10.0. We don't want to re-re-re-re-re-enable the app for every minor 10.0 series update if an admin decided to disable it (ex: offline instance)

@PVince81

PVince81 May 18, 2017

Member

also need to check if we're updating from OC < 10.0. We don't want to re-re-re-re-re-enable the app for every minor 10.0 series update if an admin decided to disable it (ex: offline instance)

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

in this case you still need $isMarketEnabled for the OC >= 10.0 case

@PVince81

PVince81 May 18, 2017

Member

in this case you still need $isMarketEnabled for the OC >= 10.0 case

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

Not directly related to this PR but let's fix this as well: now when applying this the update moves forward and the market app tries to download the app using OC core's HTTP Client, which itself calls the certificate manager which uses a View which seems to try to use the oc_accounts table:

Repair warning: An exception occurred while executing 'SELECT * FROM `oc_accounts` WHERE `lower_user_id` = :dcValue1' with params ["files_external"]:

will try and post the full stack once I have it

Member

PVince81 commented May 18, 2017

Not directly related to this PR but let's fix this as well: now when applying this the update moves forward and the market app tries to download the app using OC core's HTTP Client, which itself calls the certificate manager which uses a View which seems to try to use the oc_accounts table:

Repair warning: An exception occurred while executing 'SELECT * FROM `oc_accounts` WHERE `lower_user_id` = :dcValue1' with params ["files_external"]:

will try and post the full stack once I have it

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

so far I'm here:

0  OC\Security\CertificateManager->createCertificateBundle() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:107
1  OC\Security\CertificateManager->getAbsoluteBundlePath() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:207
2  OC\Http\Client\Client->setDefaultOptions() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:73
3  OC\Http\Client\Client->get() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:135
4  OCA\Market\MarketService->httpGet() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:378
5  OCA\Market\MarketService->queryData() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:411
6  OCA\Market\MarketService->getApps() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:356
7  OCA\Market\MarketService->getAppInfo() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:190
8  OCA\Market\MarketService->downloadPackage() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:117
9  OCA\Market\MarketService->installApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:87
10 OCA\Market\Listener->reinstallAppStoreApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Listener.php:45
11 OCA\Market\Application->OCA\Market\{closure}() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Application.php:54
12 call_user_func:{/srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174}() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
13 Symfony\Component\EventDispatcher\EventDispatcher->doDispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
14 Symfony\Component\EventDispatcher\EventDispatcher->dispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:43
15 OC\Repair\Apps->getAppsFromMarket() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:180
16 OC\Repair\Apps->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:125
17 OC\Repair->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair.php:88
18 OC\Updater->doUpgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:212
19 OC\Updater->upgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:108
20 OC\Core\Command\Upgrade->execute() /srv/www/htdocs/owncloud-enterprise/core/Command/Upgrade.php:249
21 Symfony\Component\Console\Command\Command->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Command/Command.php:262
22 Symfony\Component\Console\Application->doRunCommand() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:826
23 Symfony\Component\Console\Application->doRun() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:189
24 Symfony\Component\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:120
25 OC\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Console/Application.php:160
26 require_once()  /srv/www/htdocs/owncloud-enterprise/console.php:99
27 {main}          /srv/www/htdocs/owncloud-enterprise/occ:11

after that it goes to View::fopen() on the folder "data/files_external" which would usually contain certificates for external storage connections. And inside that it fails.
It's probably not useful to go deeper.

We need to add a check "needs upgrade" or something in the cert manager and prevent this logic to kick in.

Member

PVince81 commented May 18, 2017

so far I'm here:

0  OC\Security\CertificateManager->createCertificateBundle() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:107
1  OC\Security\CertificateManager->getAbsoluteBundlePath() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:207
2  OC\Http\Client\Client->setDefaultOptions() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:73
3  OC\Http\Client\Client->get() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:135
4  OCA\Market\MarketService->httpGet() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:378
5  OCA\Market\MarketService->queryData() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:411
6  OCA\Market\MarketService->getApps() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:356
7  OCA\Market\MarketService->getAppInfo() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:190
8  OCA\Market\MarketService->downloadPackage() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:117
9  OCA\Market\MarketService->installApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:87
10 OCA\Market\Listener->reinstallAppStoreApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Listener.php:45
11 OCA\Market\Application->OCA\Market\{closure}() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Application.php:54
12 call_user_func:{/srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174}() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
13 Symfony\Component\EventDispatcher\EventDispatcher->doDispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
14 Symfony\Component\EventDispatcher\EventDispatcher->dispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:43
15 OC\Repair\Apps->getAppsFromMarket() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:180
16 OC\Repair\Apps->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:125
17 OC\Repair->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair.php:88
18 OC\Updater->doUpgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:212
19 OC\Updater->upgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:108
20 OC\Core\Command\Upgrade->execute() /srv/www/htdocs/owncloud-enterprise/core/Command/Upgrade.php:249
21 Symfony\Component\Console\Command\Command->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Command/Command.php:262
22 Symfony\Component\Console\Application->doRunCommand() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:826
23 Symfony\Component\Console\Application->doRun() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:189
24 Symfony\Component\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:120
25 OC\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Console/Application.php:160
26 require_once()  /srv/www/htdocs/owncloud-enterprise/console.php:99
27 {main}          /srv/www/htdocs/owncloud-enterprise/occ:11

after that it goes to View::fopen() on the folder "data/files_external" which would usually contain certificates for external storage connections. And inside that it fails.
It's probably not useful to go deeper.

We need to add a check "needs upgrade" or something in the cert manager and prevent this logic to kick in.

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

ok, got it... encryption manager trying to do stuff while accessing this folder, finding out whether the folder must be excluded:

0  OC\User\Manager->get() /srv/www/htdocs/owncloud-enterprise/lib/private/User/Manager.php:148
1  OC\User\Manager->userExists() /srv/www/htdocs/owncloud-enterprise/lib/private/User/Manager.php:188
2  OC\Encryption\Util->isExcluded() /srv/www/htdocs/owncloud-enterprise/lib/private/Encryption/Util.php:365
3  OC\Files\Storage\Wrapper\Encryption->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/Storage/Wrapper/Encryption.php:383
4  OC\Files\Storage\Wrapper\Checksum->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/Storage/Wrapper/Checksum.php:59
5  OC\Files\View->basicOperation() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/View.php:1121
6  OC\Files\View->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/View.php:966
7  OC\Security\CertificateManager->createCertificateBundle() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:107
8  OC\Security\CertificateManager->getAbsoluteBundlePath() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:207
9  OC\Http\Client\Client->setDefaultOptions() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:73
10 OC\Http\Client\Client->get() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:135
11 OCA\Market\MarketService->httpGet() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:378
12 OCA\Market\MarketService->queryData() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:411
13 OCA\Market\MarketService->getApps() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:356
14 OCA\Market\MarketService->getAppInfo() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:190
15 OCA\Market\MarketService->downloadPackage() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:117
16 OCA\Market\MarketService->installApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:87
17 OCA\Market\Listener->reinstallAppStoreApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Listener.php:45
18 OCA\Market\Application->OCA\Market\{closure}() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Application.php:54
19 call_user_func:{/srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174}() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
20 Symfony\Component\EventDispatcher\EventDispatcher->doDispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
21 Symfony\Component\EventDispatcher\EventDispatcher->dispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:43
22 OC\Repair\Apps->getAppsFromMarket() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:180
23 OC\Repair\Apps->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:125
24 OC\Repair->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair.php:88
25 OC\Updater->doUpgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:212
26 OC\Updater->upgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:108
27 OC\Core\Command\Upgrade->execute() /srv/www/htdocs/owncloud-enterprise/core/Command/Upgrade.php:249
28 Symfony\Component\Console\Command\Command->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Command/Command.php:262
29 Symfony\Component\Console\Application->doRunCommand() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:826
30 Symfony\Component\Console\Application->doRun() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:189
31 Symfony\Component\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:120
32 OC\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Console/Application.php:160
33 require_once()  /srv/www/htdocs/owncloud-enterprise/console.php:99
34 {main}          /srv/www/htdocs/owncloud-enterprise/occ:11

let's see if we can mitigate this...

Member

PVince81 commented May 18, 2017

ok, got it... encryption manager trying to do stuff while accessing this folder, finding out whether the folder must be excluded:

0  OC\User\Manager->get() /srv/www/htdocs/owncloud-enterprise/lib/private/User/Manager.php:148
1  OC\User\Manager->userExists() /srv/www/htdocs/owncloud-enterprise/lib/private/User/Manager.php:188
2  OC\Encryption\Util->isExcluded() /srv/www/htdocs/owncloud-enterprise/lib/private/Encryption/Util.php:365
3  OC\Files\Storage\Wrapper\Encryption->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/Storage/Wrapper/Encryption.php:383
4  OC\Files\Storage\Wrapper\Checksum->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/Storage/Wrapper/Checksum.php:59
5  OC\Files\View->basicOperation() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/View.php:1121
6  OC\Files\View->fopen() /srv/www/htdocs/owncloud-enterprise/lib/private/Files/View.php:966
7  OC\Security\CertificateManager->createCertificateBundle() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:107
8  OC\Security\CertificateManager->getAbsoluteBundlePath() /srv/www/htdocs/owncloud-enterprise/lib/private/Security/CertificateManager.php:207
9  OC\Http\Client\Client->setDefaultOptions() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:73
10 OC\Http\Client\Client->get() /srv/www/htdocs/owncloud-enterprise/lib/private/Http/Client/Client.php:135
11 OCA\Market\MarketService->httpGet() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:378
12 OCA\Market\MarketService->queryData() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:411
13 OCA\Market\MarketService->getApps() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:356
14 OCA\Market\MarketService->getAppInfo() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:190
15 OCA\Market\MarketService->downloadPackage() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:117
16 OCA\Market\MarketService->installApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/MarketService.php:87
17 OCA\Market\Listener->reinstallAppStoreApp() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Listener.php:45
18 OCA\Market\Application->OCA\Market\{closure}() /srv/www/htdocs/owncloud-enterprise/apps/market/lib/Application.php:54
19 call_user_func:{/srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174}() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
20 Symfony\Component\EventDispatcher\EventDispatcher->doDispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:174
21 Symfony\Component\EventDispatcher\EventDispatcher->dispatch() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/event-dispatcher/EventDispatcher.php:43
22 OC\Repair\Apps->getAppsFromMarket() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:180
23 OC\Repair\Apps->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair/Apps.php:125
24 OC\Repair->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Repair.php:88
25 OC\Updater->doUpgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:212
26 OC\Updater->upgrade() /srv/www/htdocs/owncloud-enterprise/lib/private/Updater.php:108
27 OC\Core\Command\Upgrade->execute() /srv/www/htdocs/owncloud-enterprise/core/Command/Upgrade.php:249
28 Symfony\Component\Console\Command\Command->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Command/Command.php:262
29 Symfony\Component\Console\Application->doRunCommand() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:826
30 Symfony\Component\Console\Application->doRun() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:189
31 Symfony\Component\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/composer/symfony/console/Application.php:120
32 OC\Console\Application->run() /srv/www/htdocs/owncloud-enterprise/lib/private/Console/Application.php:160
33 require_once()  /srv/www/htdocs/owncloud-enterprise/console.php:99
34 {main}          /srv/www/htdocs/owncloud-enterprise/occ:11

let's see if we can mitigate this...

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

Fixed here, excluding "files_external": 9266fef

Member

PVince81 commented May 18, 2017

Fixed here, excluding "files_external": 9266fef

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member
  • TODO: don't auto-enable market if upgrading from OC < 10.0. if market is disabled in this case, keep it disabled and fail only if apps DO require an upgrade through market
Member

PVince81 commented May 18, 2017

  • TODO: don't auto-enable market if upgrading from OC < 10.0. if market is disabled in this case, keep it disabled and fail only if apps DO require an upgrade through market
@tomneedham

This comment has been minimized.

Show comment
Hide comment
@tomneedham

tomneedham May 18, 2017

Member
  • user_ldap is both compatible & missing and is requested twice from the marketplace

Edit: fix is here: owncloud/market#76

Member

tomneedham commented May 18, 2017

  • user_ldap is both compatible & missing and is requested twice from the marketplace

Edit: fix is here: owncloud/market#76

@PVince81 PVince81 changed the title from [WIP] Auto enable market app on update and improve app update logging to Auto enable market app on update and improve app update logging May 18, 2017

Show outdated Hide outdated lib/private/Repair/Apps.php
'upgradeAppStoreApp'
);
// Try to update incompatible apps
if($appsToUpgrade[self::KEY_INCOMPATIBLE]) {

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

should that be isset() ? is this test really required ?

@PVince81

PVince81 May 18, 2017

Member

should that be isset() ? is this test really required ?

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

isset() and !empty() ?

@PVince81

PVince81 May 18, 2017

Member

isset() and !empty() ?

Show outdated Hide outdated tests/lib/Repair/AppsTest.php
*
* @see \OC\Repair\AvatarPermissionsTest
*/
class AvatarPermissionsTest extends \Test\TestCase {

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

Avatars?

@PVince81

PVince81 May 18, 2017

Member

Avatars?

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

@tomneedham see my comments. Some minor things and avatars

Member

PVince81 commented May 18, 2017

@tomneedham see my comments. Some minor things and avatars

Show outdated Hide outdated tests/lib/Repair/AppsTest.php
*
* @group DB
*
* @see \OC\Repair\AvatarPermissionsTest

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

the avatar is still there, and so is the author...

@PVince81

PVince81 May 18, 2017

Member

the avatar is still there, and so is the author...

This comment has been minimized.

@tomneedham

tomneedham May 18, 2017

Member

🙈

@tomneedham
Show outdated Hide outdated tests/lib/Repair/AppsTest.php
/**
* @author Roeland Jago Douma <rullzer@owncloud.com>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.

This comment has been minimized.

@PVince81

PVince81 May 18, 2017

Member

what year is this ?

@PVince81

PVince81 May 18, 2017

Member

what year is this ?

@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

👍

Member

PVince81 commented May 18, 2017

👍

@tomneedham

This comment has been minimized.

Show comment
Hide comment
@tomneedham

tomneedham May 18, 2017

Member

Seems something went weird with docker in jenkins:

16:55:49 Waiting for MySQL(utf8mb4) initialisation ...
17:05:50 ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
17:05:50 [ERROR] Waited 600 seconds, no response
17:05:50 Kill the docker adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 Makefile:179: recipe for target 'test-php' failed
17:05:50 make: *** [test-php] Error 1
[Pipeline] }
[Pipeline] // timeout
[Pipeline] echo
17:05:50 Test execution failed: hudson.AbortException: script returned exit code 2
[Pipeline] step
17:05:50 Recording test results```
Member

tomneedham commented May 18, 2017

Seems something went weird with docker in jenkins:

16:55:49 Waiting for MySQL(utf8mb4) initialisation ...
17:05:50 ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
17:05:50 [ERROR] Waited 600 seconds, no response
17:05:50 Kill the docker adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 adab554079d8ef09d2081be106de042dce91b7e6e06734078fa2513676902a47
17:05:50 Makefile:179: recipe for target 'test-php' failed
17:05:50 make: *** [test-php] Error 1
[Pipeline] }
[Pipeline] // timeout
[Pipeline] echo
17:05:50 Test execution failed: hudson.AbortException: script returned exit code 2
[Pipeline] step
17:05:50 Recording test results```
@PVince81

This comment has been minimized.

Show comment
Hide comment
@PVince81

PVince81 May 18, 2017

Member

Seems something went weird with docker in jenkins:

probably only the 34598th time it's happening, just rebase to retry... and bring a bag of luck!

Member

PVince81 commented May 18, 2017

Seems something went weird with docker in jenkins:

probably only the 34598th time it's happening, just rebase to retry... and bring a bag of luck!

tomneedham and others added some commits May 18, 2017

Exclude files_external from encryption wrapper
Prevents calling user manager when opening certifications from
certificate manager when using the core http client when attempting to
download a market app during an upgrade from 9.0 where oc_accounts is
not available yet.
@tomneedham

This comment has been minimized.

Show comment
Hide comment
@tomneedham

tomneedham May 18, 2017

Member

rebased

Member

tomneedham commented May 18, 2017

rebased

@tomneedham

This comment has been minimized.

Show comment
Hide comment
@tomneedham

tomneedham May 18, 2017

Member

🙏 for jenkins

Member

tomneedham commented May 18, 2017

🙏 for jenkins

@PVince81 PVince81 merged commit 800318d into master May 18, 2017

4 checks passed

Scrutinizer 3 new issues, 2 updated code elements
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@PVince81 PVince81 deleted the enable-market-on-upgrade branch May 18, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment