Skip to content

Commit a6a715f

Browse files
committed
[apache#1764] fix(client): Fix timeout time unit for unregister requests (apache#1766)
### What changes were proposed in this pull request? Method `ThreadUtils.executeTasks` expects milliseconds, but seconds are given. ### Why are the changes needed? Requests are interrupted before the configured timeout passes. Fix: apache#1764 ### Does this PR introduce _any_ user-facing change? Configured timeout is respected. ### How was this patch tested? Manually tested.
1 parent 56f3de0 commit a6a715f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ public void close() {
944944

945945
@Override
946946
public void unregisterShuffle(String appId, int shuffleId) {
947+
int unregisterTimeMs = unregisterRequestTimeSec * 1000;
947948
RssUnregisterShuffleRequest request = new RssUnregisterShuffleRequest(appId, shuffleId);
948949

949950
Map<Integer, Set<ShuffleServerInfo>> appServerMap = shuffleServerInfoMap.get(appId);
@@ -978,7 +979,7 @@ public void unregisterShuffle(String appId, int shuffleId) {
978979
}
979980
return null;
980981
},
981-
unregisterRequestTimeSec,
982+
unregisterTimeMs,
982983
"unregister shuffle server");
983984

984985
} finally {
@@ -991,6 +992,7 @@ public void unregisterShuffle(String appId, int shuffleId) {
991992

992993
@Override
993994
public void unregisterShuffle(String appId) {
995+
int unregisterTimeMs = unregisterRequestTimeSec * 1000;
994996
RssUnregisterShuffleByAppIdRequest request = new RssUnregisterShuffleByAppIdRequest(appId);
995997

996998
if (appId == null) {
@@ -1026,7 +1028,7 @@ public void unregisterShuffle(String appId) {
10261028
}
10271029
return null;
10281030
},
1029-
unregisterRequestTimeSec,
1031+
unregisterTimeMs,
10301032
"unregister shuffle server");
10311033

10321034
} finally {

0 commit comments

Comments
 (0)