Added subscribeOn to HystrixObservableCommand in JMH test to make it …

…async
bankwing · May 13, 2016 · f61542a · f61542a
1 parent ee47e40
commit f61542a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/CommandExecutionPerfTest.java b/hystrix-core/src/jmh/java/com/netflix/hystrix/perf/CommandExecutionPerfTest.java
@@ -161,7 +161,7 @@ public Observable<Integer> call() {
                             Blackhole.consumeCPU(blackholeConsumption);
                             return Observable.just(1);
                         }
-                    });
+                    }).subscribeOn(Schedulers.computation());
                 }
             };
         }

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java b/hystrix-core/src/main/java/com/netflix/hystrix/AbstractCommand.java
@@ -158,7 +158,6 @@ protected AbstractCommand(HystrixCommandGroupKey group, HystrixCommandKey key, H
         this.circuitBreaker = initCircuitBreaker(this.properties.circuitBreakerEnabled().get(), circuitBreaker, this.commandGroup, this.commandKey, this.properties, this.metrics);
         this.threadPool = initThreadPool(threadPool, this.threadPoolKey, threadPoolPropertiesDefaults);
 
-
         //Strategies from plugins
         this.eventNotifier = HystrixPlugins.getInstance().getEventNotifier();
         this.concurrencyStrategy = HystrixPlugins.getInstance().getConcurrencyStrategy();
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,7 +161,7 @@ public Observable<Integer> call() { @@
                                 Blackhole.consumeCPU(blackholeConsumption);
                                 return Observable.just(1);
                             }
-                        });
+                        }).subscribeOn(Schedulers.computation());
                     }
                 };
             }
@@ Expand Down @@