Skip to content

fix: Fix scale rule cache eviction by using rule ids(#6972) #6975

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

Open
juicewcode wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

fix: Fix scale rule cache eviction by using rule ids(#6972) #6975

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...min/src/main/java/org/apache/shenyu/admin/scale/monitor/subject/cache/ScaleRuleCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import org.apache.shenyu.admin.model.entity.ScaleRuleDO;
import org.springframework.stereotype.Component;

import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

@Component
Expand Down Expand Up @@ -56,6 +58,20 @@ public void removeRulesFromCache(final List<String> metricNames) {
metricNames.forEach(ruleCache::remove);
}

/**
* Removes rules from cache by their primary keys.
*
* @param ids rule primary keys
*/
public void removeRulesByIdsFromCache(final List<String> ids) {
final Set<String> idSet = new HashSet<>(ids);
ruleCache.forEach((metricName, rule) -> {
if (idSet.contains(rule.getId())) {
ruleCache.remove(metricName, rule);
}
});
}

/**
* getAllRules.
*
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ScaleRuleServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public int update(final ScaleRuleDTO scaleRuleDTO) {
public int delete(final List<String> ids) {
int rows = scaleRuleMapper.delete(ids);
if (rows > 0) {
scaleRuleCache.removeRulesFromCache(ids);
scaleRuleCache.removeRulesByIdsFromCache(ids);
}
return rows;
}
Expand Down
Loading