RaigorJiang commented on a change in pull request #15340:
URL: https://github.com/apache/shardingsphere/pull/15340#discussion_r804436418
##########
File path:
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/common/alter/excutor/AlterTrafficRuleExecutor.java
##########
@@ -76,19 +76,28 @@ private void check(final AlterTrafficRuleStatement
sqlStatement, final Optional<
if
(!TypedSPIRegistry.findRegisteredService(TrafficAlgorithm.class,
each.getAlgorithm().getName(), new Properties()).isPresent()) {
result.add(each.getAlgorithm().getName());
}
- if
(!TypedSPIRegistry.findRegisteredService(TrafficLoadBalanceAlgorithm.class,
each.getLoadBalancer().getName(), new Properties()).isPresent()) {
+ if (null != each.getLoadBalancer()
+ &&
!TypedSPIRegistry.findRegisteredService(TrafficLoadBalanceAlgorithm.class,
each.getLoadBalancer().getName(), new Properties()).isPresent()) {
result.add(each.getLoadBalancer().getName());
}
});
return result;
}
private void updateToRepository(final TrafficRuleConfiguration
toBeAlteredConfiguration, final TrafficRuleConfiguration currentConfiguration) {
+ Collection<String> toBeAlteredConfigurationNames =
toBeAlteredConfiguration.getTrafficStrategies().stream().map(TrafficStrategyConfiguration::getName).collect(Collectors.toSet());
+ currentConfiguration.getTrafficStrategies().removeIf(each ->
toBeAlteredConfigurationNames.contains(each.getName()));
currentConfiguration.getTrafficStrategies().addAll(toBeAlteredConfiguration.getTrafficStrategies());
currentConfiguration.getTrafficAlgorithms().putAll(toBeAlteredConfiguration.getTrafficAlgorithms());
currentConfiguration.getLoadBalancers().putAll(toBeAlteredConfiguration.getLoadBalancers());
+ getUnusedLoadBalancer(currentConfiguration).forEach(each ->
currentConfiguration.getLoadBalancers().remove(each));
MetaDataContexts metaDataContexts =
ProxyContext.getInstance().getContextManager().getMetaDataContexts();
Optional<MetaDataPersistService> metaDataPersistService =
metaDataContexts.getMetaDataPersistService();
metaDataPersistService.ifPresent(op ->
op.getGlobalRuleService().persist(metaDataContexts.getGlobalRuleMetaData().getConfigurations(),
true));
}
+
+ private Collection<String> getUnusedLoadBalancer(final
TrafficRuleConfiguration configuration) {
+ Set<String> currentlyInUse =
configuration.getTrafficStrategies().stream().map(TrafficStrategyConfiguration::getLoadBalancerName).collect(Collectors.toSet());
Review comment:
Set -> Collection
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
