Skip to content

[SCB-2236]fix circuit breaker bean property slidingWindowType #2316

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

Merged
liubao68 merged 1 commit into from
Mar 26, 2021
Merged

[SCB-2236]fix circuit breaker bean property slidingWindowType #2316

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
2 changes: 1 addition & 1 deletion ...rnance/src/main/java/org/apache/servicecomb/governance/handler/CircuitBreakerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private CircuitBreaker getCircuitBreaker(CircuitBreakerPolicy policy) {
//可以达到熔断条件的请求数量下限
.minimumNumberOfCalls(policy.getMinimumNumberOfCalls())
//可以选择基于时间的滑动窗口计数或者基于请求数量的滑动窗口计数
.slidingWindowType(policy.getSlidingWindowType())
.slidingWindowType(policy.getSlidingWindowTypeEnum())
//滑动窗口，单位可能是请求数或者秒
.slidingWindowSize(policy.getSlidingWindowSize())
.build();
Expand Down
6 changes: 5 additions & 1 deletion governance/src/main/java/org/apache/servicecomb/governance/policy/CircuitBreakerPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void setMinimumNumberOfCalls(int minimumNumberOfCalls) {
this.minimumNumberOfCalls = minimumNumberOfCalls;
}

public SlidingWindowType getSlidingWindowType() {
public SlidingWindowType getSlidingWindowTypeEnum() {
if (StringUtils.isEmpty(slidingWindowType)) {
slidingWindowType = "count";
}
Expand All @@ -142,6 +142,10 @@ public SlidingWindowType getSlidingWindowType() {
}
}

public String getSlidingWindowType() {
return this.slidingWindowType;
}

public void setSlidingWindowType(String slidingWindowType) {
this.slidingWindowType = slidingWindowType;
}
Expand Down
1 change: 1 addition & 0 deletions governance/src/test/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ servicecomb:
demo-circuitBreaker: |
minimumNumberOfCalls: 2
slidingWindowSize: 2
slidingWindowType: count
services: myself:1.0,other
wrongIngored: |
rules:
Expand Down