This is an automated email from the ASF dual-hosted git repository. roryqi pushed a commit to branch branch-0.10.bak in repository https://gitbox.apache.org/repos/asf/uniffle.git
commit b10a4bc8212c006c1289a38c713a4e76cea71f9b Author: Junfan Zhang <[email protected]> AuthorDate: Tue Dec 24 11:54:45 2024 +0800 [#2298] fix(server): followup to correct the metric of grpc_get_local_shuffle_index_process_latency (#2302) ### What changes were proposed in this pull request? followup to correct the metric of grpc_get_local_shuffle_index ### Why are the changes needed? Fix: #2298 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Co-authored-by: Junfan Zhang <[email protected]> --- .../org/apache/uniffle/server/ShuffleServerGrpcService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 d0b0213cd..34b586b2b 100644 --- a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java +++ b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java @@ -1294,6 +1294,12 @@ public class ShuffleServerGrpcService extends ShuffleServerImplBase { ShuffleServerMetrics.gaugeReadLocalIndexFileBufferSize.inc(assumedFileSize); GetLocalShuffleIndexResponse.Builder builder = GetLocalShuffleIndexResponse.newBuilder().setStatus(status.toProto()).setRetMsg(msg); + builder.setIndexData(UnsafeByteOperations.unsafeWrap(data)); + builder.setDataFileLen(shuffleIndexResult.getDataFileLen()); + builder.addAllStorageIds( + Arrays.stream(shuffleIndexResult.getStorageIds()) + .boxed() + .collect(Collectors.toList())); long readTime = System.currentTimeMillis() - start; shuffleServer .getGrpcMetrics() @@ -1303,13 +1309,6 @@ public class ShuffleServerGrpcService extends ShuffleServerImplBase { readTime, data.remaining(), requestInfo); - - builder.setIndexData(UnsafeByteOperations.unsafeWrap(data)); - builder.setDataFileLen(shuffleIndexResult.getDataFileLen()); - builder.addAllStorageIds( - Arrays.stream(shuffleIndexResult.getStorageIds()) - .boxed() - .collect(Collectors.toList())); auditContext.withReturnValue("len=" + shuffleIndexResult.getDataFileLen()); reply = builder.build(); } catch (FileNotFoundException indexFileNotFoundException) {
