-
Notifications
You must be signed in to change notification settings - Fork 1.9k
IGNITE-26991 Disable distributed processes during rolling upgrade #12511
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
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
63b26be
IGNITE-26991 Disable DistributedProcess during rolling upgrade
chesnokoff 4436e4c
IGNITE-26991 Add test
chesnokoff 79512b1
IGNITE-26991 Fix compatibility test
chesnokoff 08241cc
IGNITE-26966 Fix
chesnokoff 7eb6f5b
IGNITE-26966 Small fixes
chesnokoff 368536b
IGNITE-26966 Update future
chesnokoff b22259e
IGNITE-26966 Update future
chesnokoff 7eba6f0
IGNITE-26966 Update future
chesnokoff 6f2c440
IGNITE-26966 Update future
chesnokoff 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
39 changes: 39 additions & 0 deletions
39
...rg/apache/ignite/compatibility/testframework/plugins/DisabledRollingUpgradeProcessor.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,39 @@ | ||
| /* | ||
| * 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 org.apache.ignite.compatibility.testframework.plugins; | ||
|
|
||
| import org.apache.ignite.cluster.ClusterNode; | ||
| import org.apache.ignite.internal.GridKernalContext; | ||
| import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor; | ||
| import org.apache.ignite.spi.IgniteNodeValidationResult; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| /** Disabled rolling upgrade processor. */ | ||
| public class DisabledRollingUpgradeProcessor extends RollingUpgradeProcessor { | ||
| /** | ||
| * @param ctx Kernal context. | ||
| */ | ||
| public DisabledRollingUpgradeProcessor(GridKernalContext ctx) { | ||
| super(ctx); | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) { | ||
| return null; | ||
| } | ||
| } |
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
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
75 changes: 75 additions & 0 deletions
75
...nite/internal/processors/cache/persistence/snapshot/IgniteSnapshotRollingUpgradeTest.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,75 @@ | ||
| /* | ||
| * 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 org.apache.ignite.internal.processors.cache.persistence.snapshot; | ||
|
|
||
| import org.apache.ignite.IgniteException; | ||
| import org.apache.ignite.cluster.ClusterState; | ||
| import org.apache.ignite.configuration.DataRegionConfiguration; | ||
| import org.apache.ignite.configuration.DataStorageConfiguration; | ||
| import org.apache.ignite.configuration.IgniteConfiguration; | ||
| import org.apache.ignite.internal.IgniteEx; | ||
| import org.apache.ignite.lang.IgniteProductVersion; | ||
| import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.apache.ignite.testframework.GridTestUtils.assertThrowsWithCause; | ||
|
|
||
| /** */ | ||
| public class IgniteSnapshotRollingUpgradeTest extends GridCommonAbstractTest { | ||
| /** {@inheritDoc} */ | ||
| @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { | ||
| IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); | ||
|
|
||
| cfg.setDataStorageConfiguration(new DataStorageConfiguration() | ||
| .setDefaultDataRegionConfiguration(new DataRegionConfiguration().setPersistenceEnabled(true))); | ||
|
|
||
| return cfg; | ||
| } | ||
|
|
||
| /** {@inheritDoc} */ | ||
| @Override protected void afterTest() throws Exception { | ||
| stopAllGrids(); | ||
|
|
||
| cleanPersistenceDir(); | ||
| } | ||
|
|
||
| /** Tests that snapshot creation fails when rolling upgrade is enabled. */ | ||
| @Test | ||
| public void testSnapshotCreationFailsDuringRollingUpgrade() throws Exception { | ||
| IgniteEx srv = startGrid(0); | ||
|
|
||
| srv.cluster().state(ClusterState.ACTIVE); | ||
|
|
||
| IgniteProductVersion curVer = srv.context().discovery().localNode().version(); | ||
|
|
||
| IgniteProductVersion targetVer = IgniteProductVersion.fromString(curVer.major() | ||
| + "." + curVer.minor() | ||
| + "." + curVer.maintenance() + 1); | ||
|
|
||
| srv.context().rollingUpgrade().enable(targetVer, false); | ||
|
|
||
| assertTrue(srv.context().rollingUpgrade().enabled()); | ||
|
|
||
| Throwable ex = assertThrowsWithCause( | ||
| () -> srv.snapshot().createSnapshot("test").get(getTestTimeout()), | ||
| IgniteException.class | ||
| ); | ||
|
|
||
| assertTrue(ex.getMessage().contains("Failed to start distributed process START_SNAPSHOT: rolling upgrade is enabled")); | ||
| } | ||
| } |
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
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.
Uh oh!
There was an error while loading. Please reload this page.