Merge branch 'sofastack:master' into feature/flexible_raft

sofastack · Dec 2, 2023 · d7b9b94 · d7b9b94
2 parents 7b2f0d5 + 2ea82d6
commit d7b9b94
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 9 deletions.
diff --git a/.github/workflows/cloud_code_scan.yml b/.github/workflows/cloud_code_scan.yml
@@ -0,0 +1,22 @@
+name: Alipay Cloud Devops Codescan
+on:
+  pull_request_target:
+jobs:
+  stc:   # Code security scanning
+    runs-on: ubuntu-latest
+    steps:
+      - name: codeScan
+        uses: layotto/alipay-cloud-devops-codescan@main
+        with:
+          parent_uid: ${{ secrets.ALI_PID }}
+          private_key: ${{ secrets.ALI_PK }}
+          scan_type: stc
+  sca:   # Open source compliance scanning
+    runs-on: ubuntu-latest
+    steps:
+      - name: codeScan
+        uses: layotto/alipay-cloud-devops-codescan@main
+        with:
+          parent_uid: ${{ secrets.ALI_PID }}
+          private_key: ${{ secrets.ALI_PK }}
+          scan_type: sca
diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/FSMCallerImpl.java
@@ -236,7 +236,6 @@ public synchronized void shutdown() {
                 task.shutdownLatch = latch;
             }));
         }
-        doShutdown();
     }
 
     @Override
@@ -453,6 +452,7 @@ private long runApplyTask(final ApplyTask task, long maxCommittedIndex, final bo
                     case SHUTDOWN:
                         this.currTask = TaskType.SHUTDOWN;
                         shutdown = task.shutdownLatch;
+                        doShutdown();
                         break;
                     case FLUSH:
                         this.currTask = TaskType.FLUSH;

diff --git a/jraft-extension/rpc-grpc-impl/src/main/java/io/grpc/internal/ServerStreamHelper.java b/jraft-extension/rpc-grpc-impl/src/main/java/io/grpc/internal/ServerStreamHelper.java
@@ -16,10 +16,10 @@
  */
 package io.grpc.internal;
 
-import io.grpc.ServerCall;
-
 import com.alipay.sofa.jraft.util.internal.ReferenceFieldUpdater;
 import com.alipay.sofa.jraft.util.internal.Updaters;
+import io.grpc.ForwardingServerCall;
+import io.grpc.ServerCall;
 
 /**
  * Get grpc's server stream.
@@ -28,14 +28,23 @@
  */
 public class ServerStreamHelper {
 
-    private static final ReferenceFieldUpdater<ServerCallImpl<?, ?>, ServerStream> STREAM_GETTER = Updaters
-                                                                                                     .newReferenceFieldUpdater(
-                                                                                                         ServerCallImpl.class,
-                                                                                                         "stream");
+    private static final ReferenceFieldUpdater<ServerCallImpl<?, ?>, ServerStream>                                      STREAM_GETTER      = Updaters
+                                                                                                                                               .newReferenceFieldUpdater(
+                                                                                                                                                   ServerCallImpl.class,
+                                                                                                                                                   "stream");
+
+    private static final ReferenceFieldUpdater<ForwardingServerCall.SimpleForwardingServerCall<?, ?>, ServerCall<?, ?>> SERVER_CALL_GETTER = Updaters
+                                                                                                                                               .newReferenceFieldUpdater(
+                                                                                                                                                   ForwardingServerCall.SimpleForwardingServerCall.class,
+                                                                                                                                                   "delegate");
 
     public static ServerStream getServerStream(final ServerCall<?, ?> call) {
-        if (call instanceof ServerCallImpl) {
-            return STREAM_GETTER.get((ServerCallImpl<?, ?>) call);
+        ServerCall<?, ?> lastServerCall = call;
+        if (call instanceof ForwardingServerCall.SimpleForwardingServerCall) {
+            lastServerCall = SERVER_CALL_GETTER.get((ForwardingServerCall.SimpleForwardingServerCall<?, ?>) call);
+        }
+        if (lastServerCall instanceof ServerCallImpl) {
+            return STREAM_GETTER.get((ServerCallImpl<?, ?>) lastServerCall);
         }
         return null;
     }