Repository: lens Updated Branches: refs/heads/master 471fd9020 -> 0013ec206
LENS-1275: Launch Time should be set before executeAsync is called on selected driver Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/0013ec20 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/0013ec20 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/0013ec20 Branch: refs/heads/master Commit: 0013ec2060698586b46c2697f80897c6d715b90c Parents: 471fd90 Author: Rajat Khandelwal <pro...@apache.org> Authored: Tue Aug 30 17:16:11 2016 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Tue Aug 30 17:16:11 2016 +0530 ---------------------------------------------------------------------- .../apache/lens/server/query/QueryExecutionServiceImpl.java | 6 +++++- .../java/org/apache/lens/server/query/TestQueryService.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/0013ec20/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 2f27fc2..a9aa497 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 @@ -746,6 +746,9 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE QueryLauncher(QueryContext query) { this.query = query; + log.info("Query launcher created for query {} on driver {}", query.getQueryHandle(), + query.getSelectedDriver().getFullyQualifiedName()); + query.setLaunchTime(System.currentTimeMillis()); } @Override @@ -753,6 +756,8 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE synchronized (query) { try { logSegregationContext.setLogSegragationAndQueryId(query.getQueryHandleString()); + log.info("Starting to launch query {} on driver {}", query.getQueryHandle(), + query.getSelectedDriver().getFullyQualifiedName()); // acquire session before launching query. acquire(query.getLensSessionIdentifier()); if (!query.getStatus().cancelled()) { @@ -794,7 +799,6 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE addSessionResourcesToDriver(query); query.getSelectedDriver().executeAsync(query); query.setStatusSkippingTransitionTest(newStatus); - query.setLaunchTime(System.currentTimeMillis()); query.clearTransientStateAfterLaunch(); log.info("Added to launched queries. QueryId:{}", query.getQueryHandleString()); fireStatusChangeEvent(query, newStatus, oldStatus); http://git-wip-us.apache.org/repos/asf/lens/blob/0013ec20/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java ---------------------------------------------------------------------- diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java index 4fd4fdb..45a753d 100644 --- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java +++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java @@ -284,7 +284,7 @@ public class TestQueryService extends LensJerseyTest { LensQuery lensQuery = executeAndWaitForQueryToFinish(target(), lensSessionId, "select fail from non_exist", Optional.<LensConf>absent(), Optional.of(Status.FAILED), mt); assertTrue(lensQuery.getSubmissionTime() > 0); - assertEquals(lensQuery.getLaunchTime(), 0); + assertTrue(lensQuery.getLaunchTime() > 0); assertEquals(lensQuery.getDriverStartTime(), 0); assertEquals(lensQuery.getDriverFinishTime(), 0); assertTrue(lensQuery.getFinishTime() > 0);
