Skip to content

IGNITE-28961 TcpDiscoveryNode should not implement SelfMarshallingMessage #13450

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.

Sign up for GitHub

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

Open
Vladsz83 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

IGNITE-28961 TcpDiscoveryNode should not implement SelfMarshallingMessage #13450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
48e610b
impl
Vladsz83 Aug 7, 2026
987be83
Merge branch 'master' into IGNITE-28961-TcpDiscoveryNode-should-not-i…
Vladsz83 Aug 7, 2026
31be3de
fixes
Vladsz83 Aug 8, 2026
48fee5c
Merge branch 'master' into IGNITE-28961-TcpDiscoveryNode-should-not-i…
Vladsz83 Aug 8, 2026
4d7a505
fixes
Vladsz83 Aug 8, 2026
f837d0e
fixes
Vladsz83 Aug 8, 2026
6c76287
fix
Vladsz83 Aug 8, 2026
b912953
minority
Vladsz83 Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,167 changes: 1,049 additions & 118 deletions modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions modules/core/src/main/java/org/apache/ignite/internal/CoreMessagesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@
import org.apache.ignite.internal.processors.cluster.ClusterUpdateNotifierDataBagItem;
import org.apache.ignite.internal.processors.cluster.DiscoveryDataClusterState;
import org.apache.ignite.internal.processors.cluster.NodeFullMetricsMessage;
import org.apache.ignite.internal.processors.cluster.NodeMetricsMessage;
import org.apache.ignite.internal.processors.continuous.ContinuousRoutineStartResultMessage;
import org.apache.ignite.internal.processors.continuous.GridContinuousMessage;
import org.apache.ignite.internal.processors.continuous.StartRequestData;
Expand Down Expand Up @@ -666,7 +665,7 @@ public CoreMessagesProvider(Marshaller dfltMarsh, Marshaller schemaAwareMarsh) {
// [11900 - 12000]: Metrics, monitoring messages.
msgIdx = 11900;
register(CacheMetricsMessage.class);
register(NodeMetricsMessage.class);
register(ClusterMetricsSnapshot.class);
register(NodeFullMetricsMessage.class);
register(ClusterMetricsUpdateMessage.class);
register(TcpDiscoveryClientNodesMetricsMessage.class);
Expand Down
2 changes: 1 addition & 1 deletion modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public ExecutorService executorService() {
if (nodes().isEmpty())
throw U.convertException(U.emptyTopologyException());

return new ClusterMetricsSnapshot(this);
return new ClusterMetricsSnapshot(nodes());
}
finally {
unguard();
Expand Down
9 changes: 5 additions & 4 deletions ...e/src/main/java/org/apache/ignite/internal/processors/cluster/NodeFullMetricsMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.Map;
import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.cluster.ClusterMetrics;
import org.apache.ignite.internal.ClusterMetricsSnapshot;
import org.apache.ignite.internal.Order;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
Expand All @@ -30,7 +31,7 @@
public class NodeFullMetricsMessage implements Message {
/** Node metrics wrapper message. */
@Order(0)
public NodeMetricsMessage nodeMetricsMsg;
public ClusterMetricsSnapshot nodeMetricsMsg;

/** Cache metrics wrapper message. */
@Order(1)
Expand All @@ -43,7 +44,7 @@ public NodeFullMetricsMessage() {

/** */
public NodeFullMetricsMessage(ClusterMetrics nodeMetrics, Map<Integer, CacheMetrics> cacheMetrics) {
nodeMetricsMsg = new NodeMetricsMessage(nodeMetrics);
nodeMetricsMsg = new ClusterMetricsSnapshot(nodeMetrics);

cachesMetricsMsgs = U.newHashMap(cacheMetrics.size());

Expand All @@ -61,12 +62,12 @@ public void cachesMetricsMessages(Map<Integer, CacheMetricsMessage> cacheMetrics
}

/** */
public NodeMetricsMessage nodeMetricsMessage() {
public ClusterMetricsSnapshot nodeMetricsMessage() {
return nodeMetricsMsg;
}

/** */
public void nodeMetricsMessage(NodeMetricsMessage nodeMetricsMsg) {
public void nodeMetricsMessage(ClusterMetricsSnapshot nodeMetricsMsg) {
this.nodeMetricsMsg = nodeMetricsMsg;
}

Expand Down
Loading