[01/50] [abbrv] lens git commit: LENS-1151 : Add logs for Queries moving between waiting and queued queries data structures
Repository: lens
Updated Branches:
refs/heads/current-release-line 911a6f929 -> c326de77c
LENS-1151 : Add logs for Queries moving between waiting and queued queries data
structures
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/714aae99
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/714aae99
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/714aae99
Branch: refs/heads/current-release-line
Commit: 714aae99d67319a1719b08a3386b5893d2b250ce
Parents: 4fea0c4
Author: Rajat Khandelwal
Authored: Fri Jun 17 10:35:27 2016 +0530
Committer: Amareshwari Sriramadasu
Committed: Fri Jun 17 10:35:27 2016 +0530
--
.../lens/server/query/QueryExecutionServiceImpl.java | 13 +++--
.../query/collect/UnioningWaitingQueriesSelector.java | 3 +++
.../DefaultQueryLaunchingConstraintsChecker.java | 3 +++
3 files changed, 9 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/lens/blob/714aae99/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 1f6ec13..2de098d 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
@@ -697,18 +697,12 @@ public class QueryExecutionServiceImpl extends
BaseLensService implements QueryE
log.debug("Acquiring lock in QuerySubmitter");
removalFromLaunchedQueriesLock.lock();
try {
-
-boolean isQueryAllowedToLaunch =
this.constraintsChecker.canLaunch(query, launchedQueries);
-
-log.debug("isQueryAllowedToLaunch:{}", isQueryAllowedToLaunch);
-if (isQueryAllowedToLaunch) {
-
+if (this.constraintsChecker.canLaunch(query, launchedQueries))
{
/* Query is not going to be added to waiting queries. No
need to keep the lock.
First release lock, then launch query */
removalFromLaunchedQueriesLock.unlock();
launchQuery(query);
} else {
-
/* Query is going to be added to waiting queries. Keep
holding the lock to avoid any removal from
launched queries. First add to waiting queries, then release
lock */
addToWaitingQueries(query);
@@ -3185,12 +3179,11 @@ public class QueryExecutionServiceImpl extends
BaseLensService implements QueryE
Set eligibleWaitingQueries = this.waitingQueriesSelector
.selectQueries(finishedQuery, this.waitingQueries);
-
+log.info("Eligible queries to pick from waiting queries: {}",
eligibleWaitingQueries);
if (eligibleWaitingQueries.isEmpty()) {
- log.debug("No queries eligible to move out of waiting state.");
+ log.info("No queries eligible to move out of waiting state.");
return;
}
-
waitingQueries.removeAll(eligibleWaitingQueries);
queuedQueries.addAll(eligibleWaitingQueries);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/lens/blob/714aae99/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
--
diff --git
a/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
b/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
index 8db059e..40b837f 100644
---
a/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
+++
b/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
@@ -32,11 +32,13 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
/**
* Selects queries eligible by all {@link WaitingQueriesSelectionPolicy} to
move them out of waiting state.
*
*/
+@Slf4j
public class UnioningWaitingQueriesSelector implements WaitingQueriesSelector {
private final ImmutableSet selectionPolicies;
@@ -86,6 +88,7 @@ public class UnioningWaitingQueriesSelector implements
WaitingQueriesSelector {
Set candiateQueries =
selectionPolicy.selectQueries(finishedQuery, waitingQueries);
candidateQueriesSets.add(candiateQueries);
+ log.info("Queries selected by policy: {} are: {}", selectionPolicy,
candiateQueries);
}
lens git commit: LENS-1151 : Add logs for Queries moving between waiting and queued queries data structures
Repository: lens
Updated Branches:
refs/heads/master 4fea0c4a2 -> 714aae99d
LENS-1151 : Add logs for Queries moving between waiting and queued queries data
structures
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/714aae99
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/714aae99
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/714aae99
Branch: refs/heads/master
Commit: 714aae99d67319a1719b08a3386b5893d2b250ce
Parents: 4fea0c4
Author: Rajat Khandelwal
Authored: Fri Jun 17 10:35:27 2016 +0530
Committer: Amareshwari Sriramadasu
Committed: Fri Jun 17 10:35:27 2016 +0530
--
.../lens/server/query/QueryExecutionServiceImpl.java | 13 +++--
.../query/collect/UnioningWaitingQueriesSelector.java | 3 +++
.../DefaultQueryLaunchingConstraintsChecker.java | 3 +++
3 files changed, 9 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/lens/blob/714aae99/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 1f6ec13..2de098d 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
@@ -697,18 +697,12 @@ public class QueryExecutionServiceImpl extends
BaseLensService implements QueryE
log.debug("Acquiring lock in QuerySubmitter");
removalFromLaunchedQueriesLock.lock();
try {
-
-boolean isQueryAllowedToLaunch =
this.constraintsChecker.canLaunch(query, launchedQueries);
-
-log.debug("isQueryAllowedToLaunch:{}", isQueryAllowedToLaunch);
-if (isQueryAllowedToLaunch) {
-
+if (this.constraintsChecker.canLaunch(query, launchedQueries))
{
/* Query is not going to be added to waiting queries. No
need to keep the lock.
First release lock, then launch query */
removalFromLaunchedQueriesLock.unlock();
launchQuery(query);
} else {
-
/* Query is going to be added to waiting queries. Keep
holding the lock to avoid any removal from
launched queries. First add to waiting queries, then release
lock */
addToWaitingQueries(query);
@@ -3185,12 +3179,11 @@ public class QueryExecutionServiceImpl extends
BaseLensService implements QueryE
Set eligibleWaitingQueries = this.waitingQueriesSelector
.selectQueries(finishedQuery, this.waitingQueries);
-
+log.info("Eligible queries to pick from waiting queries: {}",
eligibleWaitingQueries);
if (eligibleWaitingQueries.isEmpty()) {
- log.debug("No queries eligible to move out of waiting state.");
+ log.info("No queries eligible to move out of waiting state.");
return;
}
-
waitingQueries.removeAll(eligibleWaitingQueries);
queuedQueries.addAll(eligibleWaitingQueries);
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/lens/blob/714aae99/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
--
diff --git
a/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
b/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
index 8db059e..40b837f 100644
---
a/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
+++
b/lens-server/src/main/java/org/apache/lens/server/query/collect/UnioningWaitingQueriesSelector.java
@@ -32,11 +32,13 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
/**
* Selects queries eligible by all {@link WaitingQueriesSelectionPolicy} to
move them out of waiting state.
*
*/
+@Slf4j
public class UnioningWaitingQueriesSelector implements WaitingQueriesSelector {
private final ImmutableSet selectionPolicies;
@@ -86,6 +88,7 @@ public class UnioningWaitingQueriesSelector implements
WaitingQueriesSelector {
Set candiateQueries =
selectionPolicy.selectQueries(finishedQuery, waitingQueries);
candidateQueriesSets.add(candiateQueries);
+ log.info("Queries selected by policy: {} are: {}", selectionPolicy,
candiateQueries);
}
return candidateQueries
