Repository: lens Updated Branches: refs/heads/master c5dd7de4b -> 1924bbb01
LENS-955 : Fix test failure TestQueryEndEmailNotifier.testLaunchFailure Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/1924bbb0 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/1924bbb0 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/1924bbb0 Branch: refs/heads/master Commit: 1924bbb018cbb4aa7cf8c0b2cf11376a053e3b9d Parents: c5dd7de Author: Amareshwari Sriramadasu <[email protected]> Authored: Tue Jul 26 16:15:59 2016 +0530 Committer: Amareshwari Sriramadasu <[email protected]> Committed: Tue Jul 26 16:15:59 2016 +0530 ---------------------------------------------------------------------- .../server/query/QueryExecutionServiceImpl.java | 23 ++++++++++---------- 1 file changed, 12 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/1924bbb0/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 a582994..4df2b9b 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 @@ -2049,17 +2049,18 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE } private QueryHandle submitQuery(final QueryContext ctx) throws LensException { - - QueryStatus before = ctx.getStatus(); - ctx.setStatus(new QueryStatus(0.0, null, QUEUED, "Query is queued", false, null, null, null)); - queuedQueries.add(ctx); - log.debug("Added to Queued Queries:{}", ctx.getQueryHandleString()); - allQueries.put(ctx.getQueryHandle(), ctx); - // Add to session's active query list - getSession(SESSION_MAP.get(ctx.getLensSessionIdentifier())).addToActiveQueries(ctx.getQueryHandle()); - fireStatusChangeEvent(ctx, ctx.getStatus(), before); - log.info("Returning handle {}", ctx.getQueryHandle().getHandleId()); - return ctx.getQueryHandle(); + synchronized (ctx) { + QueryStatus before = ctx.getStatus(); + ctx.setStatus(new QueryStatus(0.0, null, QUEUED, "Query is queued", false, null, null, null)); + queuedQueries.add(ctx); + log.info("Added to Queued Queries:{}", ctx.getQueryHandleString()); + allQueries.put(ctx.getQueryHandle(), ctx); + // Add to session's active query list + getSession(SESSION_MAP.get(ctx.getLensSessionIdentifier())).addToActiveQueries(ctx.getQueryHandle()); + fireStatusChangeEvent(ctx, ctx.getStatus(), before); + log.info("Returning handle {}", ctx.getQueryHandle().getHandleId()); + return ctx.getQueryHandle(); + } } /*
