-
Notifications
You must be signed in to change notification settings - Fork 1.2k
check for active MSses before starting DB upgrade #12140
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
Draft
DaanHoogland
wants to merge
9
commits into
apache:4.20
Choose a base branch
from
shapeblue:ghi11973-DbUpgradeOnlyStandalone
base: 4.20
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
edcbbde
check for active MSses before starting DB upgrade
48af60a
fix sql
DaanHoogland 46a6f7a
none may be up!
DaanHoogland 2135e1e
Apply suggestions from code review
DaanHoogland 42414f4
make condition not fatal
6d9a6c5
change moment of abort
0315005
more hard exit
335f144
some unit tests
e79dacb
imports
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
173 changes: 173 additions & 0 deletions
173
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerDoUpgradesTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
| package com.cloud.upgrade; | ||
|
|
||
| import static org.junit.Assert.assertFalse; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| import com.cloud.upgrade.dao.VersionDao; | ||
| import com.cloud.upgrade.dao.VersionDaoImpl; | ||
| import com.cloud.upgrade.dao.VersionVO; | ||
| import com.cloud.utils.db.GlobalLock; | ||
| import org.junit.Test; | ||
|
|
||
| public class DatabaseUpgradeCheckerDoUpgradesTest { | ||
|
|
||
| static class StubVersionDao extends VersionDaoImpl implements VersionDao { | ||
| private final String currentVersion; | ||
|
|
||
| StubVersionDao(String currentVersion) { | ||
| this.currentVersion = currentVersion; | ||
| } | ||
|
|
||
| @Override | ||
| public VersionVO findByVersion(String version, VersionVO.Step step) { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public String getCurrentVersion() { | ||
| return currentVersion; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private static class TestableChecker extends DatabaseUpgradeChecker { | ||
| boolean initializeCalled = false; | ||
| boolean upgradeCalled = false; | ||
| boolean clusterHandlerCalled = false; | ||
| String implVersionOverride = null; | ||
| String sysVmMetadataOverride = "4.8.0"; | ||
| boolean standaloneOverride = true; | ||
|
|
||
| TestableChecker(String daoVersion) { | ||
| // set a stub DAO | ||
| this._dao = new StubVersionDao(daoVersion); | ||
| } | ||
|
|
||
| @Override | ||
| protected void initializeDatabaseEncryptors() { | ||
| initializeCalled = true; | ||
| // noop instead of doing DB work | ||
| } | ||
|
|
||
| @Override | ||
| protected String getImplementationVersion() { | ||
| return implVersionOverride; | ||
| } | ||
|
|
||
| @Override | ||
| protected String parseSystemVmMetadata() { | ||
| return sysVmMetadataOverride; | ||
| } | ||
|
|
||
| @Override | ||
| boolean isStandalone() { | ||
| return standaloneOverride; | ||
| } | ||
|
|
||
| @Override | ||
| protected void upgrade(org.apache.cloudstack.utils.CloudStackVersion dbVersion, org.apache.cloudstack.utils.CloudStackVersion currentVersion) { | ||
| upgradeCalled = true; | ||
| } | ||
|
|
||
| @Override | ||
| protected void handleClusteredUpgradeRequired() { | ||
| clusterHandlerCalled = true; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoUpgrades_noImplementationVersion_returnsEarly() { | ||
| TestableChecker checker = new TestableChecker("4.8.0"); | ||
| checker.implVersionOverride = ""; // blank -> should return early | ||
|
|
||
| GlobalLock lock = GlobalLock.getInternLock("test-noimpl"); | ||
| try { | ||
| // acquire lock so doUpgrades can safely call unlock in finally | ||
| lock.lock(1); | ||
| checker.doUpgrades(lock); | ||
| } finally { | ||
| // ensure lock released if still held | ||
| lock.releaseRef(); | ||
| } | ||
|
|
||
| assertTrue("initializeDatabaseEncryptors should be called before returning", checker.initializeCalled); | ||
| assertFalse("upgrade should not be called when implementation version is blank", checker.upgradeCalled); | ||
| assertFalse("cluster handler should not be called", checker.clusterHandlerCalled); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoUpgrades_dbUpToDate_noUpgrade() { | ||
| // DB version = code version -> no upgrade | ||
| TestableChecker checker = new TestableChecker("4.8.1"); | ||
| checker.implVersionOverride = "4.8.1"; | ||
| checker.sysVmMetadataOverride = "4.8.1"; | ||
|
|
||
| GlobalLock lock = GlobalLock.getInternLock("test-uptodate"); | ||
| try { | ||
| lock.lock(1); | ||
| checker.doUpgrades(lock); | ||
| } finally { | ||
| lock.releaseRef(); | ||
| } | ||
|
|
||
| assertTrue(checker.initializeCalled); | ||
| assertFalse(checker.upgradeCalled); | ||
| assertFalse(checker.clusterHandlerCalled); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoUpgrades_requiresUpgrade_standalone_invokesUpgrade() { | ||
| TestableChecker checker = new TestableChecker("4.8.0"); | ||
| checker.implVersionOverride = "4.8.2"; // code is newer than DB | ||
| checker.sysVmMetadataOverride = "4.8.2"; | ||
| checker.standaloneOverride = true; | ||
|
|
||
| GlobalLock lock = GlobalLock.getInternLock("test-upgrade-standalone"); | ||
| try { | ||
| lock.lock(1); | ||
| checker.doUpgrades(lock); | ||
| } finally { | ||
| lock.releaseRef(); | ||
| } | ||
|
|
||
| assertTrue(checker.initializeCalled); | ||
| assertTrue("upgrade should be invoked in standalone mode", checker.upgradeCalled); | ||
| assertFalse(checker.clusterHandlerCalled); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDoUpgrades_requiresUpgrade_clustered_invokesHandler() { | ||
| TestableChecker checker = new TestableChecker("4.8.0"); | ||
| checker.implVersionOverride = "4.8.2"; // code is newer than DB | ||
| checker.sysVmMetadataOverride = "4.8.2"; | ||
| checker.standaloneOverride = false; | ||
|
|
||
| GlobalLock lock = GlobalLock.getInternLock("test-upgrade-clustered"); | ||
| try { | ||
| lock.lock(1); | ||
| checker.doUpgrades(lock); | ||
| } finally { | ||
| lock.releaseRef(); | ||
| } | ||
|
|
||
| assertTrue(checker.initializeCalled); | ||
| assertFalse("upgrade should not be invoked in clustered mode", checker.upgradeCalled); | ||
| assertTrue("cluster handler should be invoked in clustered mode", checker.clusterHandlerCalled); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic here has a subtle issue. The query counts management servers with
state = 'UP', and returnstrue(standalone) when count is 0. However, this check is being performed by a management server that is currently running.This means:
mshosttable as 'UP', the count would be at least 1, and it would never be considered standalone.The check should likely exclude the current management server from the count, or check for count <= 1 instead of count == 0, to properly detect if this is the only running MS.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
one valid issue is that an MS performing an upgrade is not yet registered as UP. so this fix is better than what we have but certainly not watertight yet.