This is an automated email from the ASF dual-hosted git repository.
zuston pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new a0e88da59 [MINOR] fix(server): Use warn log level when unable to
acquire memory (#1733)
a0e88da59 is described below
commit a0e88da59f9c7c30d43120c7fa88ec1d0736a616
Author: RickyMa <[email protected]>
AuthorDate: Thu May 23 11:27:01 2024 +0800
[MINOR] fix(server): Use warn log level when unable to acquire memory
(#1733)
### What changes were proposed in this pull request?
Use warn log when unable to acquire memory.
### Why are the changes needed?
No need to use error log, because clients will retry for many times.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
No need.
---
.../java/org/apache/uniffle/server/ShuffleServerGrpcService.java | 6 +++---
.../src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java | 2 +-
.../java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java | 2 +-
.../org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java | 6 +++---
4 files changed, 8 insertions(+), 8 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 c088242c8..7b14d981d 100644
---
a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
+++
b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
@@ -728,7 +728,7 @@ public class ShuffleServerGrpcService extends
ShuffleServerImplBase {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get shuffle data";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
reply =
GetLocalShuffleDataResponse.newBuilder()
.setStatus(status.toProto())
@@ -825,7 +825,7 @@ public class ShuffleServerGrpcService extends
ShuffleServerImplBase {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get shuffle index";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
reply =
GetLocalShuffleIndexResponse.newBuilder()
.setStatus(status.toProto())
@@ -932,7 +932,7 @@ public class ShuffleServerGrpcService extends
ShuffleServerImplBase {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get in memory shuffle data";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
reply =
GetMemoryShuffleDataResponse.newBuilder()
.setData(UnsafeByteOperations.unsafeWrap(new byte[] {}))
diff --git
a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
index 87e5a5eff..0a07f70f2 100644
--- a/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
+++ b/server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
@@ -516,7 +516,7 @@ public class ShuffleTaskManager {
new PreAllocatedBufferInfo(appId, requireId,
System.currentTimeMillis(), requireSize));
return requireId;
} else {
- LOG.error("Failed to require buffer, require size: {}", requireSize);
+ LOG.warn("Failed to require buffer, require size: {}", requireSize);
throw new NoBufferException("No Buffer For Regular Partition,
requireSize: " + requireSize);
}
}
diff --git
a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
index 79d619fcd..257af9319 100644
---
a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
+++
b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferManager.java
@@ -455,7 +455,7 @@ public class ShuffleBufferManager {
} while (true);
if (!isSuccessful) {
- LOG.error(
+ LOG.warn(
"Can't require["
+ size
+ "] for read data, current["
diff --git
a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
index 475dc8845..668b53cba 100644
---
a/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
+++
b/server/src/main/java/org/apache/uniffle/server/netty/ShuffleServerNettyHandler.java
@@ -313,7 +313,7 @@ public class ShuffleServerNettyHandler implements
BaseMessageHandler {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get in memory shuffle data";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
response =
new GetMemoryShuffleDataResponse(
req.getRequestId(), status, msg, Lists.newArrayList(),
Unpooled.EMPTY_BUFFER);
@@ -399,7 +399,7 @@ public class ShuffleServerNettyHandler implements
BaseMessageHandler {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get shuffle index";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
response =
new GetLocalShuffleIndexResponse(
req.getRequestId(), status, msg, Unpooled.EMPTY_BUFFER, 0L);
@@ -495,7 +495,7 @@ public class ShuffleServerNettyHandler implements
BaseMessageHandler {
} else {
status = StatusCode.NO_BUFFER;
msg = "Can't require memory to get shuffle data";
- LOG.error(msg + " for " + requestInfo);
+ LOG.warn("{} for {}", msg, requestInfo);
response =
new GetLocalShuffleDataResponse(
req.getRequestId(), status, msg, new
NettyManagedBuffer(Unpooled.EMPTY_BUFFER));
