You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uniffle.apache.org by xi...@apache.org on 2023/01/12 12:56:53 UTC
[incubator-uniffle] branch master updated: [Improvement] Remove some unused empty server metrics (#474)
This is an automated email from the ASF dual-hosted git repository.
xianjin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new f4048fc9 [Improvement] Remove some unused empty server metrics (#474)
f4048fc9 is described below
commit f4048fc9dc11b1da642e6e97e540ea98b57d490c
Author: Junfan Zhang <zu...@apache.org>
AuthorDate: Thu Jan 12 20:56:48 2023 +0800
[Improvement] Remove some unused empty server metrics (#474)
### What changes were proposed in this pull request?
[Improvement] Remove some unused empty server metrics
### Why are the changes needed?
1. Remove these empty metrics to avoid user confusion
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Don't need
---
.../org/apache/uniffle/server/ShuffleServerMetrics.java | 15 ---------------
.../apache/uniffle/server/ShuffleServerMetricsTest.java | 6 +++---
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerMetrics.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerMetrics.java
index 60071ef3..1bf42a92 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerMetrics.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerMetrics.java
@@ -63,14 +63,9 @@ public class ShuffleServerMetrics {
private static final String LOCAL_STORAGE_USED_SPACE_RATIO = "local_storage_used_space_ratio";
private static final String IS_HEALTHY = "is_healthy";
- private static final String REGISTERED_SHUFFLE = "registered_shuffle";
- private static final String REGISTERED_SHUFFLE_ENGINE = "registered_shuffle_engine";
- private static final String BUFFERED_DATA_SIZE = "buffered_data_size";
private static final String ALLOCATED_BUFFER_SIZE = "allocated_buffer_size";
private static final String IN_FLUSH_BUFFER_SIZE = "in_flush_buffer_size";
private static final String USED_BUFFER_SIZE = "used_buffer_size";
- private static final String TOTAL_UPLOAD_SIZE = "total_upload_size";
- private static final String TOTAL_UPLOAD_TIME_S = "total_upload_time_s";
private static final String TOTAL_FAILED_WRITTEN_EVENT_NUM = "total_failed_written_event_num";
private static final String TOTAL_DROPPED_EVENT_NUM = "total_dropped_event_num";
private static final String TOTAL_HDFS_WRITE_DATA = "total_hdfs_write_data";
@@ -101,8 +96,6 @@ public class ShuffleServerMetrics {
public static Counter counterTotalReadLocalIndexFileSize;
public static Counter counterTotalReadMemoryDataSize;
public static Counter counterTotalReadTime;
- public static Counter counterTotalUploadSize;
- public static Counter counterTotalUploadTimeS;
public static Counter counterTotalFailedWrittenEventNum;
public static Counter counterTotalDroppedEventNum;
public static Counter counterTotalHdfsWriteDataSize;
@@ -123,9 +116,6 @@ public class ShuffleServerMetrics {
public static Gauge gaugeLocalStorageUsedSpaceRatio;
public static Gauge gaugeIsHealthy;
- public static Gauge gaugeRegisteredShuffle;
- public static Gauge gaugeRegisteredShuffleEngine;
- public static Gauge gaugeBufferDataSize;
public static Gauge gaugeAllocatedBufferSize;
public static Gauge gaugeInFlushBufferSize;
public static Gauge gaugeUsedBufferSize;
@@ -250,8 +240,6 @@ public class ShuffleServerMetrics {
counterTotalReadLocalIndexFileSize = metricsManager.addCounter(TOTAL_READ_LOCAL_INDEX_FILE);
counterTotalReadMemoryDataSize = metricsManager.addCounter(TOTAL_READ_MEMORY_DATA);
counterTotalReadTime = metricsManager.addCounter(TOTAL_READ_TIME);
- counterTotalUploadSize = metricsManager.addCounter(TOTAL_UPLOAD_SIZE);
- counterTotalUploadTimeS = metricsManager.addCounter(TOTAL_UPLOAD_TIME_S);
counterTotalDroppedEventNum = metricsManager.addCounter(TOTAL_DROPPED_EVENT_NUM);
counterTotalFailedWrittenEventNum = metricsManager.addCounter(TOTAL_FAILED_WRITTEN_EVENT_NUM);
counterTotalHdfsWriteDataSize = metricsManager.addCounter(TOTAL_HDFS_WRITE_DATA);
@@ -272,9 +260,6 @@ public class ShuffleServerMetrics {
gaugeLocalStorageUsedSpaceRatio = metricsManager.addGauge(LOCAL_STORAGE_USED_SPACE_RATIO);
gaugeIsHealthy = metricsManager.addGauge(IS_HEALTHY);
- gaugeRegisteredShuffle = metricsManager.addGauge(REGISTERED_SHUFFLE);
- gaugeRegisteredShuffleEngine = metricsManager.addGauge(REGISTERED_SHUFFLE_ENGINE);
- gaugeBufferDataSize = metricsManager.addGauge(BUFFERED_DATA_SIZE);
gaugeAllocatedBufferSize = metricsManager.addGauge(ALLOCATED_BUFFER_SIZE);
gaugeInFlushBufferSize = metricsManager.addGauge(IN_FLUSH_BUFFER_SIZE);
gaugeUsedBufferSize = metricsManager.addGauge(USED_BUFFER_SIZE);
diff --git a/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java b/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
index 24da7b0e..b995a90f 100644
--- a/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/ShuffleServerMetricsTest.java
@@ -156,7 +156,7 @@ public class ShuffleServerMetricsTest {
public void testServerMetricsConcurrently() throws Exception {
ExecutorService executorService = Executors.newFixedThreadPool(3);
List<Callable<Void>> calls = new ArrayList<>();
- ShuffleServerMetrics.gaugeBufferDataSize.set(0);
+ ShuffleServerMetrics.gaugeInFlushBufferSize.set(0);
long expectedNum = 0;
for (int i = 1; i < 5; ++i) {
@@ -165,7 +165,7 @@ public class ShuffleServerMetricsTest {
calls.add(new Callable<Void>() {
@Override
public Void call() throws Exception {
- ShuffleServerMetrics.gaugeBufferDataSize.inc(cur);
+ ShuffleServerMetrics.gaugeInFlushBufferSize.inc(cur);
return null;
}
});
@@ -174,7 +174,7 @@ public class ShuffleServerMetricsTest {
calls.add(new Callable<Void>() {
@Override
public Void call() throws Exception {
- ShuffleServerMetrics.gaugeBufferDataSize.dec(cur);
+ ShuffleServerMetrics.gaugeInFlushBufferSize.dec(cur);
return null;
}
});