[stable9.1] Faster classification migration #25638

Merged
merged 2 commits into from Aug 10, 2016

Projects

None yet

5 participants

@DeepDiver1975
Member
DeepDiver1975 commented Jul 28, 2016 edited

fixes #25617

@sbraz mind testing - thx

Test Scenario

  1. Run occ upgrade
  2. see the progress on processed calendar objects
deepdiver@alien:~/Development/ownCloud/master [faster-classification-migration]$ ./occ up
ownCloud or one of the apps require upgrade - only a limited number of commands are available
You may use your browser or the occ upgrade command to do the upgrade
Set log level to debug
Turned on maintenance mode
Checking whether the database schema can be updated (this can take a long time depending on the database size)
Checked database schema update
Checking updates of apps
Checking whether the database schema for <dav> can be updated (this can take a long time depending on the database size)
 Done                                                        
 7/7 [============================] 100%                     
Checked database schema update for apps
Updating database schema
Updated database
Updating <dav> ...
Fix classification for calendar objects
 Done                                                        
 6/6 [============================] 100%                     
Updated <dav> to 0.2.7
Drop old database tables
 Done                                                        
 28/28 [============================] 100%                   
Remove old (< 9.0) calendar/contact shares
 Done                                                        
 4/4 [============================] 100%                     
Fix permissions so avatars can be stored again
 Done                                                        
 2/2 [============================] 100%                     
Update successful
Turned off maintenance mode
Reset log level
@DeepDiver1975 DeepDiver1975 added this to the 9.1.1 milestone Jul 28, 2016
@mention-bot

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

@VicDeo VicDeo and 1 other commented on an outdated diff Aug 3, 2016
apps/dav/lib/Migration/Classification.php
/**
* Classification constructor.
*
* @param CalDavBackend $calDavBackend
*/
- public function __construct(CalDavBackend $calDavBackend, IUserManager $userManager) {
+ public function __construct(CalDavBackend $calDavBackend, IDBConnection $connection) {
@VicDeo
VicDeo Aug 3, 2016 Member

@DeepDiver1975 PHPdoc is missing for the second argument

@DeepDiver1975
DeepDiver1975 Aug 3, 2016 Member

Thx. Feel free to add. Thx

@DeepDiver1975 DeepDiver1975 self-assigned this Aug 3, 2016
DeepDiver1975 and others added some commits Jul 28, 2016
@DeepDiver1975 @VicDeo DeepDiver1975 [stable9.1] Faster classification migration a6ae19a
@VicDeo VicDeo Update PHPDoc
ba15003
@VicDeo
Member
VicDeo commented Aug 10, 2016

👍 Looks good

@DeepDiver1975 DeepDiver1975 merged commit 4b1b5ad into stable9.1 Aug 10, 2016

3 checks passed

Jenkins This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details
@DeepDiver1975 DeepDiver1975 deleted the stable9.1-e06693e8e72bdc4a540c6f2594c1ea0f87e8e2f4 branch Aug 10, 2016
@PVince81
Collaborator

@DeepDiver1975 @felixboehm backport to 9.0 ?

@PVince81
Collaborator
  • also need master/9.2 PR
@PVince81
Collaborator

@DeepDiver1975 ping for the ports

@DeepDiver1975
Member

@DeepDiver1975 ping for the ports

not needed - migration is only from 9.0 to 9.1

@butonic
Member
butonic commented Aug 31, 2016

@DeepDiver1975 @PVince81 actually the same happens when migrating from OC8.2x to OC9.0x

@PVince81
Collaborator

@DeepDiver1975 please backport

@butonic
Member
butonic commented Sep 21, 2016

@DeepDiver1975 this should help with upgrades, right? can you backport?

@DeepDiver1975
Member

This is only relevant for upgrades to 9.1

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