timoninmaxim commented on code in PR #12301:
URL: https://github.com/apache/ignite/pull/12301#discussion_r2415989693
##########
modules/core/src/main/java/org/apache/ignite/internal/processors/nodevalidation/OsDiscoveryNodeValidationProcessor.java:
##########
@@ -32,42 +35,76 @@
* Node validation.
*/
public class OsDiscoveryNodeValidationProcessor extends GridProcessorAdapter
implements DiscoveryNodeValidationProcessor {
+ /** Key for the distributed property that holds the rolling upgrade minor
version check value. */
+ public static final String ROLL_UP_VERSION_CHECK =
"rolling.upgrade.version.check";
+
+ /**
+ * Distributed property that holds version for rolling upgrade validation.
+ * If value is null {@code null}, rolling upgrade is considered disabled,
+ * and nodes must have the exact same version to join the cluster.
+ */
+ private final AtomicReference<IgniteProductVersion> rollUpVerCheck = new
AtomicReference<>();
+
/**
* @param ctx Kernal context.
*/
public OsDiscoveryNodeValidationProcessor(GridKernalContext ctx) {
super(ctx);
+
+
ctx.internalSubscriptionProcessor().registerDistributedMetastorageListener(new
DistributedMetastorageLifecycleListener() {
+ @Override public void
onReadyForRead(ReadableDistributedMetaStorage metastorage) {
+ metastorage.listen(ROLL_UP_VERSION_CHECK::equals, (key,
oldVal, newVal) -> {
+ rollUpVerCheck.getAndSet((IgniteProductVersion)newVal);
+
+ if (newVal == null)
+ log.warning("Rolling upgrade version check was
disabled.");
+ });
+ }
+ });
}
/** {@inheritDoc} */
@Nullable @Override public IgniteNodeValidationResult
validateNode(ClusterNode node) {
ClusterNode locNode = ctx.discovery().localNode();
- // Check version.
String locBuildVer = locNode.attribute(ATTR_BUILD_VER);
String rmtBuildVer = node.attribute(ATTR_BUILD_VER);
- if (!Objects.equals(rmtBuildVer, locBuildVer)) {
- // OS nodes don't support rolling updates.
- if (!locBuildVer.equals(rmtBuildVer)) {
- String errMsg = "Local node and remote node have different
version numbers " +
- "(node will not join, Ignite does not support rolling
updates, " +
- "so versions must be exactly the same) " +
- "[locBuildVer=" + locBuildVer + ", rmtBuildVer=" +
rmtBuildVer +
- ", locNodeAddrs=" + U.addressesAsString(locNode) +
- ", rmtNodeAddrs=" + U.addressesAsString(node) +
- ", locNodeId=" + locNode.id() + ", rmtNodeId=" + node.id()
+ ']';
+ IgniteProductVersion locVer =
IgniteProductVersion.fromString(locBuildVer);
+ IgniteProductVersion rmtVer =
IgniteProductVersion.fromString(rmtBuildVer);
- LT.warn(log, errMsg);
+ IgniteProductVersion rollUpVerCheck = this.rollUpVerCheck.get();
- // Always output in debug.
- if (log.isDebugEnabled())
- log.debug(errMsg);
+ if (versionsMatch(rmtVer, locVer) || versionsMatch(rmtVer,
rollUpVerCheck))
Review Comment:
We need support only 1 version for joining nodes.
--
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]
