commit | 244c3c5e8c12f5ab7699609fdc47ffad6d2675b0 | [log] [tgz] |
---|---|---|
author | Michael Blow <mblow@apache.org> | Tue Apr 06 12:39:30 2021 -0400 |
committer | Michael Blow <mblow@apache.org> | Tue Apr 06 17:03:21 2021 +0000 |
tree | 20637ac88127f5c6949ad3687b77f3c3a3bcad13 | |
parent | d821af07316d94911f153acfae7c641d8216e820 [diff] |
[NO ISSUE][HYR][UTIL] Abort retries on expired span no retry delay Change-Id: I2f56cc23c5a869e76241f1ac303cf57a14714182 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10923 Reviewed-by: Michael Blow <mblow@apache.org> Reviewed-by: Ian Maxon <imaxon@uci.edu> Reviewed-by: Hussain Towaileb <hussainht@gmail.com> Tested-by: Michael Blow <mblow@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/InvokeUtil.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/InvokeUtil.java index 6ecb677..0b1c5a6 100644 --- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/InvokeUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/util/InvokeUtil.java
@@ -278,7 +278,7 @@ failure = th; try { long delayMs = delay.calculate(attempt); - if (!policy.retry(th) || span.remaining(TimeUnit.MILLISECONDS) < delayMs) { + if (!policy.retry(th) || span.elapsed() || span.remaining(TimeUnit.MILLISECONDS) < delayMs) { onFailure.attemptFailed(action, attempt, true, span, failure); throw HyracksDataException.create(failure); } else {