feat: support incremental configuration synchronization client #5288
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,9 +21,17 @@ | |
| import com.ctrip.framework.apollo.core.ConfigConsts; | ||
| import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages; | ||
|
|
||
| import com.ctrip.framework.apollo.core.dto.ConfigurationChange; | ||
| import com.ctrip.framework.apollo.core.enums.ConfigurationChangeType; | ||
| import com.google.common.base.Strings; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import com.google.common.collect.Sets; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * @author Jason Song([email protected]) | ||
|
|
@@ -37,11 +45,13 @@ protected AbstractConfigService(final GrayReleaseRulesHolder grayReleaseRulesHol | |
| } | ||
|
|
||
| @Override | ||
| public Release loadConfig(String clientAppId, String clientIp, String clientLabel, | ||
| String configAppId, String configClusterName, | ||
| String configNamespace, String dataCenter, ApolloNotificationMessages clientMessages) { | ||
| // load from specified cluster first | ||
| if (!Objects.equals(ConfigConsts.CLUSTER_NAME_DEFAULT, configClusterName)) { | ||
| Release clusterRelease = findRelease(clientAppId, clientIp, clientLabel, configAppId, | ||
| configClusterName, configNamespace, | ||
| clientMessages); | ||
|
|
||
| if (Objects.nonNull(clusterRelease)) { | ||
|
|
@@ -51,33 +61,37 @@ public Release loadConfig(String clientAppId, String clientIp, String clientLabe | |
|
|
||
| // try to load via data center | ||
| if (!Strings.isNullOrEmpty(dataCenter) && !Objects.equals(dataCenter, configClusterName)) { | ||
| Release dataCenterRelease = findRelease(clientAppId, clientIp, clientLabel, configAppId, | ||
| dataCenter, configNamespace, | ||
| clientMessages); | ||
| if (Objects.nonNull(dataCenterRelease)) { | ||
| return dataCenterRelease; | ||
| } | ||
| } | ||
|
|
||
| // fallback to default release | ||
| return findRelease(clientAppId, clientIp, clientLabel, configAppId, | ||
| ConfigConsts.CLUSTER_NAME_DEFAULT, configNamespace, | ||
| clientMessages); | ||
| } | ||
|
|
||
| /** | ||
| * Find release | ||
| * | ||
| * @param clientAppId the client's app id | ||
| * @param clientIp the client ip | ||
| * @param clientLabel the client label | ||
| * @param configAppId the requested config's app id | ||
| * @param configClusterName the requested config's cluster name | ||
| * @param configNamespace the requested config's namespace name | ||
| * @param clientMessages the messages received in client side | ||
| * @return the release | ||
| */ | ||
| private Release findRelease(String clientAppId, String clientIp, String clientLabel, | ||
| String configAppId, String configClusterName, | ||
| String configNamespace, ApolloNotificationMessages clientMessages) { | ||
| Long grayReleaseId = grayReleaseRulesHolder.findReleaseIdFromGrayReleaseRule(clientAppId, | ||
| clientIp, clientLabel, configAppId, | ||
| configClusterName, configNamespace); | ||
|
|
||
| Release release = null; | ||
|
|
@@ -87,12 +101,59 @@ private Release findRelease(String clientAppId, String clientIp, String clientLa | |
| } | ||
|
|
||
| if (release == null) { | ||
| release = findLatestActiveRelease(configAppId, configClusterName, configNamespace, | ||
| clientMessages); | ||
| } | ||
|
|
||
| return release; | ||
| } | ||
|
|
||
| public List<ConfigurationChange> calcConfigurationChanges( | ||
| Map<String, String> latestReleaseConfigurations, Map<String, String> historyConfigurations) { | ||
| if (latestReleaseConfigurations == null) { | ||
| latestReleaseConfigurations = new HashMap<>(); | ||
| } | ||
|
|
||
| if (historyConfigurations == null) { | ||
| historyConfigurations = new HashMap<>(); | ||
| } | ||
|
|
||
| Set<String> previousKeys = historyConfigurations.keySet(); | ||
| Set<String> currentKeys = latestReleaseConfigurations.keySet(); | ||
|
|
||
| Set<String> commonKeys = Sets.intersection(previousKeys, currentKeys); | ||
| Set<String> newKeys = Sets.difference(currentKeys, commonKeys); | ||
| Set<String> removedKeys = Sets.difference(previousKeys, commonKeys); | ||
|
|
||
| List<ConfigurationChange> changes = Lists.newArrayList(); | ||
|
|
||
| for (String newKey : newKeys) { | ||
| changes.add(new ConfigurationChange(newKey, latestReleaseConfigurations.get(newKey), | ||
| "ADDED")); | ||
| } | ||
|
|
||
| for (String removedKey : removedKeys) { | ||
| changes.add(new ConfigurationChange(removedKey, null, "DELETED")); | ||
| } | ||
|
|
||
| for (String commonKey : commonKeys) { | ||
| String previousValue = historyConfigurations.get(commonKey); | ||
| String currentValue = latestReleaseConfigurations.get(commonKey); | ||
| if (com.google.common.base.Objects.equal(previousValue, currentValue)) { | ||
| continue; | ||
| } | ||
| changes.add( | ||
| new ConfigurationChange(commonKey, currentValue, "MODIFIED")); | ||
| } | ||
|
|
||
| return changes; | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, Release> findReleasesByReleaseKeys(Set<String> releaseKeys) { | ||
| return null; | ||
| } | ||
|
Comment on lines
+145
to
+147
Contributor
There was a problem hiding this comment. Implement or document the null return behavior. The current implementation returns
Example improvement: @Override
public Map<String, Release> findReleasesByReleaseKeys(Set<String> releaseKeys) {
// Option 1: Implement the method
throw new UnsupportedOperationException("Not implemented in abstract class");
// Option 2: If null is intentional, document why
/**
* {@inheritDoc}
* @return null as this base implementation doesn't support release key lookup
*/
return null;
// Option 3: Make it abstract
// public abstract Map<String, Release> findReleasesByReleaseKeys(Set<String> releaseKeys);
} |
||
|
|
||
| /** | ||
| * Find active release by id | ||
| */ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.