Skip to content

Commit

Permalink
Moved call to HystrixCommandExecutionHook.onComplete from completion …
Browse files Browse the repository at this point in the history 
…of executeCommand() to successful executeCommand()

 * It was getting called 2x in the case where run() threw an Exception
  • Loading branch information
Matt Jacobs committed Jan 14, 2015
1 parent a5e52a6 commit 61b77c3
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 11 deletions.
60 changes: 50 additions & 10 deletions hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1020,8 +1020,7 @@ public void call(final Subscriber<? super R> observer) {
@Override
public void run() {
try {
R v = originalCommand.getFallbackOrThrowException(HystrixEventType.TIMEOUT, FailureType.TIMEOUT, "timed-out", new TimeoutException());
observer.onNext(v);
observer.onNext(originalCommand.getFallbackOrThrowException(HystrixEventType.TIMEOUT, FailureType.TIMEOUT, "timed-out", new TimeoutException()));
observer.onCompleted();
} catch (HystrixRuntimeException re) {
observer.onError(re);
Expand Down Expand Up @@ -1113,7 +1112,6 @@ private Subscription subscribeWithSemaphoreIsolation(final Observer<? super R> o

// execute outside of future so that fireAndForget will still work (ie. someone calls queue() but not get()) and so that multiple requests can be deduped through request caching
R r = executeCommand();
r = executionHook.onComplete(this, r);
observer.onNext(r);
/* execution time (must occur before terminal state otherwise a race condition can occur if requested by client) */
recordTotalExecutionTime(invocationStartTime);
Expand Down Expand Up @@ -1186,8 +1184,6 @@ public R call() throws Exception {
R r = executeCommand();
// if we can go from NOT_EXECUTED to COMPLETED then we did not timeout
if (isCommandTimedOut.compareAndSet(TimedOutStatus.NOT_EXECUTED, TimedOutStatus.COMPLETED)) {
// give the hook an opportunity to modify it
r = executionHook.onComplete(_this, r);
// pass to the observer
observer.onNext(r);
// state changes before termination
Expand Down Expand Up @@ -1292,7 +1288,7 @@ private R executeCommand() {
metrics.markSuccess(duration);
circuitBreaker.markSuccess();
eventNotifier.markCommandExecution(getCommandKey(), properties.executionIsolationStrategy().get(), (int) duration, executionResult.events);
return response;
return executionHook.onComplete(this, response);
}
} catch (HystrixBadRequestException e) {
try {
Expand Down Expand Up @@ -1643,7 +1639,6 @@ private R getFallbackOrThrowException(HystrixEventType eventType, FailureType fa
metrics.markFallbackSuccess();
// record the executionResult
executionResult = executionResult.addEvents(HystrixEventType.FALLBACK_SUCCESS);

return executionHook.onComplete(this, fallback);
} catch (UnsupportedOperationException fe) {
logger.debug("No fallback for HystrixCommand. ", fe); // debug only since we're throwing the exception and someone higher will do something with it
Expand Down Expand Up @@ -5657,7 +5652,7 @@ public void testExecutionHookRunFailureWithFallback() {
assertEquals(1, command.builder.executionHook.threadComplete.get());

// expected hook execution sequence
assertEquals("onStart - onThreadStart - onRunStart - onRunError - onFallbackStart - onFallbackSuccess - onThreadComplete - onComplete - ", command.builder.executionHook.executionSequence.toString());
assertEquals("onStart - onThreadStart - onRunStart - onRunError - onFallbackStart - onFallbackSuccess - onComplete - onThreadComplete - ", command.builder.executionHook.executionSequence.toString());
}

/**
Expand Down Expand Up @@ -5902,7 +5897,52 @@ public void testExecutionHookRejectedWithFallback() {
* Execution hook on short-circuit with a fallback
*/
@Test
public void testExecutionHookShortCircuitedWithFallbackViaQueue() {
public void testExecutionHookShortCircuitedWithFallbackViaExecute() {
TestCircuitBreaker circuitBreaker = new TestCircuitBreaker().setForceShortCircuit(true);
KnownFailureTestCommandWithFallback command = new KnownFailureTestCommandWithFallback(circuitBreaker);
try {
// now execute one that will be short-circuited
command.execute();
} catch (Exception e) {
throw new RuntimeException("not expecting", e);
}

assertTrue(command.isResponseShortCircuited());

// the run() method should not run as we're short-circuited
assertEquals(0, command.builder.executionHook.startRun.get());
// we should not have a response because of short-circuit
assertNull(command.builder.executionHook.runSuccessResponse);
// we should not have an exception because we didn't run
assertNull(command.builder.executionHook.runFailureException);

// the fallback() method should be run due to short-circuit
assertEquals(1, command.builder.executionHook.startFallback.get());
// response since we have a fallback
assertNotNull(command.builder.executionHook.fallbackSuccessResponse);
// null since fallback succeeds
assertNull(command.builder.executionHook.fallbackFailureException);

// execution occurred
assertEquals(1, command.builder.executionHook.startExecute.get());
// we should have a response because of fallback
assertNotNull(command.builder.executionHook.endExecuteSuccessResponse);
// we should not have an exception because of fallback
assertNull(command.builder.executionHook.endExecuteFailureException);

// thread execution
assertEquals(0, command.builder.executionHook.threadStart.get());
assertEquals(0, command.builder.executionHook.threadComplete.get());

// expected hook execution sequence
assertEquals("onStart - onFallbackStart - onFallbackSuccess - onComplete - ", command.builder.executionHook.executionSequence.toString());
}

/**
* Execution hook on short-circuit without a fallback
*/
@Test
public void testExecutionHookShortCircuitedWithoutFallbackViaQueue() {
TestCircuitBreaker circuitBreaker = new TestCircuitBreaker().setForceShortCircuit(true);
KnownFailureTestCommandWithoutFallback command = new KnownFailureTestCommandWithoutFallback(circuitBreaker);
try {
Expand Down Expand Up @@ -5950,7 +5990,7 @@ public void testExecutionHookShortCircuitedWithFallbackViaQueue() {
* Execution hook on short-circuit with a fallback
*/
@Test
public void testExecutionHookShortCircuitedWithFallbackViaExecute() {
public void testExecutionHookShortCircuitedWithoutFallbackViaExecute() {
TestCircuitBreaker circuitBreaker = new TestCircuitBreaker().setForceShortCircuit(true);
KnownFailureTestCommandWithoutFallback command = new KnownFailureTestCommandWithoutFallback(circuitBreaker);
try {
Expand Down
2 changes: 1 addition & 1 deletion hystrix-core/src/main/java/com/netflix/hystrix/exception/HystrixRuntimeException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class HystrixRuntimeException extends RuntimeException {
private final FailureType failureCause;

public static enum FailureType {
COMMAND_EXCEPTION, TIMEOUT, SHORTCIRCUIT, REJECTED_THREAD_EXECUTION, REJECTED_SEMAPHORE_EXECUTION, BAD_REQUEST_EXCEPTION, REJECTED_SEMAPHORE_FALLBACK
BAD_REQUEST_EXCEPTION, COMMAND_EXCEPTION, TIMEOUT, SHORTCIRCUIT, REJECTED_THREAD_EXECUTION, REJECTED_SEMAPHORE_EXECUTION, REJECTED_SEMAPHORE_FALLBACK
}

public HystrixRuntimeException(FailureType failureCause, Class<? extends HystrixCommand> commandClass, String message, Exception cause, Throwable fallbackException) {
Expand Down

0 comments on commit 61b77c3

Please sign in to comment.