This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 6a10f3f81db977c706447ece476b487cbe56414c Merge: f9681dc20c 3b07af0723 Author: Michael Blow <[email protected]> AuthorDate: Mon Jun 10 11:41:58 2024 -0400 Merge branch 'gerrit/neo' into 'gerrit/trinity' Change-Id: I67f246de4e36b19085525cb4a6afe5a4f9e92212 .../org/apache/asterix/active/ActiveManager.java | 2 -- .../http/server/QueryServiceRequestParameters.java | 9 +++++++++ .../api/http/server/QueryServiceServlet.java | 21 ++++++++++++++++----- .../org/apache/asterix/app/nc/RecoveryManager.java | 3 --- .../hyracks/control/cc/executor/JobExecutor.java | 6 +++++- .../control/cc/result/ResultDirectoryService.java | 1 - .../work/RegisterResultPartitionLocationWork.java | 5 +++++ 7 files changed, 35 insertions(+), 12 deletions(-) diff --cc hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/result/ResultDirectoryService.java index f56ec33590,80d7630524..b6274d92b3 --- 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,9 -77,7 +78,8 @@@ public class ResultDirectoryService ext } @Override - public synchronized void notifyJobCreation(JobId jobId, JobSpecification spec) throws HyracksException { + public synchronized void notifyJobCreation(JobId jobId, JobSpecification spec, + IJobCapacityController.JobSubmissionStatus status) throws HyracksException { - LOGGER.debug("{} notified of new job {}", getClass().getSimpleName(), jobId); if (jobResultLocations.get(jobId) != null) { throw HyracksDataException.create(ErrorCode.MORE_THAN_ONE_RESULT, jobId); }
