From 015ab6c36580c8f80bd6dc15f04817b0a00e66e8 Mon Sep 17 00:00:00 2001
From: Junfan Zhang <zuston@apache.org>
Date: Sat, 11 May 2024 10:29:25 +0800
Subject: [PATCH] remove server inactive statusCode

---
 .../java/org/apache/uniffle/common/rpc/StatusCode.java    | 1 -
 .../apache/uniffle/test/ServerInActivateReassignTest.java | 2 +-
 proto/src/main/proto/Rss.proto                            | 1 -
 .../java/org/apache/uniffle/server/ShuffleServer.java     | 2 +-
 .../apache/uniffle/server/ShuffleServerGrpcService.java   | 8 +++++---
 5 files changed, 7 insertions(+), 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
index f5f4ef49cc..79e35ecabe 100644
--- 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/integration-test/spark3/src/test/java/org/apache/uniffle/test/ServerInActivateReassignTest.java b/integration-test/spark3/src/test/java/org/apache/uniffle/test/ServerInActivateReassignTest.java
index ee93464102..d9d8c9bbb7 100644
--- a/integration-test/spark3/src/test/java/org/apache/uniffle/test/ServerInActivateReassignTest.java
+++ b/integration-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
index f9a2ce88be..795f24dacd 100644
--- 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
index d756be7f57..4fb681e98f 100644
--- 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
index f4233ffb49..10733a7d9b 100644
--- 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;