Fixes alibaba#128: Fix early return when exception ratio is 100%

sczyh30 · sczyh30 · commit 3d08446a6b54 · 2018-09-05T19:03:27.000+08:00
Signed-off-by: Eric Zhao &lt;sczyh16@gmail.com&gt;
diff --git a/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/degrade/DegradeRule.java b/sentinel-core/src/main/java/com/alibaba/csp/sentinel/slots/block/degrade/DegradeRule.java
@@ -153,7 +153,6 @@ public int hashCode() {
 
     @Override
     public boolean passCheck(Context context, DefaultNode node, int acquireCount, Object... args) {
-
         if (cut) {
             return false;
         }
@@ -184,8 +183,8 @@ public boolean passCheck(Context context, DefaultNode node, int acquireCount, Ob
             }
 
             double realSuccess = success - exception;
-            if (realSuccess <= 0) {
-                return exception < RT_MAX_EXCEED_N;
+            if (realSuccess <= 0 && exception < RT_MAX_EXCEED_N) {
+                return true;
             }
 
             if (exception / success < count) {

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,6 @@ public int hashCode() {`
`153`	`153`
`154`	`154`	`@Override`
`155`	`155`	`public boolean passCheck(Context context, DefaultNode node, int acquireCount, Object... args) {`
`156`		`-`
`157`	`156`	`if (cut) {`
`158`	`157`	`return false;`
`159`	`158`	`}`
`@@ -184,8 +183,8 @@ public boolean passCheck(Context context, DefaultNode node, int acquireCount, Ob`
`184`	`183`	`}`
`185`	`184`
`186`	`185`	`double realSuccess = success - exception;`
`187`		`- if (realSuccess <= 0) {`
`188`		`- return exception < RT_MAX_EXCEED_N;`
	`186`	`+ if (realSuccess <= 0 && exception < RT_MAX_EXCEED_N) {`
	`187`	`+ return true;`
`189`	`188`	`}`
`190`	`189`
`191`	`190`	`if (exception / success < count) {`