rpuch commented on code in PR #6118:
URL: https://github.com/apache/ignite-3/pull/6118#discussion_r2207154671
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java:
##########
@@ -555,6 +607,31 @@ private void handleInit(CmgInitMessage msg, ClusterNode
sender, long correlation
}
}
+ /**
+ * Handles the prepare init messages.
+ *
+ * <p>If both initiator node and recipient have same colocation mode
PrepareInitCompleteMessage is sent,
+ * otherwise InitErrorMessage is sent.
Review Comment:
```suggestion
* otherwise an InitErrorMessage is sent.
```
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java:
##########
@@ -555,6 +607,31 @@ private void handleInit(CmgInitMessage msg, ClusterNode
sender, long correlation
}
}
+ /**
+ * Handles the prepare init messages.
+ *
+ * <p>If both initiator node and recipient have same colocation mode
PrepareInitCompleteMessage is sent,
Review Comment:
```suggestion
* <p>If both initiator node and recipient have the same colocation
mode, a PrepareInitCompleteMessage is sent,
```
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterInitializer.java:
##########
@@ -193,34 +204,36 @@ public CompletableFuture<Void> initCluster(
.initialClusterConfiguration(patchedClusterConfiguration)
.build();
- return invokeMessage(cmgNodes, initMessage)
- .handle((v, e) -> {
- if (e == null) {
- LOG.info(
- "Cluster initialized [clusterName={},
cmgNodes={}, msNodes={}]",
- initMessage.clusterName(),
- initMessage.cmgNodes(),
- initMessage.metaStorageNodes()
- );
-
- return
CompletableFutures.<Void>nullCompletedFuture();
- } else {
- if (e instanceof CompletionException) {
- e = e.getCause();
- }
-
- LOG.info("Initialization failed [reason={}]", e,
e.getMessage());
-
- if (e instanceof InternalInitException &&
!((InternalInitException) e).shouldCancelInit()) {
- return CompletableFuture.<Void>failedFuture(e);
- } else {
- LOG.debug("Critical error encountered, rolling
back the init procedure");
-
- return cancelInit(cmgNodes, e);
- }
- }
- })
- .thenCompose(Function.identity());
+ // Within prepareInitMessage we validate that all CMG nodes have
enabledColocation mode.
Review Comment:
```suggestion
// Handler of prepareInitMessage validates that all CMG nodes
have the same enabledColocation mode.
```
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/network/messages/CmgPrepareInitMessage.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.cluster.management.network.messages;
+
+import org.apache.ignite.internal.network.NetworkMessage;
+import org.apache.ignite.internal.network.annotations.Transferable;
+
+/**
+ * Message for initializing the Cluster Management Group.
Review Comment:
It seems that it's about preparing for initialization. Would it make sense
to document here how preparation is different from initialization itself?
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/network/messages/CmgPrepareInitMessage.java:
##########
@@ -0,0 +1,33 @@
+/*
+ * 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.cluster.management.network.messages;
+
+import org.apache.ignite.internal.network.NetworkMessage;
+import org.apache.ignite.internal.network.annotations.Transferable;
+
+/**
+ * Message for initializing the Cluster Management Group.
+ */
+@Transferable(CmgMessageGroup.CMG_PREPARE_INIT)
+public interface CmgPrepareInitMessage extends NetworkMessage {
+ /**
+ * Colocation enabled mode of the node that initiates the init procedure.
All nodes in CMG group should have same colocation enabled
Review Comment:
```suggestion
* Colocation enabled mode of the node that initiates the init
procedure. All nodes in CMG group should have the same colocation enabled
```
##########
modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/ClusterManagementGroupManager.java:
##########
@@ -555,6 +607,31 @@ private void handleInit(CmgInitMessage msg, ClusterNode
sender, long correlation
}
}
+ /**
+ * Handles the prepare init messages.
+ *
+ * <p>If both initiator node and recipient have same colocation mode
PrepareInitCompleteMessage is sent,
+ * otherwise InitErrorMessage is sent.
+ */
+ private void handlePrepareInit(CmgPrepareInitMessage msg, ClusterNode
sender, long correlationId) {
+ NetworkMessage response;
+ if (nodeProperties.colocationEnabled() !=
msg.initInitiatorColocationEnabled()) {
+ String colocationEnabledMismatchResponseMessage =
IgniteStringFormatter.format(
+ "Colocation modes does not match
[initInitiatorNodeName={}, initInitiatorColocationMode={}, "
Review Comment:
```suggestion
"Colocation modes do not match
[initInitiatorNodeName={}, initInitiatorColocationMode={}, "
```
--
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: notifications-unsubscr...@ignite.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
