Skip to content

Commit

Permalink
[ISSUE #6572] add client info for OperatorController metrics interface (
Browse files Browse the repository at this point in the history 
#6576)

* [ISSUE #6572] add client info for OperatorController metrics interface

* [ISSUE #6572] move PERSISTENT_SUFFIX to ClientConstants
  • Loading branch information
@MajorHe1
MajorHe1 committed Aug 9, 2021
1 parent d54789d commit 0b15090
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 4 deletions.
2 changes: 2 additions & 0 deletions naming/src/main/java/com/alibaba/nacos/naming/constants/ClientConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ public class ClientConstants {

public static final String PERSISTENT_IP_PORT = "persistentIpPort";

public static final String PERSISTENT_SUFFIX = "false";

public static final String CLIENT_EXPIRED_TIME_CONFIG_KEY = "nacos.naming.client.expired.time";

public static final long DEFAULT_CLIENT_EXPIRED_TIME = TimeUnit.MINUTES.toMillis(3);
Expand Down
34 changes: 33 additions & 1 deletion naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
import com.alibaba.nacos.naming.cluster.ServerListManager;
import com.alibaba.nacos.naming.cluster.ServerStatusManager;
import com.alibaba.nacos.naming.consistency.persistent.raft.RaftCore;
import com.alibaba.nacos.naming.constants.ClientConstants;
import com.alibaba.nacos.naming.core.DistroMapper;
import com.alibaba.nacos.naming.core.Service;
import com.alibaba.nacos.naming.core.ServiceManager;
import com.alibaba.nacos.naming.core.v2.client.impl.IpPortBasedClient;
import com.alibaba.nacos.naming.core.v2.client.manager.ClientManager;
import com.alibaba.nacos.naming.misc.Loggers;
import com.alibaba.nacos.naming.misc.SwitchDomain;
import com.alibaba.nacos.naming.misc.SwitchEntry;
Expand All @@ -50,6 +53,7 @@

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

/**
Expand Down Expand Up @@ -78,9 +82,11 @@ public class OperatorController {

private final RaftCore raftCore;

private final ClientManager clientManager;

public OperatorController(SwitchManager switchManager, ServerListManager serverListManager,
ServiceManager serviceManager, ServerMemberManager memberManager, ServerStatusManager serverStatusManager,
SwitchDomain switchDomain, DistroMapper distroMapper, RaftCore raftCore) {
SwitchDomain switchDomain, DistroMapper distroMapper, RaftCore raftCore, ClientManager clientManager) {
this.switchManager = switchManager;
this.serverListManager = serverListManager;
this.serviceManager = serviceManager;
Expand All @@ -89,6 +95,7 @@ public OperatorController(SwitchManager switchManager, ServerListManager serverL
this.switchDomain = switchDomain;
this.distroMapper = distroMapper;
this.raftCore = raftCore;
this.clientManager = clientManager;
}

/**
Expand Down Expand Up @@ -168,6 +175,26 @@ public ObjectNode metrics(HttpServletRequest request) {
if (onlyStatus) {
return result;
}
Collection<String> allClientId = clientManager.allClientId();
int connectionBasedClient = 0;
int ephemeralIpPortClient = 0;
int persistentIpPortClient = 0;
int responsibleClientCount = 0;
for (String clientId : allClientId) {
if (clientId.contains(IpPortBasedClient.ID_DELIMITER)) {
if (clientId.endsWith(ClientConstants.PERSISTENT_SUFFIX)) {
persistentIpPortClient += 1;
} else {
ephemeralIpPortClient += 1;
}
} else {
connectionBasedClient += 1;
}
if (clientManager.isResponsibleClient(clientManager.getClient(clientId))) {
responsibleClientCount += 1;
}
}

int responsibleDomCount = serviceManager.getResponsibleServiceCount();
int responsibleIpCount = serviceManager.getResponsibleInstanceCount();
result.put("serviceCount", MetricsMonitor.getDomCountMonitor().get());
Expand All @@ -176,6 +203,11 @@ public ObjectNode metrics(HttpServletRequest request) {
result.put("raftNotifyTaskCount", raftCore.getNotifyTaskCount());
result.put("responsibleServiceCount", responsibleDomCount);
result.put("responsibleInstanceCount", responsibleIpCount);
result.put("clientCount", allClientId.size());
result.put("connectionBasedClientCount", connectionBasedClient);
result.put("ephemeralIpPortClientCount", ephemeralIpPortClient);
result.put("persistentIpPortClientCount", persistentIpPortClient);
result.put("responsibleClientCount", responsibleClientCount);
result.put("cpu", EnvUtil.getCPU());
result.put("load", EnvUtil.getLoad());
result.put("mem", EnvUtil.getMem());
Expand Down
5 changes: 2 additions & 3 deletions .../src/main/java/com/alibaba/nacos/naming/core/v2/client/manager/ClientManagerDelegate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.alibaba.nacos.naming.core.v2.client.manager;

import com.alibaba.nacos.naming.constants.ClientConstants;
import com.alibaba.nacos.naming.core.v2.client.Client;
import com.alibaba.nacos.naming.core.v2.client.ClientAttributes;
import com.alibaba.nacos.naming.core.v2.client.impl.IpPortBasedClient;
Expand All @@ -41,8 +42,6 @@ public class ClientManagerDelegate implements ClientManager {

private final PersistentIpPortClientManager persistentIpPortClientManager;

private static final String SUFFIX = "false";

public ClientManagerDelegate(ConnectionBasedClientManager connectionBasedClientManager,
EphemeralIpPortClientManager ephemeralIpPortClientManager,
PersistentIpPortClientManager persistentIpPortClientManager) {
Expand Down Expand Up @@ -105,7 +104,7 @@ private ClientManager getClientManagerById(String clientId) {
if (isConnectionBasedClient(clientId)) {
return connectionBasedClientManager;
}
return clientId.endsWith(SUFFIX) ? persistentIpPortClientManager : ephemeralIpPortClientManager;
return clientId.endsWith(ClientConstants.PERSISTENT_SUFFIX) ? persistentIpPortClientManager : ephemeralIpPortClientManager;
}

private boolean isConnectionBasedClient(String clientId) {
Expand Down
18 changes: 18 additions & 0 deletions naming/src/test/java/com/alibaba/nacos/naming/controllers/OperatorControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.alibaba.nacos.naming.core.DistroMapper;
import com.alibaba.nacos.naming.core.Service;
import com.alibaba.nacos.naming.core.ServiceManager;
import com.alibaba.nacos.naming.core.v2.client.manager.ClientManager;
import com.alibaba.nacos.naming.misc.SwitchDomain;
import com.alibaba.nacos.naming.misc.SwitchManager;
import com.fasterxml.jackson.databind.node.ObjectNode;
Expand All @@ -36,6 +37,9 @@
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.mock.web.MockHttpServletRequest;

import java.util.Collection;
import java.util.HashSet;

/**
* {@link OperatorController} unit test.
*
Expand All @@ -60,6 +64,9 @@ public class OperatorControllerTest {
@Mock
private ServiceManager serviceManager;

@Mock
private ClientManager clientManager;

@Mock
private RaftCore raftCore;

Expand Down Expand Up @@ -95,6 +102,12 @@ public void testMetrics() {
Mockito.when(serviceManager.getResponsibleServiceCount()).thenReturn(1);
Mockito.when(serviceManager.getResponsibleInstanceCount()).thenReturn(1);
Mockito.when(raftCore.getNotifyTaskCount()).thenReturn(1);
Collection<String> clients = new HashSet<>();
clients.add("1628132208793_127.0.0.1_8080");
clients.add("127.0.0.1:8081#true");
clients.add("127.0.0.1:8082#false");
Mockito.when(clientManager.allClientId()).thenReturn(clients);
Mockito.when(clientManager.isResponsibleClient(null)).thenReturn(Boolean.TRUE);

MockHttpServletRequest servletRequest = new MockHttpServletRequest();
servletRequest.addParameter("onlyStatus", "false");
Expand All @@ -103,6 +116,11 @@ public void testMetrics() {
Assert.assertEquals(1, objectNode.get("responsibleServiceCount").asInt());
Assert.assertEquals(1, objectNode.get("responsibleInstanceCount").asInt());
Assert.assertEquals(ServerStatus.UP.toString(), objectNode.get("status").asText());
Assert.assertEquals(3, objectNode.get("clientCount").asInt());
Assert.assertEquals(1, objectNode.get("connectionBasedClientCount").asInt());
Assert.assertEquals(1, objectNode.get("ephemeralIpPortClientCount").asInt());
Assert.assertEquals(1, objectNode.get("persistentIpPortClientCount").asInt());
Assert.assertEquals(3, objectNode.get("responsibleClientCount").asInt());
}

@Test
Expand Down

0 comments on commit 0b15090

Please sign in to comment.