fix app revision clean bug (#276)

Co-authored-by: 江村 <[email protected]>
sofastack · Feb 8, 2023 · 6c23e9a · 6c23e9a
1 parent fce2785
commit 6c23e9a
Show file tree

Hide file tree

Showing 31 changed files with 77 additions and 32 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.1.8
+6.1.9
diff --git a/client/all/pom.xml b/client/all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>6.1.8</version>
+    <version>6.1.9</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>

diff --git a/client/api/pom.xml b/client/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/impl/pom.xml b/client/impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/log/pom.xml b/client/log/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/pom.xml b/client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>6.1.8</version>
+    <version>6.1.9</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

diff --git a/server/common/model/pom.xml b/server/common/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/common/pom.xml b/server/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/common/util/pom.xml b/server/common/util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-common</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/all/pom.xml b/server/distribution/all/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-distribution</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/distribution/pom.xml b/server/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/pom.xml b/server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/server/remoting/api/pom.xml b/server/remoting/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/bolt/pom.xml b/server/remoting/bolt/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/http/pom.xml b/server/remoting/http/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-remoting</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/remoting/pom.xml b/server/remoting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/data/pom.xml b/server/server/data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/integration/pom.xml b/server/server/integration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/meta/pom.xml b/server/server/meta/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...r/meta/src/main/java/com/alipay/sofa/registry/server/meta/cleaner/AppRevisionCleaner.java b/...r/meta/src/main/java/com/alipay/sofa/registry/server/meta/cleaner/AppRevisionCleaner.java
@@ -16,6 +16,7 @@
  */
 package com.alipay.sofa.registry.server.meta.cleaner;
 
+import com.alipay.remoting.util.StringUtils;
 import com.alipay.sofa.registry.cache.ConsecutiveSuccess;
 import com.alipay.sofa.registry.common.model.console.PersistenceData;
 import com.alipay.sofa.registry.common.model.console.PersistenceDataBuilder;
@@ -24,6 +25,7 @@
 import com.alipay.sofa.registry.common.model.metaserver.cleaner.AppRevisionSliceRequest;
 import com.alipay.sofa.registry.common.model.store.AppRevision;
 import com.alipay.sofa.registry.jdbc.config.MetadataConfig;
+import com.alipay.sofa.registry.jdbc.convertor.AppRevisionDomainConvertor;
 import com.alipay.sofa.registry.log.Logger;
 import com.alipay.sofa.registry.log.LoggerFactory;
 import com.alipay.sofa.registry.server.meta.MetaLeaderService;
@@ -35,6 +37,7 @@
 import com.alipay.sofa.registry.store.api.date.DateNowRepository;
 import com.alipay.sofa.registry.store.api.repository.AppRevisionRepository;
 import com.alipay.sofa.registry.util.ConcurrentUtils;
+import com.alipay.sofa.registry.util.JsonUtils;
 import com.alipay.sofa.registry.util.StringFormatter;
 import com.alipay.sofa.registry.util.WakeUpLoopRunnable;
 import com.google.common.collect.Lists;
@@ -143,11 +146,46 @@ void markDeleted() {
         appRevisionRepository.getExpired(
             dateBeforeNow(metadataConfig.getRevisionRenewIntervalMinutes() * 5),
             metaServerConfig.getAppRevisionMaxRemove());
+    // before markDeleted refresh app revision switch
+    appRevisionSwitchRefresh();
     for (AppRevision revision : expired) {
       revision.setDeleted(true);
-      appRevisionRepository.replace(revision);
-      LOG.info("mark deleted revision: {}", revision.getRevision());
-      ConcurrentUtils.sleepUninterruptibly(10, TimeUnit.MILLISECONDS);
+      try {
+        appRevisionRepository.replace(revision);
+        LOG.info("mark deleted revision: {}", revision.getRevision());
+        ConcurrentUtils.sleepUninterruptibly(10, TimeUnit.MILLISECONDS);
+      } catch (Throwable e) {
+        LOG.error("mark deleted revision failed: {}", revision.getRevision(), e);
+      }
+    }
+  }
+
+  private void appRevisionSwitchRefresh() {
+    DBResponse<PersistenceData> ret =
+            provideDataService.queryProvideData(ValueConstants.APP_REVISION_WRITE_SWITCH_DATA_ID);
+    AppRevisionDomainConvertor.EnableConfig enableConfig = null;
+    if (ret.getOperationStatus() == OperationStatus.SUCCESS) {
+      PersistenceData data = ret.getEntity();
+      String switchString = data.getData();
+      if (StringUtils.isNotBlank(switchString)) {
+        try {
+          enableConfig =
+                  JsonUtils.read(switchString, AppRevisionDomainConvertor.EnableConfig.class);
+        } catch (Throwable e) {
+          LOG.error("Decode appRevision write switch failed", e);
+        }
+      }
+    }
+    if (enableConfig != null) {
+      LOG.info(
+              "appRevisionSwitch prev={}/{}",
+              AppRevisionDomainConvertor.getEnableConfig().isServiceParams(),
+              AppRevisionDomainConvertor.getEnableConfig().isServiceParamsLarge());
+      AppRevisionDomainConvertor.setEnableConfig(enableConfig);
+      LOG.info(
+              "appRevisionSwitch update={}/{}",
+              enableConfig.isServiceParams(),
+              enableConfig.isServiceParamsLarge());
     }
   }
 

diff --git a/...ta/src/test/java/com/alipay/sofa/registry/server/meta/cleaner/AppRevisionCleanerTest.java b/...ta/src/test/java/com/alipay/sofa/registry/server/meta/cleaner/AppRevisionCleanerTest.java
@@ -67,6 +67,13 @@ public void beforeTest() throws Exception {
         .when(appRevisionCleaner.provideDataService)
         .queryProvideData(anyString());
     // doReturn(new DateNowDomain(new Date())).when(appRevisionCleaner.appRevisionMapper).getNow();
+    doReturn(
+            new DBResponse<>(
+                    PersistenceDataBuilder.createPersistenceData(
+                            ValueConstants.APP_REVISION_WRITE_SWITCH_DATA_ID, "{\"serviceParams\":false,\"serviceParamsLarge\":true}"),
+                    OperationStatus.SUCCESS))
+            .when(appRevisionCleaner.provideDataService)
+            .queryProvideData(anyString());
   }
 
   @After

diff --git a/server/server/pom.xml b/server/server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/session/pom.xml b/server/server/session/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/server/shared/pom.xml b/server/server/shared/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>registry-server</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/server/store/api/pom.xml b/server/store/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/server/store/jdbc/pom.xml b/server/store/jdbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/server/store/jraft/pom.xml b/server/store/jraft/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-store</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/server/store/pom.xml b/server/store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-server-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/test/pom.xml b/test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.8</version>
+        <version>6.1.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>