diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtils.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtils.java index ae88f6155..62f5044bc 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtils.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/api/akka/route/utils/JobRouteUtils.java @@ -50,7 +50,7 @@ public class JobRouteUtils { public static final String QUERY_PARAM_ACTIVE_ONLY = "activeOnly"; public static final String QUERY_PARAM_LABELS_QUERY = "labels"; public static final String QUERY_PARAM_LABELS_OPERAND = "labels.op"; - public static final String QUERY_PARAM_END_JOB_ID = "endJobId"; + public static final String QUERY_PARAM_END_JOB_ID = "startJobIdExclusive"; public static WorkerEvent createWorkerStatusRequest(final PostJobStatusRequest req) { final Status status = req.getStatus(); diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/CompletedJobStore.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/CompletedJobStore.java index 351927708..2a9c35a2c 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/CompletedJobStore.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/CompletedJobStore.java @@ -231,14 +231,14 @@ public List getCompletedJobs(int limit) throws IOException { } @Override - public List getCompletedJobs(int limit, JobId endExclusive) throws IOException { + public List getCompletedJobs(int limit, JobId startExclusive) throws IOException { List completedJobsList = - jobStore.loadCompletedJobsForCluster(name, limit, endExclusive); + jobStore.loadCompletedJobsForCluster(name, limit, startExclusive); addCompletedJobsToCache(completedJobsList); return terminalSortedJobSet .stream() .filter(job -> - JobId.fromId(job.getJobId()).get().getJobNum() < endExclusive.getJobNum()) + JobId.fromId(job.getJobId()).get().getJobNum() < startExclusive.getJobNum()) .limit(limit) .collect(Collectors.toList()); } diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/JobClusterActor.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/JobClusterActor.java index 58fd05303..1f7848909 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/JobClusterActor.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/JobClusterActor.java @@ -1076,7 +1076,9 @@ private List getFilteredTerminalJobIdList(ListJobCriteria request, Se if(!prefilteredJobIdSet.isEmpty()) { completedJobsList = prefilteredJobIdSet.stream().map((jId) -> jobManager.getCompletedJob(jId)).filter((cjOp) -> cjOp.isPresent()).map((cjop) -> cjop.get()).collect(Collectors.toList()); } else { - completedJobsList = jobManager.getCompletedJobsList(request.getLimit().orElse(DEFAULT_LIMIT), request.getEndJobIdExclusive().orElse(null)); + completedJobsList = jobManager.getCompletedJobsList( + request.getLimit().orElse(DEFAULT_LIMIT), + request.getStartJobIdExclusive().orElse(null)); } List subsetCompletedJobs = completedJobsList.subList(0, Math.min(completedJobsList.size(), request.getLimit().orElse(DEFAULT_LIMIT))); @@ -1168,7 +1170,7 @@ private Observable getFilteredTerminalJobList(ListJobCrit jobInfoList = jobIdSet.stream().map((jId) -> jobManager.getCompletedJob(jId)) .filter((compJobOp) -> compJobOp.isPresent()).map((compJobOp) -> compJobOp.get()).collect(Collectors.toList()); } else { - jobInfoList = jobManager.getCompletedJobsList(request.getLimit().orElse(DEFAULT_LIMIT), request.getEndJobIdExclusive().orElse(null)); + jobInfoList = jobManager.getCompletedJobsList(request.getLimit().orElse(DEFAULT_LIMIT), request.getStartJobIdExclusive().orElse(null)); } List shortenedList = jobInfoList.subList(0, Math.min(jobInfoList.size(), request.getLimit().orElse(DEFAULT_LIMIT))); @@ -2905,10 +2907,10 @@ List getActiveJobsList() { * List of jobs in completed state * @return list of completed jobs */ - List getCompletedJobsList(int limit, @Nullable JobId to) { + List getCompletedJobsList(int limit, @Nullable JobId from) { try { - if (to != null) { - return completedJobStore.getCompletedJobs(limit, to); + if (from != null) { + return completedJobStore.getCompletedJobs(limit, from); } else { return completedJobStore.getCompletedJobs(limit); } diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/proto/JobClusterManagerProto.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/proto/JobClusterManagerProto.java index d1c7ad4a1..b4ca6bfdf 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/proto/JobClusterManagerProto.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/jobcluster/proto/JobClusterManagerProto.java @@ -883,7 +883,7 @@ public static final class ListJobCriteria { private final List