Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the reloadRules method that caused ruleMetaData.getRules() to be null briefly #26007

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the reloadRules method that caused ruleMetaData.getRules() to be null briefly #26007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 20 additions & 7 deletions ...c/main/java/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import java.util.LinkedList;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;

/**
* ShardingSphere database.
Expand Down Expand Up @@ -189,13 +191,24 @@ public boolean containsDataSource() {
*/
public synchronized void reloadRules(final Class<? extends ShardingSphereRule> ruleClass) {
Collection<? extends ShardingSphereRule> toBeReloadedRules = ruleMetaData.findRules(ruleClass);
RuleConfiguration ruleConfig = toBeReloadedRules.stream().map(ShardingSphereRule::getConfiguration).findFirst().orElse(null);
Collection<ShardingSphereRule> databaseRules = new LinkedList<>(ruleMetaData.getRules());
toBeReloadedRules.stream().findFirst().ifPresent(optional -> {
if (toBeReloadedRules != null && toBeReloadedRules.size() != 0) {
RuleConfiguration ruleConfig = toBeReloadedRules.stream().map(ShardingSphereRule::getConfiguration).findFirst().orElse(null);
CopyOnWriteArrayList<ShardingSphereRule> databaseRules = new CopyOnWriteArrayList<>(ruleMetaData.getRules());
databaseRules.removeAll(toBeReloadedRules);
databaseRules.add(((MutableDataNodeRule) optional).reloadRule(ruleConfig, name, resourceMetaData.getDataSources(), databaseRules));
});
ruleMetaData.getRules().clear();
ruleMetaData.getRules().addAll(databaseRules);
ShardingSphereRule newShardingSphereRule = ((MutableDataNodeRule) toBeReloadedRules.stream().findFirst().get())
.reloadRule(ruleConfig, name, resourceMetaData.getDataSources(), databaseRules);
// Only replace one, and the rest will be cleared later (normal logic will only have one, in order to be consistent with the previous logic)
// replaceAll atomic operation, do logical assembly in advance, and finally directly replace the underlying array through setArray
AtomicBoolean replaced = new AtomicBoolean(false);
((CopyOnWriteArrayList) ruleMetaData.getRules()).replaceAll(shardingSphereRule -> {
if (!replaced.get() && toBeReloadedRules.contains(shardingSphereRule)) {
replaced.set(true);
return newShardingSphereRule;
}
return shardingSphereRule;
});
// Clearing toBeReloaded Rules is the case for more than one
ruleMetaData.getRules().removeAll(toBeReloadedRules);
}
}
}