From 6bcbaf608d8e3fc0de32899b1fb85ca09e4c813c Mon Sep 17 00:00:00 2001 From: leixianming Date: Thu, 17 Nov 2022 20:06:09 +0800 Subject: [PATCH] Fix wrong method name. --- .../server/ShuffleServerGrpcMetrics.java | 32 +++++++++---------- .../server/ShuffleServerGrpcService.java | 4 +-- .../server/ShuffleServerGrpcMetricsTest.java | 8 ++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcMetrics.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcMetrics.java index e83d7b85e6..5ecd75c3d2 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcMetrics.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcMetrics.java @@ -30,7 +30,7 @@ public class ShuffleServerGrpcMetrics extends GRPCMetrics { public static final String REPORT_SHUFFLE_RESULT_METHOD = "reportShuffleResult"; public static final String GET_SHUFFLE_RESULT_METHOD = "getShuffleResult"; public static final String GET_SHUFFLE_DATA_METHOD = "getLocalShuffleData"; - public static final String GET_IN_MEMORY_SHUFFLE_DATA_METHOD = "getInMemoryShuffleData"; + public static final String GET_MEMORY_SHUFFLE_DATA_METHOD = "getMemoryShuffleData"; public static final String GET_SHUFFLE_INDEX_METHOD = "getLocalShuffleIndex"; private static final String GRPC_REGISTERED_SHUFFLE = "grpc_registered_shuffle"; @@ -42,7 +42,7 @@ public class ShuffleServerGrpcMetrics extends GRPCMetrics { private static final String GRPC_REPORT_SHUFFLE_RESULT = "grpc_report_shuffle_result"; private static final String GRPC_GET_SHUFFLE_RESULT = "grpc_get_shuffle_result"; private static final String GRPC_GET_SHUFFLE_DATA = "grpc_get_local_shuffle_data"; - private static final String GRPC_GET_IN_MEMORY_SHUFFLE_DATA = "grpc_get_in_memory_shuffle_data"; + private static final String GRPC_GET_MEMORY_SHUFFLE_DATA = "grpc_get_memory_shuffle_data"; private static final String GRPC_GET_SHUFFLE_INDEX = "grpc_get_local_shuffle_index"; private static final String GRPC_OPEN = "grpc_open"; @@ -56,21 +56,21 @@ public class ShuffleServerGrpcMetrics extends GRPCMetrics { private static final String GRPC_REPORT_SHUFFLE_RESULT_TOTAL = "grpc_report_shuffle_result_total"; private static final String GRPC_GET_SHUFFLE_RESULT_TOTAL = "grpc_get_shuffle_result_total"; private static final String GRPC_GET_SHUFFLE_DATA_TOTAL = "grpc_get_local_shuffle_data_total"; - private static final String GRPC_GET_IN_MEMORY_SHUFFLE_DATA_TOTAL = - "grpc_get_in_memory_shuffle_data_total"; + private static final String GRPC_GET_MEMORY_SHUFFLE_DATA_TOTAL = + "grpc_get_memory_shuffle_data_total"; private static final String GRPC_GET_SHUFFLE_INDEX_TOTAL = "grpc_get_local_shuffle_index_total"; private static final String GRPC_SEND_SHUFFLE_DATA_TRANSPORT_LATENCY = "grpc_send_shuffle_data_transport_latency"; private static final String GRPC_GET_SHUFFLE_DATA_TRANSPORT_LATENCY = "grpc_get_local_shuffle_data_transport_latency"; - private static final String GRPC_GET_IN_MEMORY_SHUFFLE_DATA_TRANSPORT_LATENCY = - "grpc_get_in_memory_shuffle_data_transport_latency"; + private static final String GRPC_GET_MEMORY_SHUFFLE_DATA_TRANSPORT_LATENCY = + "grpc_get_memory_shuffle_data_transport_latency"; private static final String GRPC_SEND_SHUFFLE_DATA_PROCESS_LATENCY = "grpc_send_shuffle_data_process_latency"; private static final String GRPC_GET_SHUFFLE_DATA_PROCESS_LATENCY = "grpc_get_local_shuffle_data_process_latency"; - private static final String GRPC_GET_IN_MEMORY_SHUFFLE_DATA_PROCESS_LATENCY = - "grpc_get_in_memory_shuffle_data_process_latency"; + private static final String GRPC_GET_MEMORY_SHUFFLE_DATA_PROCESS_LATENCY = + "grpc_get_memory_shuffle_data_process_latency"; @Override public void registerMetrics() { @@ -95,8 +95,8 @@ public void registerMetrics() { metricsManager.addGauge(GRPC_GET_SHUFFLE_RESULT)); gaugeMap.putIfAbsent(GET_SHUFFLE_DATA_METHOD, metricsManager.addGauge(GRPC_GET_SHUFFLE_DATA)); - gaugeMap.putIfAbsent(GET_IN_MEMORY_SHUFFLE_DATA_METHOD, - metricsManager.addGauge(GRPC_GET_IN_MEMORY_SHUFFLE_DATA)); + gaugeMap.putIfAbsent(GET_MEMORY_SHUFFLE_DATA_METHOD, + metricsManager.addGauge(GRPC_GET_MEMORY_SHUFFLE_DATA)); gaugeMap.putIfAbsent(GET_SHUFFLE_INDEX_METHOD, metricsManager.addGauge(GRPC_GET_SHUFFLE_INDEX)); @@ -118,8 +118,8 @@ public void registerMetrics() { metricsManager.addCounter(GRPC_GET_SHUFFLE_RESULT_TOTAL)); counterMap.putIfAbsent(GET_SHUFFLE_DATA_METHOD, metricsManager.addCounter(GRPC_GET_SHUFFLE_DATA_TOTAL)); - counterMap.putIfAbsent(GET_IN_MEMORY_SHUFFLE_DATA_METHOD, - metricsManager.addCounter(GRPC_GET_IN_MEMORY_SHUFFLE_DATA_TOTAL)); + counterMap.putIfAbsent(GET_MEMORY_SHUFFLE_DATA_METHOD, + metricsManager.addCounter(GRPC_GET_MEMORY_SHUFFLE_DATA_TOTAL)); counterMap.putIfAbsent(GET_SHUFFLE_INDEX_METHOD, metricsManager.addCounter(GRPC_GET_SHUFFLE_INDEX_TOTAL)); @@ -127,15 +127,15 @@ public void registerMetrics() { metricsManager.addSummary(GRPC_SEND_SHUFFLE_DATA_TRANSPORT_LATENCY)); transportTimeSummaryMap.putIfAbsent(GET_SHUFFLE_DATA_METHOD, metricsManager.addSummary(GRPC_GET_SHUFFLE_DATA_TRANSPORT_LATENCY)); - transportTimeSummaryMap.putIfAbsent(GET_IN_MEMORY_SHUFFLE_DATA_METHOD, - metricsManager.addSummary(GRPC_GET_IN_MEMORY_SHUFFLE_DATA_TRANSPORT_LATENCY)); + transportTimeSummaryMap.putIfAbsent(GET_MEMORY_SHUFFLE_DATA_METHOD, + metricsManager.addSummary(GRPC_GET_MEMORY_SHUFFLE_DATA_TRANSPORT_LATENCY)); processTimeSummaryMap.putIfAbsent(SEND_SHUFFLE_DATA_METHOD, metricsManager.addSummary(GRPC_SEND_SHUFFLE_DATA_PROCESS_LATENCY)); processTimeSummaryMap.putIfAbsent(GET_SHUFFLE_DATA_METHOD, metricsManager.addSummary(GRPC_GET_SHUFFLE_DATA_PROCESS_LATENCY)); - processTimeSummaryMap.putIfAbsent(GET_IN_MEMORY_SHUFFLE_DATA_METHOD, - metricsManager.addSummary(GRPC_GET_IN_MEMORY_SHUFFLE_DATA_PROCESS_LATENCY)); + processTimeSummaryMap.putIfAbsent(GET_MEMORY_SHUFFLE_DATA_METHOD, + metricsManager.addSummary(GRPC_GET_MEMORY_SHUFFLE_DATA_PROCESS_LATENCY)); } } diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java index 2d857264f2..055e5d3e80 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java @@ -639,7 +639,7 @@ public void getMemoryShuffleData(GetMemoryShuffleDataRequest request, long transportTime = System.currentTimeMillis() - timestamp; if (transportTime > 0) { shuffleServer.getGrpcMetrics().recordTransportTime( - ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD, transportTime); + ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD, transportTime); } } long start = System.currentTimeMillis(); @@ -664,7 +664,7 @@ public void getMemoryShuffleData(GetMemoryShuffleDataRequest request, } long costTime = System.currentTimeMillis() - start; shuffleServer.getGrpcMetrics().recordProcessTime( - ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD, costTime); + ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD, costTime); LOG.info("Successfully getInMemoryShuffleData cost {} ms with {} bytes shuffle" + " data for {}", costTime, data.length, requestInfo); diff --git a/server/src/test/java/org/apache/uniffle/server/ShuffleServerGrpcMetricsTest.java b/server/src/test/java/org/apache/uniffle/server/ShuffleServerGrpcMetricsTest.java index 33e2a9d573..6f5c39dbca 100644 --- a/server/src/test/java/org/apache/uniffle/server/ShuffleServerGrpcMetricsTest.java +++ b/server/src/test/java/org/apache/uniffle/server/ShuffleServerGrpcMetricsTest.java @@ -32,10 +32,10 @@ public void testLatencyMetrics() { metrics.register(new CollectorRegistry(true)); metrics.recordTransportTime(ShuffleServerGrpcMetrics.SEND_SHUFFLE_DATA_METHOD, 1000); metrics.recordTransportTime(ShuffleServerGrpcMetrics.GET_SHUFFLE_DATA_METHOD, 500); - metrics.recordTransportTime(ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD, 200); + metrics.recordTransportTime(ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD, 200); metrics.recordProcessTime(ShuffleServerGrpcMetrics.SEND_SHUFFLE_DATA_METHOD, 1000); metrics.recordProcessTime(ShuffleServerGrpcMetrics.GET_SHUFFLE_DATA_METHOD, 500); - metrics.recordProcessTime(ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD, 200); + metrics.recordProcessTime(ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD, 200); Map sendTimeSummaryTime = metrics.getTransportTimeSummaryMap(); Map processTimeSummaryTime = metrics.getProcessTimeSummaryMap(); assertEquals(3, sendTimeSummaryTime.size()); @@ -46,14 +46,14 @@ public void testLatencyMetrics() { assertEquals(0.5D, sendTimeSummaryTime.get( ShuffleServerGrpcMetrics.GET_SHUFFLE_DATA_METHOD).get().sum); assertEquals(0.2D, sendTimeSummaryTime.get( - ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD).get().sum); + ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD).get().sum); assertEquals(1D, processTimeSummaryTime.get( ShuffleServerGrpcMetrics.SEND_SHUFFLE_DATA_METHOD).get().sum); assertEquals(0.5D, processTimeSummaryTime.get( ShuffleServerGrpcMetrics.GET_SHUFFLE_DATA_METHOD).get().sum); assertEquals(0.2D, processTimeSummaryTime.get( - ShuffleServerGrpcMetrics.GET_IN_MEMORY_SHUFFLE_DATA_METHOD).get().sum); + ShuffleServerGrpcMetrics.GET_MEMORY_SHUFFLE_DATA_METHOD).get().sum); } }