This is an automated email from the ASF dual-hosted git repository.

wernerdv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 480901f3403 IGNITE-29222 Add JoinedClientNodes discovery metric 
(#13764)
480901f3403 is described below

commit 480901f3403d332ece7494abb7abede47fa4bf0b
Author: Egor Baranov <[email protected]>
AuthorDate: Tue Nov 3 10:11:24 2026 +0300

    IGNITE-29222 Add JoinedClientNodes discovery metric (#13764)
---
 docs/_docs/monitoring-metrics/new-metrics.adoc               |  1 +
 .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java |  3 +++
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java |  3 +++
 .../spi/discovery/tcp/internal/TcpDiscoveryStatistics.java   | 12 ++++++++++++
 .../ignite/spi/discovery/tcp/TcpDiscoverySpiMBeanTest.java   |  2 ++
 .../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java    |  3 +++
 .../discovery/zk/internal/ZookeeperDiscoveryStatistics.java  | 10 ++++++++++
 .../discovery/zk/internal/ZookeeperDiscoveryMiscTest.java    |  4 +++-
 8 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/docs/_docs/monitoring-metrics/new-metrics.adoc 
b/docs/_docs/monitoring-metrics/new-metrics.adoc
index ad5c1a0d52b..249bbc8f120 100644
--- a/docs/_docs/monitoring-metrics/new-metrics.adoc
+++ b/docs/_docs/monitoring-metrics/new-metrics.adoc
@@ -524,6 +524,7 @@ Register name: `io.discovery`
 |CoordinatorSince | long | Coordinator since timestamp.
 |CurrentTopologyVersion | long | Current topology version.
 |FailedNodes | integer | Failed nodes count.
+|JoinedClientNodes | integer | Joined client nodes count.
 |JoinedNodes | integer | Joined nodes count.
 |LeftNodes | integer | Left nodes count.
 |LocalPort | integer | Local TCP port the discovery SPI listens to.
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index ddf9a61102e..731a3724676 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -2334,6 +2334,9 @@ class ClientImpl extends TcpDiscoveryImpl {
                         notifyDiscovery(EVT_NODE_JOINED, topVer, node, top);
 
                         spi.stats.onNodeJoined();
+
+                        if (node.isClient())
+                            spi.stats.onClientNodeJoined();
                     }
                 }
                 else {
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 9a87615ffbb..4c5e3c72a42 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -5075,6 +5075,9 @@ class ServerImpl extends TcpDiscoveryImpl {
             if (msg.verified() && !locNodeId.equals(nodeId) && state != 
CONNECTING && fireEvt) {
                 spi.stats.onNodeJoined();
 
+                if (node.isClient())
+                    spi.stats.onClientNodeJoined();
+
                 // Make sure that node with greater order will never get 
EVT_NODE_JOINED
                 // on node with less order.
                 assert node.internalOrder() > locNode.internalOrder() : 
"Invalid order [node=" + node +
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
index 63d0cdb4167..d588bf851c6 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java
@@ -46,6 +46,9 @@ public class TcpDiscoveryStatistics {
     /** Failed nodes count. */
     private final IntMetricImpl failedNodesCnt;
 
+    /** Joined client nodes count. */
+    private final IntMetricImpl joinedClientNodesCnt;
+
     /** Left nodes count. */
     private final IntMetricImpl leftNodesCnt;
 
@@ -88,6 +91,8 @@ public class TcpDiscoveryStatistics {
 
         failedNodesCnt = new IntMetricImpl(metricName(DISCO_METRICS, 
"FailedNodes"), "Failed nodes count");
 
+        joinedClientNodesCnt = new IntMetricImpl(metricName(DISCO_METRICS, 
"JoinedClientNodes"), "Joined client nodes count.");
+
         leftNodesCnt = new IntMetricImpl(metricName(DISCO_METRICS, 
"LeftNodes"), "Left nodes count");
 
         pendingMsgsRegistered = new IntMetricImpl(metricName(DISCO_METRICS, 
"PendingMessagesRegistered"),
@@ -119,6 +124,7 @@ public class TcpDiscoveryStatistics {
 
         discoReg.register(joinedNodesCnt);
         discoReg.register(failedNodesCnt);
+        discoReg.register(joinedClientNodesCnt);
         discoReg.register(leftNodesCnt);
         discoReg.register(pendingMsgsRegistered);
         discoReg.register(rejectedSslConnectionsCnt);
@@ -133,6 +139,11 @@ public class TcpDiscoveryStatistics {
         joinedNodesCnt.increment();
     }
 
+    /** Increments joined client nodes count. */
+    public void onClientNodeJoined() {
+        joinedClientNodesCnt.increment();
+    }
+
     /**
      * Increments left nodes count.
      */
@@ -355,6 +366,7 @@ public class TcpDiscoveryStatistics {
         crdSinceTs.set(0);
         failedNodesCnt.reset();
         joinedNodesCnt.reset();
+        joinedClientNodesCnt.reset();
         leftNodesCnt.reset();
         maxMsgProcTime = 0;
         pendingMsgsRegistered.reset();
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBeanTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBeanTest.java
index 097ee09b442..6159dc24e69 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBeanTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiMBeanTest.java
@@ -130,6 +130,8 @@ public class TcpDiscoverySpiMBeanTest extends 
GridCommonAbstractTest {
                 assertEquals((cnt - 1) - i, bean.getNodesJoined());
                 assertEquals((cnt - 1) - i, 
discoReg.<IntMetric>findMetric("JoinedNodes").value());
 
+                assertEquals((i < cliIdx) ? 1 : 0, 
discoReg.<IntMetric>findMetric("JoinedClientNodes").value());
+
                 assertEquals(0L, bean.getNodesFailed());
                 assertEquals(0, 
discoReg.<IntMetric>findMetric("FailedNodes").value());
 
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index faadb17cdd9..9d10c615bc5 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -3586,6 +3586,9 @@ public class ZookeeperDiscoveryImpl {
         ).get();
 
         stats.onNodeJoined();
+
+        if (joinedNode.isClient())
+            stats.onClientNodeJoined();
     }
 
     /**
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
index 958974d0db6..e0df3c0fa31 100644
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
+++ 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryStatistics.java
@@ -40,6 +40,10 @@ public class ZookeeperDiscoveryStatistics {
     private final LongAdderMetric leftNodesCnt = new 
LongAdderMetric(metricName(DISCO_METRICS, "LeftNodes"),
         "Left nodes count");
 
+    /** */
+    private final LongAdderMetric joinedClientNodesCnt = new 
LongAdderMetric(metricName(DISCO_METRICS, "JoinedClientNodes"),
+        "Joined client nodes count.");
+
     /** Communication error count. */
     private final LongAdderMetric commErrCnt = new 
LongAdderMetric(metricName(DISCO_METRICS, "CommunicationErrors"),
         "Communication errors count");
@@ -54,6 +58,7 @@ public class ZookeeperDiscoveryStatistics {
     public void registerMetrics(MetricRegistryImpl discoReg) {
         discoReg.register(joinedNodesCnt);
         discoReg.register(failedNodesCnt);
+        discoReg.register(joinedClientNodesCnt);
         discoReg.register(leftNodesCnt);
         discoReg.register(commErrCnt);
         discoReg.register(topVer);
@@ -84,6 +89,11 @@ public class ZookeeperDiscoveryStatistics {
         joinedNodesCnt.increment();
     }
 
+    /** */
+    public void onClientNodeJoined() {
+        joinedClientNodesCnt.increment();
+    }
+
     /** */
     public void onNodeFailed() {
         failedNodesCnt.increment();
diff --git 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryMiscTest.java
 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryMiscTest.java
index a8acf9b6faf..f55b8090ad4 100644
--- 
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryMiscTest.java
+++ 
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryMiscTest.java
@@ -251,7 +251,7 @@ public class ZookeeperDiscoveryMiscTest extends 
ZookeeperDiscoverySpiTestBase {
                 assertEquals(cnt - i - 1, bean.getNodesJoined());
                 assertEquals(cnt - i - 1, 
discoReg.<LongMetric>findMetric("JoinedNodes").value());
 
-                Arrays.asList("LeftNodes", "FailedNodes", 
"CommunicationErrors").forEach(name -> {
+                Arrays.asList("LeftNodes", "FailedNodes", 
"CommunicationErrors", "JoinedClientNodes").forEach(name -> {
                     assertEquals(0, 
discoReg.<LongMetric>findMetric(name).value());
                 });
 
@@ -304,6 +304,8 @@ public class ZookeeperDiscoveryMiscTest extends 
ZookeeperDiscoverySpiTestBase {
             assertEquals(1, node.cluster().forServers().nodes().size());
         }
 
+        assertEquals(1L, 
grid(0).context().metric().registry(DISCO_METRICS).<LongMetric>findMetric("JoinedClientNodes").value());
+
         startGrid(2);
 
         startClientGrid(3);

Reply via email to