2023.10.01 Merge branch 'dev'

SDPM-lab · Oct 1, 2023 · d30a0e7 · d30a0e7
2 parents cf6afbd + c153eee
commit d30a0e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/Orchestration/Saga/Restarter/Restarter.php b/src/Orchestration/Saga/Restarter/Restarter.php
@@ -75,7 +75,7 @@ public function __construct(?string $orchestratorNumber = null)
     public function reStartOrchestratorsByServer(
         string $className = null,
         $serverName = null,
-        ?bool $isRestart  = false,
+        ?bool $reBuild  = false,
         ?string $time     = null
     ): array {
         if (is_null($className)) {
@@ -96,7 +96,7 @@ public function reStartOrchestratorsByServer(
                     ];
                     continue;
                 } else {
-                    $this->handleSingleServerRestart($singleServerName, $runtimeOrchArray, $isRestart);
+                    $this->handleSingleServerRestart($singleServerName, $runtimeOrchArray, $reBuild);
                 }
             }
         } elseif (is_string($serverName)) {
@@ -107,7 +107,7 @@ public function reStartOrchestratorsByServer(
                     "compensateResult" => "編排器名稱 - {$className} 不存在於 {$serverName} 內。"
                 ];
             } else {
-                $this->handleSingleServerRestart($serverName, $runtimeOrchArray, $isRestart);
+                $this->handleSingleServerRestart($serverName, $runtimeOrchArray, $reBuild);
             }
         }
         return $this->serverRestartResult;
@@ -118,7 +118,7 @@ public function reStartOrchestratorsByServer(
      */
     public function reStartOrchestratorsByClass(
         ?string $className = null,
-        ?bool $isRestart   = false,
+        ?bool $reBuild   = false,
         ?string $time      = null
     ): array {
         if (is_null($className)) {
@@ -127,8 +127,14 @@ public function reStartOrchestratorsByClass(
 
         $serverNameAndRuntimeOrchArray = $this->cacheInstance->getServersOrchestrator($className);
 
+        if($serverNameAndRuntimeOrchArray === null) {
+            return [
+                "compensateResult" => "找不到編排器名稱 - {$className}。"
+            ];
+        }
+
         foreach ($serverNameAndRuntimeOrchArray as $serverName => $runtimeOrchArray) {
-            $this->handleSingleServerRestart($serverName, $runtimeOrchArray, $isRestart);
+            $this->handleSingleServerRestart($serverName, $runtimeOrchArray, $reBuild);
         }
 
         return $this->serverRestartResult;

diff --git a/src/Orchestration/Saga/Restarter/RestarterInterface.php b/src/Orchestration/Saga/Restarter/RestarterInterface.php
@@ -11,29 +11,29 @@ interface RestarterInterface
      *
      * @param string|null $className
      * @param array|string $serverName
-     * @param bool|null $isRestart If pass in true in this param, the restarter will restart the runtime orchestrator after compensation.
+     * @param bool|null $reBuild If pass in true in this param, the restarter will restart the runtime orchestrator after compensation.
      * Otherwise, The restarter will only run the compensation for this runtime orchestrator.
      * @param string|null $time
      * @return array
      */
     public function reStartOrchestratorsByServer(
         string $className = null,
         $serverName = null,
-        ?bool $isRestart  = false,
+        ?bool $reBuild  = false,
         ?string $time = null
     ): array;
 
     /**
      * Re-start all same className runtime orchestrator in Redis no matter what the serverName is.
      *
      * @param string|null $className
-     * @param boolean|null $isRestart
+     * @param boolean|null $reBuild
      * @param string|null $time
      * @return array
      */
     public function reStartOrchestratorsByClass(
         string $className = null,
-        ?bool $isRestart  = false,
+        ?bool $reBuild  = false,
         ?string $time = null
     ): array;