Merge pull request Netflix#643 from mattrjacobs/deflake-hystrix-obser…

…vable-collapser-test Stress-test HystrixObservableCollapser
axiak · Feb 6, 2015 · 277265b · 277265b
2 parents 5ab3d91 + 519b6ad
commit 277265b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java b/hystrix-core/src/main/java/com/netflix/hystrix/Hystrix.java
@@ -54,6 +54,7 @@ private static void _reset() {
         // clear metrics
         HystrixCommandMetrics.reset();
         HystrixThreadPoolMetrics.reset();
+        HystrixCollapserMetrics.reset();
         // clear collapsers
         HystrixCollapser.reset();
         // clear circuit breakers

diff --git a/hystrix-core/src/test/java/com/netflix/hystrix/HystrixObservableCollapserTest.java b/hystrix-core/src/test/java/com/netflix/hystrix/HystrixObservableCollapserTest.java
@@ -46,6 +46,7 @@ public class HystrixObservableCollapserTest {
     public void init() {
         // since we're going to modify properties of the same class between tests, wipe the cache each time
         HystrixCollapser.reset();
+        Hystrix.reset();
         /* we must call this to simulate a new request lifecycle running and clearing caches */
         HystrixRequestContext.initializeContext();
     }
@@ -80,6 +81,15 @@ public void testTwoRequests() throws Exception {
         assertEquals(0L, metrics.getRollingCount(HystrixRollingNumberEvent.RESPONSE_FROM_CACHE));
     }
 
+    @Test
+    public void stressTestRequestCollapser() throws Exception {
+        for(int i = 0; i < 1000; i++) {
+            init();
+            testTwoRequests();
+            cleanup();
+        }
+    }
+
     private static class TestRequestCollapser extends HystrixObservableCollapser<String, String, String, String> {
 
         private final String value;