merge master to 3.1.9 (#1037)

* add stop biz state (#1026) * add stop biz state * update ark version * fix test (cherry picked from commit 7ab39b4) * add error stack in biz history record message (#1028) (cherry picked from commit 96f5fc2) * update to 3.1.9-SNAPSHOT * add get for bizstate record
sofastack · Nov 27, 2024 · 42a8cb8 · 42a8cb8
1 parent c9ddc88
commit 42a8cb8
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,8 +14,8 @@
     </modules>
 
     <properties>
-        <sofa.ark.version>3.1.8</sofa.ark.version>
-        <sofa.ark.version.old>3.1.7</sofa.ark.version.old>
+        <sofa.ark.version>3.1.9-SNAPSHOT</sofa.ark.version>
+        <sofa.ark.version.old>3.1.8</sofa.ark.version.old>
         <project.encoding>UTF-8</project.encoding>
         <java.version>17</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
@@ -44,6 +44,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -343,7 +345,7 @@ private void doStart(String[] args, Map<String, String> envs) throws Throwable {
                     getIdentity(), (System.currentTimeMillis() - start));
             }
         } catch (Throwable e) {
-            setBizState(BizState.BROKEN, StateChangeReason.INSTALL_FAILED, e.getMessage());
+            setBizState(BizState.BROKEN, StateChangeReason.INSTALL_FAILED, getStackTraceAsString(e));
             eventAdminService.sendEvent(new AfterBizStartupFailedEvent(this, e));
             throw e;
         } finally {
@@ -421,7 +423,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;
@@ -642,4 +644,11 @@ private static String markBizTempWorkDirRecycled(File bizTempWorkDir) throws IOE
 
         return targetPath;
     }
+
+    private static String getStackTraceAsString(Throwable throwable) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        throwable.printStackTrace(pw);
+        return sw.toString();
+    }
 }
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/BizInfo.java b/sofa-ark-parent/core/spi/src/main/java/com/alipay/sofa/ark/spi/model/BizInfo.java
@@ -169,6 +169,22 @@ public String toString() {
             return String.format("%s -> %s with reason: %s and message: %s", date, state, reason,
                 message);
         }
+
+        public Date getChangeTime() {
+            return changeTime;
+        }
+
+        public BizState getState() {
+            return state;
+        }
+
+        public StateChangeReason getReason() {
+            return reason;
+        }
+
+        public String getMessage() {
+            return message;
+        }
     }
 
     enum StateChangeReason {

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;
         }