From a6a715fb2bf6660253299608b18fb1794dddb06e Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Tue, 4 Jun 2024 10:53:17 +0200 Subject: [PATCH] [#1764] fix(client): Fix timeout time unit for unregister requests (#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: #1764 ### Does this PR introduce _any_ user-facing change? Configured timeout is respected. ### How was this patch tested? Manually tested. --- .../apache/uniffle/client/impl/ShuffleWriteClientImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java b/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java index 129dadc173..7912e098df 100644 --- a/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java +++ b/client/src/main/java/org/apache/uniffle/client/impl/ShuffleWriteClientImpl.java @@ -944,6 +944,7 @@ public void close() { @Override public void unregisterShuffle(String appId, int shuffleId) { + int unregisterTimeMs = unregisterRequestTimeSec * 1000; RssUnregisterShuffleRequest request = new RssUnregisterShuffleRequest(appId, shuffleId); Map> appServerMap = shuffleServerInfoMap.get(appId); @@ -978,7 +979,7 @@ public void unregisterShuffle(String appId, int shuffleId) { } return null; }, - unregisterRequestTimeSec, + unregisterTimeMs, "unregister shuffle server"); } finally { @@ -991,6 +992,7 @@ public void unregisterShuffle(String appId, int shuffleId) { @Override public void unregisterShuffle(String appId) { + int unregisterTimeMs = unregisterRequestTimeSec * 1000; RssUnregisterShuffleByAppIdRequest request = new RssUnregisterShuffleByAppIdRequest(appId); if (appId == null) { @@ -1026,7 +1028,7 @@ public void unregisterShuffle(String appId) { } return null; }, - unregisterRequestTimeSec, + unregisterTimeMs, "unregister shuffle server"); } finally {