fix：初始加载失败依旧加入懒加载列表，异步检查流程优化

client.go

@@ -164,9 +164,10 @@ func (c *internalClient) GetConfigAndInit(namespace string) *storage.Config {
 	if cfg == nil {
 		//sync config
 		apolloConfig := syncApolloConfig.SyncWithNamespace(namespace, c.getAppConfig)
-		if apolloConfig != nil {
-			c.SyncAndUpdate(namespace, apolloConfig)
+		if apolloConfig == nil {
+			log.Warnf("apolloConfig is nil: %s, but it's be added notification", namespace)
 		}
+		c.SyncAndUpdate(namespace, apolloConfig)
 	}
 
 	cfg = c.cache.GetConfig(namespace)
@@ -189,10 +190,12 @@ func (c *internalClient) SyncAndUpdate(namespace string, apolloConfig *config.Ap
 	}
 
 	// update notification
-	c.appConfig.GetNotificationsMap().UpdateNotify(namespace, 0)
+	c.appConfig.GetNotificationsMap().UpdateNotify(namespace, -1)
 
 	// update cache
-	c.cache.UpdateApolloConfig(apolloConfig, c.getAppConfig)
+	if apolloConfig != nil {
+		c.cache.UpdateApolloConfig(apolloConfig, c.getAppConfig)
+	}
 }
 
 // GetConfigCache 根据namespace获取apollo配置的缓存

client_test.go

@@ -374,7 +374,7 @@ func TestGetConfigAndInitValNotNil(t *testing.T) {
 	Assert(t, cf, NotNilVal())
 
 	// appConfig notificationsMap appConfig should be updated
-	Assert(t, client.appConfig.GetNotificationsMap().GetNotify("testNotFound"), Equal(int64(0)))
+	Assert(t, client.appConfig.GetNotificationsMap().GetNotify("testNotFound"), Equal(int64(-1)))
 
 	// cache should be updated with new configuration
 	Assert(t, client.cache.GetConfig("testNotFound"), NotNilVal())
@@ -412,4 +412,5 @@ func TestGetConfigAndInitValNil(t *testing.T) {
 	cf := client.GetConfig("testNotFound")
 	Assert(t, cf, NilVal())
 	Assert(t, client.cache.GetConfig("testNotFound"), NilVal())
+	Assert(t, client.appConfig.GetNotificationsMap().GetNotify("testNotFound"), Equal(int64(-1)))
 }

component/remote/async.go

@@ -83,7 +83,9 @@ func (a *asyncApolloConfig) Sync(appConfigFunc func() config.AppConfig) []*confi
 	//只是拉去有变化的配置, 并更新拉取成功的namespace的notify ID
 	for _, notifyConfig := range remoteConfigs {
 		apolloConfig := a.SyncWithNamespace(notifyConfig.NamespaceName, appConfigFunc)
-		if apolloConfig != nil {
+		// update valid apolloConfig
+		// if apolloConfig.Configurations are empty, async should ignore it
+		if apolloConfig != nil && len(apolloConfig.Configurations) > 0 {
 			appConfig.GetNotificationsMap().UpdateNotify(notifyConfig.NamespaceName, notifyConfig.NotificationID)
 			apolloConfigs = append(apolloConfigs, apolloConfig)
 		}

protocol/http/request.go

@@ -213,7 +213,12 @@ func RequestRecovery(appConfig config.AppConfig,
 			return response, nil
 		}
 
-		server.SetDownNode(appConfig.GetHost(), host)
+		// can use node length > 1, should be down node
+		if server.GetServersLen(appConfig.GetHost()) > 1 {
+			server.SetDownNode(appConfig.GetHost(), host)
+		} else {
+			return nil, err
+		}
 	}
 }