remove server inactive statusCode

apache · May 11, 2024 · 015ab6c · 015ab6c
1 parent 15363bd
commit 015ab6c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/common/src/main/java/org/apache/uniffle/common/rpc/StatusCode.java b/common/src/main/java/org/apache/uniffle/common/rpc/StatusCode.java
@@ -35,7 +35,6 @@ public enum StatusCode {
   ACCESS_DENIED(8),
   INVALID_REQUEST(9),
   NO_BUFFER_FOR_HUGE_PARTITION(10),
-  SERVER_INACTIVE(11),
   UNKNOWN(-1);
 
   static final Map<Integer, StatusCode> VALUE_MAP =

diff --git a/...ation-test/spark3/src/test/java/org/apache/uniffle/test/ServerInActivateReassignTest.java b/...ation-test/spark3/src/test/java/org/apache/uniffle/test/ServerInActivateReassignTest.java
@@ -93,7 +93,7 @@ public void updateSparkConfCustomer(SparkConf sparkConf) {
         (ShuffleServerGrpcService)
             ((GrpcServer) shuffleServer.getServer()).getServicesWithInterceptors().get(0).getKey();
     ShuffleServer spy = spy(shuffleServer);
-    when(spy.isActivateClientPartitionReassign()).thenReturn(true);
+    when(spy.isActivateClientReassign()).thenReturn(true);
     grpcServer.setShuffleServer(spy);
   }
 }
diff --git a/proto/src/main/proto/Rss.proto b/proto/src/main/proto/Rss.proto
@@ -306,7 +306,6 @@ enum StatusCode {
   ACCESS_DENIED = 8;
   INVALID_REQUEST = 9;
   NO_BUFFER_FOR_HUGE_PARTITION = 10;
-  SERVER_INACTIVE = 11;
   // add more status
 }
 

diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServer.java
@@ -551,7 +551,7 @@ public void sendHeartbeat() {
         shuffleServer.getNettyPort());
   }
 
-  public boolean isActivateClientPartitionReassign() {
+  public boolean isActivateClientReassign() {
     if (decommissionActivateClientReassignEnabled && serverStatus.get() != ServerStatus.ACTIVE) {
       return true;
     }

diff --git a/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java b/server/src/main/java/org/apache/uniffle/server/ShuffleServerGrpcService.java
@@ -428,15 +428,17 @@ public void finishShuffle(
   public void requireBuffer(
       RequireBufferRequest request, StreamObserver<RequireBufferResponse> responseObserver) {
     String appId = request.getAppId();
-    if (shuffleServer.isActivateClientPartitionReassign()
+    if (shuffleServer.isActivateClientReassign()
         && shuffleServer
             .getShuffleTaskManager()
             .getShuffleTaskInfo(appId)
             .isBlockFailureReassignEnabled()) {
       responseObserver.onNext(
           RequireBufferResponse.newBuilder()
-              .setStatus(StatusCode.SERVER_INACTIVE.toProto())
-              .setRetMsg("Server is inactive, status: " + shuffleServer.getServerStatus())
+              .setStatus(StatusCode.ACCESS_DENIED.toProto())
+              .setRetMsg(
+                  "Access is denied that server is inactive, status: "
+                      + shuffleServer.getServerStatus())
               .build());
       responseObserver.onCompleted();
       return;