Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Fix wrong method name #335

Merged
merged 1 commit into from
Nov 17, 2022
Merged

[BUG] Fix wrong method name #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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() {
Expand All @@ -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));

Expand All @@ -118,24 +118,24 @@ 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));

transportTimeSummaryMap.putIfAbsent(SEND_SHUFFLE_DATA_METHOD,
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));
}

}
4 changes: 2 additions & 2 deletions server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/apache/uniffle/server/ShuffleServerGrpcMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Summary> sendTimeSummaryTime = metrics.getTransportTimeSummaryMap();
Map<String, Summary> processTimeSummaryTime = metrics.getProcessTimeSummaryMap();
assertEquals(3, sendTimeSummaryTime.size());
Expand All @@ -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);
}

}