Skip to content

Commit a93f6b3

Browse files
committed
[#2595] Fix error: no suitable constructor found for ShuffleServerGrpcClient
1 parent 7a9be90 commit a93f6b3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcClient.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ private ShuffleCommitResponse doSendCommit(String appId, int shuffleId) {
279279

280280
private AppHeartBeatResponse doSendHeartBeat(String appId, long timeout) {
281281
AppHeartBeatRequest request = AppHeartBeatRequest.newBuilder().setAppId(appId).build();
282-
return blockingStub.withDeadlineAfter(timeout, TimeUnit.MILLISECONDS).appHeartbeat(request);
283282
try {
284283
return RetryUtils.retryWithCondition(
285284
() ->

internal-client/src/main/java/org/apache/uniffle/client/impl/grpc/ShuffleServerGrpcNettyClient.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ public ShuffleServerGrpcNettyClient(RssConf rssConf, String host, int grpcPort,
9494
rssConf == null
9595
? RssClientConf.RPC_TIMEOUT_MS.defaultValue()
9696
: rssConf.getLong(RssClientConf.RPC_TIMEOUT_MS),
97+
rssConf == null
98+
? RssClientConf.RPC_RETRY_BACKOFF_MS.defaultValue()
99+
: rssConf.getLong(RssClientConf.RPC_RETRY_BACKOFF_MS),
97100
rssConf == null
98101
? RssClientConf.RPC_NETTY_PAGE_SIZE.defaultValue()
99102
: rssConf.getInteger(RssClientConf.RPC_NETTY_PAGE_SIZE),
@@ -112,6 +115,7 @@ public ShuffleServerGrpcNettyClient(
112115
int nettyPort,
113116
int maxRetryAttempts,
114117
long rpcTimeoutMs,
118+
long rpcRetryBackoffMs,
115119
int pageSize,
116120
int maxOrder,
117121
int smallCacheSize) {
@@ -121,6 +125,7 @@ public ShuffleServerGrpcNettyClient(
121125
maxRetryAttempts,
122126
rpcTimeoutMs,
123127
true,
128+
rpcRetryBackoffMs,
124129
pageSize,
125130
maxOrder,
126131
smallCacheSize,
@@ -389,7 +394,7 @@ public RssGetShuffleIndexResponse getShuffleIndex(RssGetShuffleIndexRequest requ
389394
public RssGetShuffleDataResponse getShuffleData(RssGetShuffleDataRequest request) {
390395
TransportClient transportClient = getTransportClient();
391396
// Construct old version or v2 get shuffle data request to compatible with old server
392-
GetLocalShuffleDataRequest getLocalShuffleDataRequest = null;
397+
GetLocalShuffleDataRequest getLocalShuffleDataRequest;
393398
if (request.storageIdSpecified()) {
394399
if (request.isNextReadSegmentsReportEnabled()) {
395400
getLocalShuffleDataRequest =

0 commit comments

Comments
 (0)