alievmirza commented on code in PR #5092:
URL: https://github.com/apache/ignite-3/pull/5092#discussion_r1954756550
##########
modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java:
##########
@@ -159,29 +133,10 @@ public class DistributionZoneManager extends
/** Executor for scheduling tasks for scale up and scale down processes. */
private final StripedScheduledThreadPoolExecutor executor;
- /**
- * Map with states for distribution zones. States are needed to track
nodes that we want to add or remove from the data nodes,
- * schedule and stop scale up and scale down processes.
- */
- private final Map<Integer, ZoneState> zonesState = new
ConcurrentHashMap<>();
+ private DataNodesManager dataNodesManager;
/** Listener for a topology events. */
- private final LogicalTopologyEventListener topologyEventListener = new
LogicalTopologyEventListener() {
- @Override
- public void onNodeJoined(LogicalNode joinedNode,
LogicalTopologySnapshot newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
-
- @Override
- public void onNodeLeft(LogicalNode leftNode, LogicalTopologySnapshot
newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
-
- @Override
- public void onTopologyLeap(LogicalTopologySnapshot newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
- };
+ private final LogicalTopologyEventListener topologyEventListener = new
DistributionZoneManagerLogicalTopologyEventListener();
/**
* The logical topology mapped to the MS revision.
Review Comment:
the same with `SKIP_REBALANCE_TRIGGERS_RECOVERY`
##########
modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java:
##########
@@ -159,29 +133,10 @@ public class DistributionZoneManager extends
/** Executor for scheduling tasks for scale up and scale down processes. */
private final StripedScheduledThreadPoolExecutor executor;
- /**
- * Map with states for distribution zones. States are needed to track
nodes that we want to add or remove from the data nodes,
- * schedule and stop scale up and scale down processes.
- */
- private final Map<Integer, ZoneState> zonesState = new
ConcurrentHashMap<>();
+ private DataNodesManager dataNodesManager;
/** Listener for a topology events. */
- private final LogicalTopologyEventListener topologyEventListener = new
LogicalTopologyEventListener() {
- @Override
- public void onNodeJoined(LogicalNode joinedNode,
LogicalTopologySnapshot newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
-
- @Override
- public void onNodeLeft(LogicalNode leftNode, LogicalTopologySnapshot
newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
-
- @Override
- public void onTopologyLeap(LogicalTopologySnapshot newTopology) {
- updateLogicalTopologyInMetaStorage(newTopology);
- }
- };
+ private final LogicalTopologyEventListener topologyEventListener = new
DistributionZoneManagerLogicalTopologyEventListener();
/**
* The logical topology mapped to the MS revision.
Review Comment:
check note on `logicalTopologyByRevision`, It refers the
https://issues.apache.org/jira/browse/IGNITE-23561 -- ticket, that you are
going to close
##########
modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesHistory.java:
##########
@@ -0,0 +1,158 @@
+/*
+ * 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.distributionzones;
+
+import static java.util.Collections.emptySet;
+import static org.apache.ignite.internal.lang.Pair.pair;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.lang.Pair;
+import org.apache.ignite.internal.util.io.IgniteDataInput;
+import org.apache.ignite.internal.util.io.IgniteDataOutput;
+import org.apache.ignite.internal.versioned.VersionedSerialization;
+import org.apache.ignite.internal.versioned.VersionedSerializer;
+
+/**
+ * Data nodes history. Is actually a map of timestamps to sets of nodes with
their attributes.
+ */
+public class DataNodesHistory {
+ private final NavigableMap<HybridTimestamp, Set<NodeWithAttributes>>
history;
+
+ public DataNodesHistory() {
+ this(new TreeMap<>());
+ }
+
+ public DataNodesHistory(NavigableMap<HybridTimestamp,
Set<NodeWithAttributes>> history) {
+ this.history = history;
+ }
+
+ /**
+ * Copies existing history and adds a new history entry.
+ *
+ * @param timestamp Timestamp.
+ * @param nodes Nodes.
+ * @return New data nodes history.
+ */
+ public DataNodesHistory addHistoryEntry(HybridTimestamp timestamp,
Set<NodeWithAttributes> nodes) {
+ DataNodesHistory dataNodesHistory = new DataNodesHistory(new
TreeMap<>(this.history));
+ dataNodesHistory.history.put(timestamp, nodes);
+ return dataNodesHistory;
+ }
+
+ /**
+ * Checks that the exact timestamp is present in history.
+ *
+ * @param timestamp Timestamp.
+ * @return {@code true} if the exact timestamp is present in history.
+ */
+ public boolean entryIsPresentAtExactTimestamp(HybridTimestamp timestamp) {
+ return history.containsKey(timestamp);
+ }
+
+ /**
+ * Checks that the history is empty.
+ *
+ * @return {@code true} if history is empty.
+ */
+ public boolean isEmpty() {
+ return history.isEmpty();
+ }
+
+ /**
+ * Returns data nodes for timestamp, or empty set.
+ *
+ * @param timestamp Timestamp.
+ * @return Data nodes for timestamp, or empty set.
+ */
+ public Pair<HybridTimestamp, Set<NodeWithAttributes>>
dataNodesForTimestamp(HybridTimestamp timestamp) {
+ Map.Entry<HybridTimestamp, Set<NodeWithAttributes>> entry =
history.floorEntry(timestamp);
+
+ if (entry == null) {
+ return pair(HybridTimestamp.MIN_VALUE, emptySet());
+ }
+
+ return pair(entry.getKey(), entry.getValue());
+ }
+
+ @Override
+ public String toString() {
+ return "DataNodesHistory [history=" + history + "].";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ DataNodesHistory history1 = (DataNodesHistory) o;
+ return Objects.equals(history, history1.history);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(history);
+ }
+
+ /**
+ * Data nodes history serializer.
+ */
+ public static class DataNodesHistorySerializer extends
VersionedSerializer<DataNodesHistory> {
Review Comment:
please move it to a separate class
##########
modules/metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/dsl/Operations.java:
##########
@@ -34,8 +34,10 @@
public final class Operations {
private static final MetaStorageMessagesFactory MSG_FACTORY = new
MetaStorageMessagesFactory();
+ private static final ByteBuffer NO_OP_KEY = ByteBuffer.wrap(new byte[] {});
Review Comment:
why do we need this key?
##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/GroupUpdateRequest.java:
##########
@@ -447,7 +447,7 @@ private static Set<Assignment> getAliveNodesWithData(
@Nullable LocalPartitionStateMessageByNode
localPartitionStateMessageByNode
) {
if (localPartitionStateMessageByNode == null) {
- return Set.of();
+ return new HashSet<>();
Review Comment:
Why?
##########
modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesHistory.java:
##########
@@ -0,0 +1,158 @@
+/*
+ * 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.distributionzones;
+
+import static java.util.Collections.emptySet;
+import static org.apache.ignite.internal.lang.Pair.pair;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.Set;
+import java.util.TreeMap;
+import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.lang.Pair;
+import org.apache.ignite.internal.util.io.IgniteDataInput;
+import org.apache.ignite.internal.util.io.IgniteDataOutput;
+import org.apache.ignite.internal.versioned.VersionedSerialization;
+import org.apache.ignite.internal.versioned.VersionedSerializer;
+
+/**
+ * Data nodes history. Is actually a map of timestamps to sets of nodes with
their attributes.
+ */
+public class DataNodesHistory {
Review Comment:
How is this map cleaned up?
--
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
