1.fix revision heartbeat; 2.rename git.properties (#268)

Co-authored-by: 昱恒 <[email protected]>
sofastack · Sep 16, 2022 · f208554 · f208554
1 parent 5a46532
commit f208554
Show file tree

Hide file tree

Showing 37 changed files with 57 additions and 34 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.1.6
+6.1.8
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.7</version>
+    <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+    <version>6.1.8</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -525,7 +525,7 @@
                 </executions>
                 <configuration>
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/sofaregistry.git.properties</generateGitPropertiesFilename>
                     <includeOnlyProperties>
                         <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
                         <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>

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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</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
@@ -115,7 +115,7 @@ void renew() {
         slices.add((AppRevisionSlice) result);
       }
       for (String revision : AppRevisionSlice.merge(slices).getRevisions()) {
-        appRevisionRepository.heartbeat(revision);
+        appRevisionRepository.heartbeatDB(revision);
         ConcurrentUtils.sleepUninterruptibly(10, TimeUnit.MILLISECONDS);
       }
       consecutiveSuccess.success();

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
@@ -94,7 +94,7 @@ public void testRenew() throws Exception {
     mocked.renewer.getWaitingMillis();
     mocked.renew();
     mocked.renewer.runUnthrowable();
-    verify(mocked.appRevisionRepository, times(6)).heartbeat(anyString());
+    verify(mocked.appRevisionRepository, times(6)).heartbeatDB(anyString());
     mocked.init();
     mocked.start();
     mocked.renewer.close();

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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/.../src/test/java/com/alipay/sofa/registry/server/session/AbstractSessionServerTestBase.java b/.../src/test/java/com/alipay/sofa/registry/server/session/AbstractSessionServerTestBase.java
@@ -753,6 +753,11 @@ public boolean heartbeat(String revision) {
       return true;
     }
 
+    @Override
+    public boolean heartbeatDB(String revision) {
+      return false;
+    }
+
     @Override
     public Collection<String> availableRevisions() {
       return revisions.keySet();

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.7</version>
+        <version>6.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/server/server/shared/src/main/java/com/alipay/sofa/registry/server/shared/env/ServerEnv.java b/server/server/shared/src/main/java/com/alipay/sofa/registry/server/shared/env/ServerEnv.java
@@ -35,7 +35,7 @@ public final class ServerEnv {
 
   private ServerEnv() {}
 
-  private static final String GIT_PROPS_FILE = "git.properties";
+  public static final String GIT_PROPS_FILE = "sofaregistry.git.properties";
   public static final String IP = NetUtil.getLocalAddress().getHostAddress();
   public static final int PID = getPID();
   public static final ProcessId PROCESS_ID = createProcessId();

diff --git a/...shared/src/main/java/com/alipay/sofa/registry/server/shared/resource/VersionResource.java b/...shared/src/main/java/com/alipay/sofa/registry/server/shared/resource/VersionResource.java
@@ -27,6 +27,6 @@ public class VersionResource {
   @Path("version")
   public String version() {
     return StringFormatter.format(
-        "release properties: \t\t {}", ServerEnv.getReleaseProps("git.properties"));
+        "release properties: \t\t {}", ServerEnv.getReleaseProps(ServerEnv.GIT_PROPS_FILE));
   }
 }
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.7</version>
+        <version>6.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...pi/src/main/java/com/alipay/sofa/registry/store/api/repository/AppRevisionRepository.java b/...pi/src/main/java/com/alipay/sofa/registry/store/api/repository/AppRevisionRepository.java
@@ -52,6 +52,8 @@ public interface AppRevisionRepository {
 
   boolean heartbeat(String revision);
 
+  boolean heartbeatDB(String revision);
+
   Collection<String> availableRevisions();
 
   List<AppRevision> listFromStorage(long start, int limit);

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.7</version>
+        <version>6.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...rc/main/java/com/alipay/sofa/registry/jdbc/repository/impl/AppRevisionJdbcRepository.java b/...rc/main/java/com/alipay/sofa/registry/jdbc/repository/impl/AppRevisionJdbcRepository.java
@@ -141,6 +141,7 @@ public void register(AppRevision appRevision) throws Exception {
 
   /**
    * check if revisionId exist
+   *
    * @param revisionId
    * @return
    */
@@ -176,6 +177,16 @@ public boolean heartbeat(String revision) {
     return informer.getContainer().containsRevisionId(revision);
   }
 
+  @Override
+  public boolean heartbeatDB(String revision) {
+    int effect =
+        appRevisionMapper.heartbeat(defaultCommonConfig.getClusterId(tableName()), revision);
+    if (effect == 0) {
+      LOG.error("revision: {} heartbeat fail.", revision);
+    }
+    return effect > 0;
+  }
+
   @VisibleForTesting
   LoadingCache<String, AppRevision> getRevisions() {
     return registry;

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.7</version>
+        <version>6.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...c/main/java/com/alipay/sofa/registry/jraft/repository/impl/AppRevisionRaftRepository.java b/...c/main/java/com/alipay/sofa/registry/jraft/repository/impl/AppRevisionRaftRepository.java
@@ -62,6 +62,11 @@ public boolean heartbeat(String revision) {
     return false;
   }
 
+  @Override
+  public boolean heartbeatDB(String revision) {
+    return false;
+  }
+
   @Override
   public void waitSynced() {}
 

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.7</version>
+        <version>6.1.8</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.7</version>
+        <version>6.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>