This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new ccdb7bb18fe [fix](cloud) add cloud cluster info for `admin show
replica distribution from` (#36382)
ccdb7bb18fe is described below
commit ccdb7bb18fe662ba0e5bbf001de884ca87df9a77
Author: deardeng <565620...@qq.com>
AuthorDate: Wed Jun 19 09:44:21 2024 +0800
[fix](cloud) add cloud cluster info for `admin show replica distribution
from` (#36382)
beforeļ¼
```
mysql> admin show replica distribution from cloud_cache_hotspot;
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+
| BackendId | ReplicaNum | ReplicaSize | NumGraph
| NumPercent | SizeGraph | SizePercent |
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+
| 10002 | 37 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 33.64 % | | 0.00% |
| 10003 | 37 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 33.64 % | | 0.00% |
| 10004 | 36 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 32.73 % | | 0.00% |
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+
```
after
```
mysql> admin show replica distribution from cloud_cache_hotspot;
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+------------------+--------------------+
| BackendId | ReplicaNum | ReplicaSize | NumGraph
| NumPercent | SizeGraph | SizePercent | CloudClusterName | CloudClusterId |
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+------------------+--------------------+
| 10002 | 36 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 32.73 % | | 0.00% | compute_cluster | compute_cluster_id |
| 10003 | 37 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 33.64 % | | 0.00% | compute_cluster | compute_cluster_id |
| 10004 | 37 | 0 | >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
| 33.64 % | | 0.00% | compute_cluster | compute_cluster_id |
+-----------+------------+-------------+-----------------------------------+------------+-----------+-------------+------------------+--------------------+
```
---
.../doris/analysis/ShowReplicaDistributionStmt.java | 1 +
.../java/org/apache/doris/catalog/MetadataViewer.java | 16 ++++++++++++++++
.../java/org/apache/doris/analysis/ShowReplicaTest.java | 4 ++--
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
index 2f6ef278562..6d598be727a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowReplicaDistributionStmt.java
@@ -37,6 +37,7 @@ public class ShowReplicaDistributionStmt extends ShowStmt {
.add("BackendId").add("ReplicaNum").add("ReplicaSize")
.add("NumGraph").add("NumPercent")
.add("SizeGraph").add("SizePercent")
+ .add("CloudClusterName").add("CloudClusterId")
.build();
private TableRef tblRef;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
index 1f1e2599d9c..d2a15d3b164 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/MetadataViewer.java
@@ -24,8 +24,11 @@ import org.apache.doris.analysis.ShowReplicaDistributionStmt;
import org.apache.doris.analysis.ShowReplicaStatusStmt;
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
import org.apache.doris.catalog.Replica.ReplicaStatus;
+import org.apache.doris.cloud.catalog.CloudEnv;
+import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.FeConstants;
+import org.apache.doris.resource.Tag;
import org.apache.doris.system.Backend;
import org.apache.doris.system.SystemInfoService;
@@ -238,6 +241,19 @@ public class MetadataViewer {
row.add(graph(sizeMap.get(beId), totalReplicaSize));
row.add(totalReplicaSize == sizeMap.get(beId) ?
(totalReplicaSize == 0 ? "0.00%" : "100.00%")
: df.format((double) sizeMap.get(beId) /
totalReplicaSize));
+ if (Config.isNotCloudMode()) {
+ row.add("");
+ row.add("");
+ } else {
+ Backend be =
CloudEnv.getCurrentSystemInfo().getBackend(beId);
+ if (be != null) {
+ row.add(be.getTagMap().get(Tag.CLOUD_CLUSTER_NAME));
+ row.add(be.getTagMap().get(Tag.CLOUD_CLUSTER_ID));
+ } else {
+ row.add("not exist be");
+ row.add("not exist be");
+ }
+ }
result.add(row);
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
index 54debab9a63..ba6db9f812c 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowReplicaTest.java
@@ -57,7 +57,7 @@ public class ShowReplicaTest extends TestWithFeService {
ShowExecutor executor = new ShowExecutor(connectContext, stmt);
ShowResultSet resultSet = executor.execute();
Assert.assertEquals(1, resultSet.getResultRows().size());
- Assert.assertEquals(7, resultSet.getResultRows().get(0).size());
+ Assert.assertEquals(9, resultSet.getResultRows().get(0).size());
stmtStr = "show data skew from test.tbl1 partition(p1)";
ShowDataSkewStmt skewStmt = (ShowDataSkewStmt)
parseAndAnalyzeStmt(stmtStr);
@@ -83,7 +83,7 @@ public class ShowReplicaTest extends TestWithFeService {
executor = new ShowExecutor(connectContext, stmt);
resultSet = executor.execute();
Assert.assertEquals(1, resultSet.getResultRows().size());
- Assert.assertEquals(7, resultSet.getResultRows().get(0).size());
+ Assert.assertEquals(9, resultSet.getResultRows().get(0).size());
executor = new ShowExecutor(connectContext, skewStmt);
resultSet = executor.execute();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
