Try register Service Instance after export (#15113)

dubbo-common/src/main/java/org/apache/dubbo/common/deploy/ApplicationDeployer.java

@@ -52,6 +52,8 @@ public interface ApplicationDeployer extends Deployer<ApplicationModel> {
 
     void exportMetadataService();
 
+    void registerServiceInstance();
+
     /**
      * Register application instance and start internal services
      */

dubbo-common/src/main/java/org/apache/dubbo/common/deploy/ModuleDeployer.java

@@ -42,6 +42,8 @@ public interface ModuleDeployer extends Deployer<ModuleModel> {
 
     ReferenceCache getReferenceCache();
 
+    void registerServiceInstance();
+
     void prepare();
 
     void setPending();

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java

@@ -344,6 +344,8 @@ public void export(RegisterTypeEnum registerType) {
                 }
             }
         }
+
+        getScopeModel().getDeployer().registerServiceInstance();
     }
 
     @Override

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java

@@ -980,7 +980,7 @@ private DynamicConfiguration getDynamicConfiguration(URL connectionURL) {
         return factory.getDynamicConfiguration(connectionURL);
     }
 
-    private volatile boolean registered;
+    private volatile boolean registered = false;
 
     private final AtomicInteger instanceRefreshScheduleTimes = new AtomicInteger(0);
 
@@ -989,21 +989,21 @@ private DynamicConfiguration getDynamicConfiguration(URL connectionURL) {
      */
     private final AtomicInteger serviceRefreshState = new AtomicInteger(0);
 
-    private void registerServiceInstance() {
-        try {
-            registered = true;
+    public synchronized void registerServiceInstance() {
+        if (!registered) {
+            try {
+                registered = true;
 
-            ServiceInstanceMetadataUtils.registerMetadataAndInstance(applicationModel);
+                ServiceInstanceMetadataUtils.registerMetadataAndInstance(applicationModel);
 
-        } catch (Exception e) {
-            logger.error(
-                    CONFIG_REGISTER_INSTANCE_ERROR,
-                    "configuration server disconnected",
-                    "",
-                    "Register instance error.",
-                    e);
-        }
-        if (registered) {
+            } catch (Exception e) {
+                logger.error(
+                        CONFIG_REGISTER_INSTANCE_ERROR,
+                        "configuration server disconnected",
+                        "",
+                        "Register instance error.",
+                        e);
+            }
             // scheduled task for updating Metadata and ServiceInstance
             asyncMetadataFuture = frameworkExecutorRepository
                     .getSharedScheduledExecutor()

dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java

@@ -652,6 +652,11 @@ public ReferenceCache getReferenceCache() {
         return referenceCache;
     }
 
+    @Override
+    public void registerServiceInstance() {
+        applicationDeployer.registerServiceInstance();
+    }
+
     /**
      * Prepare for export/refer service, trigger initializing application and module
      */