>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18521 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I5d88dc0e5b3303751fe5fc33eb5c1df99949f5c9
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
3 files changed, 13 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/21/18521/1
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
index af39793..ef9154d 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/RequestTracker.java
@@ -138,7 +138,6 @@
}
@Override
-<<<<<<< HEAD (85d2b0 [NO ISSUE][HYR][MISC] += invocation helpers for
unchecked ex)
public void incrementFailedRequests() {
numOfFailedRequests.incrementAndGet();
}
@@ -149,8 +148,6 @@
}
@Override
-=======
->>>>>>> BRANCH (5b3465 [ASTERIXDB-3343][API] Add servlet to get
acitve/completed re)
public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status)
throws HyracksException {
String requestId = spec.getRequestId();
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index 3c8135a..be3daae 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -121,7 +121,6 @@
public void add(JobRun jobRun) throws HyracksException {
checkJob(jobRun);
JobSpecification job = jobRun.getJobSpecification();
-<<<<<<< HEAD (85d2b0 [NO ISSUE][HYR][MISC] += invocation helpers for
unchecked ex)
IJobCapacityController.JobSubmissionStatus status;
try {
status = jobCapacityController.allocate(job);
@@ -140,20 +139,6 @@
} catch (HyracksDataException ex) {
handleException(ex);
throw ex;
-=======
- IJobCapacityController.JobSubmissionStatus status =
jobCapacityController.allocate(job);
- CCServiceContext serviceCtx = ccs.getContext();
- serviceCtx.notifyJobCreation(jobRun.getJobId(), job, status);
- switch (status) {
- case QUEUE:
- queueJob(jobRun);
- break;
- case EXECUTE:
- executeJob(jobRun);
- break;
- default:
- throw new IllegalStateException("unknown submission status: "
+ status);
->>>>>>> BRANCH (5b3465 [ASTERIXDB-3343][API] Add servlet to get
acitve/completed re)
}
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18521
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I5d88dc0e5b3303751fe5fc33eb5c1df99949f5c9
Gerrit-Change-Number: 18521
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
