timoninmaxim commented on code in PR #12301: URL: https://github.com/apache/ignite/pull/12301#discussion_r2469816239
########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ Review Comment: @Nullable. {@code null} when rolling upgrade is disabled. ########## modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java: ########## @@ -362,6 +363,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable @GridToStringExclude private PerformanceStatisticsProcessor perfStatProc; + /** Rolling upgrade processor. */ + @GridToStringExclude + private RollingUpgradeProcessor rolUpProc; Review Comment: rollUpProc ########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ + private volatile IgnitePair<IgniteProductVersion> verPair = null; + + /** + * @param ctx Context. + */ + public RollingUpgradeProcessor(GridKernalContext ctx) { + super(ctx); + } + + /** {@inheritDoc} */ + @Override public void start() throws IgniteCheckedException { + ctx.internalSubscriptionProcessor().registerDistributedMetastorageListener(new DistributedMetastorageLifecycleListener() { + @Override public void onReadyForWrite(DistributedMetaStorage metastorage) { + RollingUpgradeProcessor.this.metastorage = metastorage; + } + + @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) { + try { + verPair = metastorage.read(ROLLING_UPGRADE_VERSIONS_KEY); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } + + // Keep the current and target version pair in sync with metastorage updates, e.g., to handle coordinator changes. + metastorage.listen(ROLLING_UPGRADE_VERSIONS_KEY::equals, (key, oldVal, newVal) -> { + verPair = (IgnitePair<IgniteProductVersion>)newVal; + }); + } + }); + } + + /** {@inheritDoc} The joining node is stored to verify later whether it successfully connected to the ring or failed to join. */ + @Override public @Nullable IgniteNodeValidationResult validateNode(ClusterNode node) { + synchronized (lock) { + lastJoiningNode = node; + + lastJoiningNodeTimestamp = U.currentTimeMillis(); + } + + ClusterNode locNode = ctx.discovery().localNode(); + + String locBuildVer = locNode.attribute(ATTR_BUILD_VER); + String rmtBuildVer = node.attribute(ATTR_BUILD_VER); + + IgniteProductVersion rmtVer = IgniteProductVersion.fromString(rmtBuildVer); + + IgnitePair<IgniteProductVersion> pair = verPair; + + if (pair == null) + pair = F.pair(IgniteProductVersion.fromString(locBuildVer), null); + + IgniteProductVersion curVer = pair.get1(); + IgniteProductVersion targetVer = pair.get2(); + + if (Objects.equals(rmtVer, curVer) || Objects.equals(rmtVer, targetVer)) + return null; + + String errMsg = "Remote node rejected due to incompatible version for cluster join.\n" + + "Remote node info:\n" + + " - Version : " + rmtBuildVer + "\n" + + " - Addresses : " + U.addressesAsString(node) + "\n" + + " - Node ID : " + node.id() + "\n" + + "Local node info:\n" + + " - Version : " + locBuildVer + "\n" + + " - Addresses : " + U.addressesAsString(locNode) + "\n" + + " - Node ID : " + locNode.id() + "\n" + + "Allowed versions for joining: " + curVer + (targetVer == null ? "" : ", " + targetVer); + + LT.warn(log, errMsg); + + if (log.isDebugEnabled()) + log.debug(errMsg); + + return new IgniteNodeValidationResult(node.id(), errMsg); + } + + /** + * Enables rolling upgrade with specified target version. + * This method can only be called on coordinator node with {@link TcpDiscoverySpi}. + * + * @param target Target version. + * @throws IgniteCheckedException If: + * <ul> + * <li>The current and target versions are incompatible;</li> + * <li>The local node is not a coordinator;</li> + * <li>The discovery SPI is not {@link TcpDiscoverySpi};</li> + * <li>The distributed metastorage is not ready;</li> + * <li>{@link TcpDiscoveryNodesRing} was not provided.</li> + * </ul> + */ + public void enable(IgniteProductVersion target) throws IgniteCheckedException { + if (ring == null) + throw new IgniteCheckedException("TCP discovery nodes ring was not provided."); + + if (!U.isLocalNodeCoordinator(ctx.discovery())) + throw new IgniteCheckedException("Rolling upgrade can be enabled only on coordinator node"); + + if (metastorage == null) + throw new IgniteCheckedException("Meta storage is not ready."); + + if (!(ctx.config().getDiscoverySpi() instanceof TcpDiscoverySpi)) + throw new IgniteCheckedException("Rolling upgrade is supported only with TCP discovery SPI"); + + String curBuildVer = ctx.discovery().localNode().attribute(ATTR_BUILD_VER); + IgniteProductVersion curVer = IgniteProductVersion.fromString(curBuildVer); + + if (!checkVersionsForEnabling(curVer, target)) + return; + + IgnitePair<IgniteProductVersion> newPair = F.pair(curVer, target); + + if (!metastorage.compareAndSet(ROLLING_UPGRADE_VERSIONS_KEY, null, newPair)) { + IgnitePair<IgniteProductVersion> oldVerPair = metastorage.read(ROLLING_UPGRADE_VERSIONS_KEY); + + if (newPair.equals(oldVerPair)) + return; + + if (oldVerPair == null) + throw new IgniteCheckedException("Could not enable rolling upgrade. Try again."); + + throw new IgniteCheckedException("Rolling upgrade is already enabled with a different current and target version: " + + oldVerPair.get1() + " , " + oldVerPair.get2()); + } + + verPair = newPair; + + if (log.isInfoEnabled()) + log.info("Rolling upgrade enabled [current=" + curVer + ", target=" + target + ']'); + } + + /** + * Disables rolling upgrade. + * This method can only be called on coordinator node. + * + * @throws IgniteCheckedException If cluster has two or more nodes with different versions or if node is not coordinator + * or metastorage is not ready. + */ + public void disable() throws IgniteCheckedException { + if (!U.isLocalNodeCoordinator(ctx.discovery())) + throw new IgniteCheckedException("Rolling upgrade can be disabled only on coordinator node"); + + if (metastorage == null) + throw new IgniteCheckedException("Meta storage is not ready."); + + if (verPair == null) + return; + + IgnitePair<IgniteProductVersion> minMaxVerPair = ring.minMaxNodeVersions(); + + Set<IgniteProductVersion> vers = new HashSet<>(); + + vers.add(minMaxVerPair.get1()); + + vers.add(minMaxVerPair.get2()); + + if (vers.size() > 1) + throw new IgniteCheckedException("Can't disable rolling upgrade with different versions in cluster: " + vers); + + synchronized (lock) { + if (lastJoiningNode != null) { + long timeout = ((TcpDiscoverySpi)ctx.config().getDiscoverySpi()).getJoinTimeout(); Review Comment: let's use more than single timeout, at least 3. Also should handle special case with timeout = 0. ########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ + private volatile IgnitePair<IgniteProductVersion> verPair = null; + + /** + * @param ctx Context. + */ + public RollingUpgradeProcessor(GridKernalContext ctx) { + super(ctx); + } + + /** {@inheritDoc} */ + @Override public void start() throws IgniteCheckedException { + ctx.internalSubscriptionProcessor().registerDistributedMetastorageListener(new DistributedMetastorageLifecycleListener() { + @Override public void onReadyForWrite(DistributedMetaStorage metastorage) { + RollingUpgradeProcessor.this.metastorage = metastorage; + } + + @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) { + try { + verPair = metastorage.read(ROLLING_UPGRADE_VERSIONS_KEY); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } + + // Keep the current and target version pair in sync with metastorage updates, e.g., to handle coordinator changes. + metastorage.listen(ROLLING_UPGRADE_VERSIONS_KEY::equals, (key, oldVal, newVal) -> { + verPair = (IgnitePair<IgniteProductVersion>)newVal; + }); + } + }); + } + + /** {@inheritDoc} The joining node is stored to verify later whether it successfully connected to the ring or failed to join. */ + @Override public @Nullable IgniteNodeValidationResult validateNode(ClusterNode node) { + synchronized (lock) { + lastJoiningNode = node; + + lastJoiningNodeTimestamp = U.currentTimeMillis(); + } + + ClusterNode locNode = ctx.discovery().localNode(); + + String locBuildVer = locNode.attribute(ATTR_BUILD_VER); + String rmtBuildVer = node.attribute(ATTR_BUILD_VER); + + IgniteProductVersion rmtVer = IgniteProductVersion.fromString(rmtBuildVer); + + IgnitePair<IgniteProductVersion> pair = verPair; + + if (pair == null) + pair = F.pair(IgniteProductVersion.fromString(locBuildVer), null); + + IgniteProductVersion curVer = pair.get1(); + IgniteProductVersion targetVer = pair.get2(); + + if (Objects.equals(rmtVer, curVer) || Objects.equals(rmtVer, targetVer)) + return null; + + String errMsg = "Remote node rejected due to incompatible version for cluster join.\n" + + "Remote node info:\n" + + " - Version : " + rmtBuildVer + "\n" + + " - Addresses : " + U.addressesAsString(node) + "\n" + + " - Node ID : " + node.id() + "\n" + + "Local node info:\n" + + " - Version : " + locBuildVer + "\n" + + " - Addresses : " + U.addressesAsString(locNode) + "\n" + + " - Node ID : " + locNode.id() + "\n" + + "Allowed versions for joining: " + curVer + (targetVer == null ? "" : ", " + targetVer); + + LT.warn(log, errMsg); + + if (log.isDebugEnabled()) + log.debug(errMsg); + + return new IgniteNodeValidationResult(node.id(), errMsg); + } + + /** + * Enables rolling upgrade with specified target version. + * This method can only be called on coordinator node with {@link TcpDiscoverySpi}. + * + * @param target Target version. + * @throws IgniteCheckedException If: + * <ul> + * <li>The current and target versions are incompatible;</li> + * <li>The local node is not a coordinator;</li> + * <li>The discovery SPI is not {@link TcpDiscoverySpi};</li> + * <li>The distributed metastorage is not ready;</li> + * <li>{@link TcpDiscoveryNodesRing} was not provided.</li> + * </ul> + */ + public void enable(IgniteProductVersion target) throws IgniteCheckedException { + if (ring == null) + throw new IgniteCheckedException("TCP discovery nodes ring was not provided."); Review Comment: What admin should do with this message? And for "Meta storage is not ready"? Let's write a suggestion for an admin. ########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ + private volatile IgnitePair<IgniteProductVersion> verPair = null; Review Comment: Not need to initialize with null ########## modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java: ########## @@ -17,23 +17,56 @@ package org.apache.ignite.internal; -import java.io.PrintWriter; -import java.io.StringWriter; +import java.util.Collection; +import java.util.List; import java.util.Map; +import java.util.function.UnaryOperator; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.Ignition; +import org.apache.ignite.cluster.ClusterState; +import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.util.function.ThrowableSupplier; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.lang.RunnableX; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.apache.ignite.testframework.GridTestUtils.assertThrows; +import static org.apache.ignite.testframework.GridTestUtils.waitForCondition; +import static org.junit.Assume.assumeTrue; /** - * Test grids starting with non compatible release types. + * Test Rolling Upgrade release types. */ +@RunWith(Parameterized.class) public class GridReleaseTypeSelfTest extends GridCommonAbstractTest { /** */ private String nodeVer; + /** Is client. */ Review Comment: Who? ########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ + private volatile IgnitePair<IgniteProductVersion> verPair = null; + + /** + * @param ctx Context. + */ + public RollingUpgradeProcessor(GridKernalContext ctx) { + super(ctx); + } + + /** {@inheritDoc} */ + @Override public void start() throws IgniteCheckedException { + ctx.internalSubscriptionProcessor().registerDistributedMetastorageListener(new DistributedMetastorageLifecycleListener() { + @Override public void onReadyForWrite(DistributedMetaStorage metastorage) { + RollingUpgradeProcessor.this.metastorage = metastorage; + } + + @Override public void onReadyForRead(ReadableDistributedMetaStorage metastorage) { + try { + verPair = metastorage.read(ROLLING_UPGRADE_VERSIONS_KEY); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } + + // Keep the current and target version pair in sync with metastorage updates, e.g., to handle coordinator changes. + metastorage.listen(ROLLING_UPGRADE_VERSIONS_KEY::equals, (key, oldVal, newVal) -> { + verPair = (IgnitePair<IgniteProductVersion>)newVal; + }); + } + }); + } + + /** {@inheritDoc} The joining node is stored to verify later whether it successfully connected to the ring or failed to join. */ + @Override public @Nullable IgniteNodeValidationResult validateNode(ClusterNode node) { + synchronized (lock) { + lastJoiningNode = node; + + lastJoiningNodeTimestamp = U.currentTimeMillis(); + } + + ClusterNode locNode = ctx.discovery().localNode(); + + String locBuildVer = locNode.attribute(ATTR_BUILD_VER); + String rmtBuildVer = node.attribute(ATTR_BUILD_VER); + + IgniteProductVersion rmtVer = IgniteProductVersion.fromString(rmtBuildVer); + + IgnitePair<IgniteProductVersion> pair = verPair; + + if (pair == null) + pair = F.pair(IgniteProductVersion.fromString(locBuildVer), null); Review Comment: No need to build this variable: ``` curVer = pair == null ? IgniteProductVersion.fromString(locBuildVer) : pair.get1(); targetVer = pair == null ? null : pair.get2() ``` ########## modules/core/src/main/java/org/apache/ignite/internal/processors/rollingupgrade/RollingUpgradeProcessor.java: ########## @@ -0,0 +1,310 @@ +/* + * 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.rollingupgrade; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.IgniteException; +import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.processors.GridProcessorAdapter; +import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage; +import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; +import org.apache.ignite.internal.processors.metastorage.ReadableDistributedMetaStorage; +import org.apache.ignite.internal.processors.nodevalidation.DiscoveryNodeValidationProcessor; +import org.apache.ignite.internal.util.lang.IgnitePair; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.LT; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgniteProductVersion; +import org.apache.ignite.spi.IgniteNodeValidationResult; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNodesRing; +import org.jetbrains.annotations.Nullable; + +import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER; +import static org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage.IGNITE_INTERNAL_KEY_PREFIX; + +/** Rolling upgrade processor. Manages current and target versions of cluster. */ +public class RollingUpgradeProcessor extends GridProcessorAdapter implements DiscoveryNodeValidationProcessor { + /** Key for the distributed property that holds current and target versions. */ + private static final String ROLLING_UPGRADE_VERSIONS_KEY = IGNITE_INTERNAL_KEY_PREFIX + "rolling.upgrade.versions"; + + /** Metastorage with the write access. */ + @Nullable private volatile DistributedMetaStorage metastorage; + + /** TCP discovery nodes ring. */ + private TcpDiscoveryNodesRing ring; + + /** Last joining node. */ + private ClusterNode lastJoiningNode; + + /** Last joining node timestamp. */ + private long lastJoiningNodeTimestamp; + + /** Lock for synchronization between tcp-disco-msg-worker thread and management operations. */ + private final Object lock = new Object(); + + /** Pair with current and target versions. */ + private volatile IgnitePair<IgniteProductVersion> verPair = null; Review Comment: rollUpVers? ########## modules/core/src/test/java/org/apache/ignite/internal/GridReleaseTypeSelfTest.java: ########## @@ -51,67 +84,406 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); + DataStorageConfiguration storageCfg = new DataStorageConfiguration(); + + storageCfg.getDefaultDataRegionConfiguration().setPersistenceEnabled(persistence); + + cfg.setDataStorageConfiguration(storageCfg); + return cfg; } /** {@inheritDoc} */ @Override protected void afterTest() throws Exception { stopAllGrids(); + cleanPersistenceDir(); } - /** - * @throws Exception If failed. - */ + /** */ + @Test + public void testTwoConflictVersions() { Review Comment: Why this test runs 25sec? And other tests for 5 sec? Is there any timeout we are waiting for? ########## modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java: ########## @@ -2997,6 +2998,12 @@ private RingMessageWorker(IgniteLogger log) { runTasks(); }); + + if (spi.ignite() instanceof IgniteEx) { + RollingUpgradeProcessor rollingUpgradeProcessor = ((IgniteEx)spi.ignite()).context().rollingUpgrade(); + if (rollingUpgradeProcessor != null) Review Comment: Let's move this code to ServerImpl#spiStart before `joinTopology()` call. We should call callback to spi here. TestTcpDiscoverySpi in the test should do nothing in this callback -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
