>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18282 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: Ibcbefe51fe91e800dbc218d5b7d65ca849c3db2f
---
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
M
hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
3 files changed, 16 insertions(+), 11 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/82/18282/1
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
index 017026d..f56ec33 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java
@@ -78,16 +78,9 @@
}
@Override
-<<<<<<< HEAD (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec,
IJobCapacityController.JobSubmissionStatus status) throws
HyracksException {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(getClass().getSimpleName() + " notified of new job "
+ jobId);
- }
-=======
- public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec) throws HyracksException {
LOGGER.debug("{} notified of new job {}", getClass().getSimpleName(),
jobId);
->>>>>>> BRANCH (cc1334 [NO ISSUE][HYR] Reduce config manager debug logging)
if (jobResultLocations.get(jobId) != null) {
throw HyracksDataException.create(ErrorCode.MORE_THAN_ONE_RESULT,
jobId);
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
index f611589..f065940 100644
---
a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
+++
b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobCleanupWork.java
@@ -52,10 +52,6 @@
@Override
public void run() {
-<<<<<<< HEAD (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
- LOGGER.info("cleaning up {} on NCs, status={}", jobId, status);
-=======
->>>>>>> BRANCH (cc1334 [NO ISSUE][HYR] Reduce config manager debug logging)
final JobRun jobRun = jobManager.get(jobId);
if (jobRun == null) {
LOGGER.debug("ignoring cleanup for unknown {}", jobId);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18282
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: Ibcbefe51fe91e800dbc218d5b7d65ca849c3db2f
Gerrit-Change-Number: 18282
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
