Add condition to match serviceKey. (#13869)
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java
index e16d7e4..4eac865 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/ChangeTelnet.java
@@ -58,7 +58,8 @@
for (Exporter<?> exporter : dubboProtocol.getExporters()) {
if (message.equals(exporter.getInvoker().getInterface().getSimpleName())
|| message.equals(exporter.getInvoker().getInterface().getName())
- || message.equals(exporter.getInvoker().getUrl().getPath())) {
+ || message.equals(exporter.getInvoker().getUrl().getPath())
+ || message.equals(exporter.getInvoker().getUrl().getServiceKey())) {
found = true;
break;
}
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java
index 9d89c98..425f470 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/CountTelnet.java
@@ -85,7 +85,8 @@
for (Exporter<?> exporter : dubboProtocol.getExporters()) {
if (service.equals(exporter.getInvoker().getInterface().getSimpleName())
|| service.equals(exporter.getInvoker().getInterface().getName())
- || service.equals(exporter.getInvoker().getUrl().getPath())) {
+ || service.equals(exporter.getInvoker().getUrl().getPath())
+ || service.equals(exporter.getInvoker().getUrl().getServiceKey())) {
invoker = exporter.getInvoker();
break;
}
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java
index 6a8b675..a182a5e 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ChangeTelnetTest.java
@@ -71,7 +71,7 @@
mockChannel.attr(ChangeTelnet.SERVICE_KEY).set("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService");
given(mockCommandContext.getRemote()).willReturn(mockChannel);
given(mockInvoker.getInterface()).willReturn(DemoService.class);
- given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo"));
+ given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20884/demo?group=g&version=1.0.0"));
}
@AfterEach
@@ -111,6 +111,15 @@
}
@Test
+ void testChangeServiceKey() {
+ ExtensionLoader.getExtensionLoader(Protocol.class)
+ .getExtension(DubboProtocol.NAME)
+ .export(mockInvoker);
+ String result = change.execute(mockCommandContext, new String[] {"g/demo:1.0.0"});
+ assertEquals("Used the g/demo:1.0.0 as default.\r\nYou can cancel default service by command: cd /", result);
+ }
+
+ @Test
void testChangeMessageNull() {
String result = change.execute(mockCommandContext, null);
assertEquals("Please input service name, eg: \r\ncd XxxService\r\ncd com.xxx.XxxService", result);
diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java
index 0777e39..a1eafa4 100644
--- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java
+++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/CountTelnetTest.java
@@ -52,7 +52,7 @@
private CommandContext mockCommandContext;
private CountDownLatch latch;
- private final URL url = URL.valueOf("dubbo://127.0.0.1:20884/demo");
+ private final URL url = URL.valueOf("dubbo://127.0.0.1:20884/demo?group=g&version=1.0.0");
@BeforeEach
public void setUp() {
@@ -70,12 +70,14 @@
public void tearDown() {
FrameworkModel.destroyAll();
mockChannel.close();
+ RpcStatus.removeStatus(url);
reset(mockInvoker, mockCommandContext);
}
@Test
void test() throws Exception {
String methodName = "sayHello";
+ RpcStatus.removeStatus(url, methodName);
String[] args = new String[] {"org.apache.dubbo.qos.legacy.service.DemoService", "sayHello", "1"};
ExtensionLoader.getExtensionLoader(Protocol.class)
@@ -94,6 +96,28 @@
assertThat(sb.toString(), containsString(buildTable(methodName, 10, 10, "1", "0", "0")));
}
+ @Test
+ void testCountByServiceKey() throws Exception {
+ String methodName = "sayHello";
+ RpcStatus.removeStatus(url, methodName);
+ String[] args = new String[] {"g/demo:1.0.0", "sayHello", "1"};
+
+ ExtensionLoader.getExtensionLoader(Protocol.class)
+ .getExtension(DubboProtocol.NAME)
+ .export(mockInvoker);
+ RpcStatus.beginCount(url, methodName);
+ RpcStatus.endCount(url, methodName, 10L, true);
+ count.execute(mockCommandContext, args);
+ latch.await();
+
+ StringBuilder sb = new StringBuilder();
+ for (Object o : mockChannel.getReceivedObjects()) {
+ sb.append(o.toString());
+ }
+
+ assertThat(sb.toString(), containsString(buildTable(methodName, 10, 10, "1", "0", "0")));
+ }
+
public static String buildTable(
String methodName, long averageElapsed, long maxElapsed, String total, String failed, String active) {
List<String> header = new LinkedList<>();
