add stop biz state (#1026)

* add stop biz state * update ark version * fix test
sofastack · Nov 13, 2024 · 7ab39b4 · 7ab39b4
1 parent 9c3de26
commit 7ab39b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,8 +14,8 @@
     </modules>
 
     <properties>
-        <sofa.ark.version>2.2.15</sofa.ark.version>
-        <sofa.ark.version.old>2.2.14</sofa.ark.version.old>
+        <sofa.ark.version>2.2.16-SNAPSHOT</sofa.ark.version>
+        <sofa.ark.version.old>2.2.15</sofa.ark.version.old>
         <project.encoding>UTF-8</project.encoding>
         <java.version>1.8</java.version>
         <license.maven.plugin>3.0</license.maven.plugin>

diff --git a/...arent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java b/...arent/core-impl/container/src/main/java/com/alipay/sofa/ark/container/model/BizModel.java
@@ -421,7 +421,7 @@ public void stop() {
                 BizManagerService bizManagerService = ArkServiceContainerHolder.getContainer()
                     .getService(BizManagerService.class);
                 bizManagerService.unRegisterBiz(bizName, bizVersion);
-                setBizState(BizState.UNRESOLVED, StateChangeReason.STOPPED);
+                setBizState(BizState.STOPPED, StateChangeReason.STOPPED);
                 eventAdminService.sendEvent(new BeforeBizRecycleEvent(this));
                 urls = null;
                 denyImportPackages = null;

diff --git a/...t/core-impl/container/src/test/java/com/alipay/sofa/ark/container/model/BizModelTest.java b/...t/core-impl/container/src/test/java/com/alipay/sofa/ark/container/model/BizModelTest.java
@@ -145,7 +145,7 @@ public void testStopFailedWithClean() {
                 bizModel.stop();
             } catch (RuntimeException e) {
             }
-            assertEquals(BizState.UNRESOLVED, bizModel.getBizState());
+            assertEquals(BizState.STOPPED, bizModel.getBizState());
         }
 
         bizModel.setBizState(BizState.ACTIVATED);
@@ -186,7 +186,7 @@ public void testStopSucceedWithClean() {
             mockedStatic.when(ArkServiceContainerHolder::getContainer).thenReturn(arkServiceContainer);
             bizModel.stop();
 
-            assertEquals(BizState.UNRESOLVED, bizModel.getBizState());
+            assertEquals(BizState.STOPPED, bizModel.getBizState());
         }
 
         bizModel.setBizState(BizState.ACTIVATED);
@@ -201,7 +201,7 @@ public void testStopSucceedWithClean() {
             mockedStatic.when(ArkServiceContainerHolder::getContainer).thenReturn(arkServiceContainer);
             bizModel.stop();
 
-            assertEquals(BizState.UNRESOLVED, bizModel.getBizState());
+            assertEquals(BizState.STOPPED, bizModel.getBizState());
         } finally {
             ArkConfigs.putStringValue(AUTO_UNINSTALL_WHEN_FAILED_ENABLE, "true");
         }

diff --git a/sofa-ark-parent/core/spi/src/main/java/com/alipay/sofa/ark/spi/model/BizState.java b/sofa-ark-parent/core/spi/src/main/java/com/alipay/sofa/ark/spi/model/BizState.java
@@ -24,9 +24,7 @@
  */
 public enum BizState {
     /**
-     * init but not start install yet
-     * or
-     * uninstalled
+     * not init or not start install yet
      */
     UNRESOLVED("unresolved"),
     /**
@@ -45,9 +43,14 @@ public enum BizState {
     DEACTIVATED("deactivated"),
 
     /**
-     * install failed.
+     * install or uninstall failed.
      */
-    BROKEN("broken");
+    BROKEN("broken"),
+
+    /**
+     * uninstall succeed
+     */
+    STOPPED("stopped");
 
     private String state;
 
@@ -73,6 +76,8 @@ public static BizState of(String state) {
             return ACTIVATED;
         } else if (DEACTIVATED.name().equalsIgnoreCase(state)) {
             return DEACTIVATED;
+        } else if (STOPPED.name().equalsIgnoreCase(state)) {
+            return STOPPED;
         } else {
             return BROKEN;
         }