Repository: lens Updated Branches: refs/heads/master 99f8e344e -> cc1c92c4c
LENS-1282: getUpdatedQueryContext() call is missing from QueryExecutionServiceImpl#executeTimeoutInternal Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/cc1c92c4 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/cc1c92c4 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/cc1c92c4 Branch: refs/heads/master Commit: cc1c92c4ceb4424f910cb0d1f7cf6ff14c1ee446 Parents: 99f8e34 Author: Puneet Gupta <puneet.k.gu...@gmail.com> Authored: Mon Aug 22 18:20:48 2016 +0530 Committer: Puneet <puneet.gu...@inmobi.com> Committed: Mon Aug 22 18:20:48 2016 +0530 ---------------------------------------------------------------------- .../apache/lens/server/query/QueryExecutionServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/cc1c92c4/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java ---------------------------------------------------------------------- diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java index 1752414..78d0b8a 100644 --- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java +++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java @@ -2296,9 +2296,15 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE long totalWaitMillisSoFar = 0; synchronized (listener) { while (totalWaitMillisSoFar < totalWaitTime - && !queryCtx.getStatus().executed() && !queryCtx.getStatus().finished()) { + && !listener.querySuccessful + && !queryCtx.getStatus().executed() + && !queryCtx.getStatus().finished()) { listener.wait(waitMillisPerCheck); totalWaitMillisSoFar += waitMillisPerCheck; + if (!listener.querySuccessful) { + //update ths status in case query is not successful yet + queryCtx = getUpdatedQueryContext(sessionHandle, handle); + } } } } catch (InterruptedException e) {
