[INLONG-4934][Bug] Reversed value for admin_enable_stats methods (apa…

…che#4935)
bruceneenhl · Aug 12, 2022 · 7d62400 · 7d62400
1 parent 804f00a
commit 7d62400
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...q-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java b/...q-server/src/main/java/org/apache/inlong/tubemq/server/broker/web/BrokerAdminServlet.java
@@ -1253,7 +1253,7 @@ public void adminDisableMetricsStats(HttpServletRequest req,
             return;
         }
         String statsType = (String) result.getRetData();
-        innEnableOrDisableMetricsStats(true, statsType, req, sBuffer);
+        innEnableOrDisableMetricsStats(false, statsType, req, sBuffer);
     }
 
     /**
@@ -1297,7 +1297,7 @@ private void innEnableOrDisableMetricsStats(boolean enable,
                 if (count++ > 0) {
                     sBuffer.append(",");
                 }
-                sBuffer.append(metricType.getDesc());
+                sBuffer.append(metricType.getName());
             }
             sBuffer.append("]\"}");
             return;

diff --git a/...-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java b/...-server/src/main/java/org/apache/inlong/tubemq/server/common/utils/WebParameterUtils.java
@@ -389,7 +389,7 @@ public static boolean isValidPortsSet(int brokerPort, int brokerTlsPort,
                             .append(", the value of ")
                             .append(WebFieldDef.BROKERPORT.name).append(" or ")
                             .append(WebFieldDef.BROKERTLSPORT.name)
-                            .append(" cannot be the same as the value of")
+                            .append(" cannot be the same as the value of ")
                             .append(WebFieldDef.BROKERWEBPORT.name).toString());
             strBuff.delete(0, strBuff.length());
             return result.isSuccess();

diff --git a/...ain/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java b/...ain/java/org/apache/inlong/tubemq/server/master/web/handler/WebAdminGroupCtrlHandler.java
@@ -356,7 +356,7 @@ public StringBuilder adminQueryConsumeGroupSetting(HttpServletRequest req,
                     .append("\",\"enableBind\":1,\"allowedBClientRate\":")
                     .append(entry.getAllowedBrokerClientRate())
                     .append(",\"attributes\":\"\",\"lastBindUsedDate\":\"-\"")
-                    .append("\",\"dataVersionId\":").append(entry.getDataVerId())
+                    .append(",\"dataVersionId\":").append(entry.getDataVerId())
                     .append(",\"createUser\":\"").append(entry.getCreateUser())
                     .append("\",\"createDate\":\"").append(entry.getCreateDateStr())
                     .append("\",\"modifyUser\":\"").append(entry.getModifyUser())

diff --git a/...src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java b/...src/main/java/org/apache/inlong/tubemq/server/master/web/handler/WebOtherInfoHandler.java
@@ -409,7 +409,7 @@ public StringBuilder adminDisableMetricsStats(HttpServletRequest req,
             return sBuffer;
         }
         String statsType = (String) result.getRetData();
-        innEnableOrDisableMetricsStats(true, statsType, req, sBuffer, result);
+        innEnableOrDisableMetricsStats(false, statsType, req, sBuffer, result);
         return sBuffer;
     }
 
@@ -458,7 +458,7 @@ private StringBuilder innEnableOrDisableMetricsStats(boolean enable,
                 if (count++ > 0) {
                     sBuffer.append(",");
                 }
-                sBuffer.append(metricType.getDesc());
+                sBuffer.append(metricType.getName());
             }
             sBuffer.append("]\"}");
             return sBuffer;