Fix migration issue caused during upgrade to version 10 #15
Conversation
|
This patch addresses the issue : owncloud/core#28985 The test matrix is as follows:
|
sharidas
force-pushed
the
fix-migration-issue
branch
3 times, most recently
from
ae2ce20
to
ef232cb
Compare
| $installedVersion = \OC::$server->getConfig()->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if ($installedVersion !== '0.0.0') { | ||
| $maxVersion = explode('.', $installedVersion)[0]; |
There was a problem hiding this comment.
there's a more PHP-y way to do this, see https://github.com/owncloud/core/blob/master/lib/private/Repair/Apps.php#L99
sharidas
force-pushed
the
fix-migration-issue
branch
from
ef232cb
to
e6dedc5
Compare
| public function run(IOutput $out) { | ||
| $installedVersion = \OC::$server->getConfig()->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if (version_compare('10.0.0', $installedVersion) === 1) { |
There was a problem hiding this comment.
This looks better.
|
@sharidas when updating from 10.0.2 the logic should also operate, since 10.0.2 currently still shows the dropdown. When I upgrade from 10.0.2 with working encryption but dropdown shown to 10.0.3, then dropdown should disappear. It should be possible by running the same logic. |
sharidas
force-pushed
the
fix-migration-issue
branch
from
e6dedc5
to
3d1e7e8
Compare
| public function run(IOutput $out) { | ||
| $installedVersion = \OC::$server->getConfig()->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if (version_compare('10.0.0', $installedVersion) !== 0) { |
There was a problem hiding this comment.
Verified with the change by upgrading from 10.0.2 to 10.0.3. In both the user specific key or master key when enabled the later version doesn't show the dropdown list now.
There was a problem hiding this comment.
what you wrote here is basically $version !== '10.0.0' not $version <= 10.0.3
The reason it works is probably because the check in your "if" block would likely work correctly even without a version check. I'd rather have either the correct logic with version check, or no version check at all.
Furthermore if someone upgrades from 10.0.0 the logic below will not run at all.
Please recheck the documentation of version_compare
sharidas
force-pushed
the
fix-migration-issue
branch
from
3d1e7e8
to
97c7e5f
Compare
This change will help users to fix the migration issue caused during upgrade to version 10. If user had opted user specific key in the older versions then no drop down will appear in the version 10. Same applies if user had opted for the masterkey in older version, no drop down will appear in version 10. Signed-off-by: Sujith H <sharidasan@owncloud.com>
sharidas
force-pushed
the
fix-migration-issue
branch
from
97c7e5f
to
bbab855
Compare
| public function run(IOutput $out) { | ||
| $installedVersion = \OC::$server->getConfig()->getSystemValue('version', '0.0.0'); | ||
|
|
||
| if (version_compare('10.0.3', $installedVersion, '>=') === true) { |
There was a problem hiding this comment.
Now this is the only modification I made. This is equivalent to 10.0.3 >= $installeddVersion.
Since we are heading towards 10.0.3, this should be good enough. The UI changed from 10.0.2.
So till version < 10.0.2, the upgrade should work as it did. Or lets say if userSpecificKey is added to appconfig for versions less than 10.0.2, then, nothing would prohibit the code flow.
Now once the upgrade reaches 10.0.2 which is still less than 10.0.3, goes inside the if condition. And then tries to check if the condition is met with the inner if condition ( the one with lots of &&). And adds the userSpecificKey if the condition is true and UI will not have dropdown list.
Lets say if version >= 10.0.2, then the inner if condition may/may not be hit. Because if the encryption is enabled then either of the types would be selected. If not then again falls back to userSpecificKey. This logic applies till, including version 10.0.3.
Though technically the version check is redundant imho. Because unless explicitly selected for masterkey or enabled masterkey via command line => its userSpecificKey. Which sticks with the inner if condition.
|
@sharidas please backport to stable10 for 10.0.4 |
|
Backport : owncloud/core#29049 |
This change will help users to fix the migration
issue caused during upgrade to version 10. If
user had opted user specific key in the older versions
then no drop down will appear in the version 10.
Same applies if user had opted for the masterkey
in older version, no drop down will appear in version
10.
Signed-off-by: Sujith H sharidasan@owncloud.com