Skip to content

[Feature][Core] Add PendingJobs info in the response of GetOverviewOperation #9902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

[Feature][Core] Add PendingJobs info in the response of GetOverviewOperation #9902

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7dc8e3b
1
xiaochen-zhou Sep 13, 2025
a730cf2
[Feature][Core] Add PendingJobs info in the response of GetOverviewOp…
xiaochen-zhou Sep 26, 2025
67fb50d
Merge branch 'dev' into feature/overview-pendingjobs
xiaochen-zhou Sep 27, 2025
c179357
use PeekBlockingQueue jobId map
xiaochen-zhou Sep 27, 2025
e6939a0
Merge branch 'dev' into feature/overview-pendingjobs
xiaochen-zhou Oct 7, 2025
99b58ca
Merge branch 'dev' into feature/overview-pendingjobs
xiaochen-zhou Oct 9, 2025
a39213a
trigger CI build
xiaochen-zhou Oct 9, 2025
b92cb68
Merge remote-tracking branch 'origin/dev' into feature/overview-pendi…
xiaochen-zhou Oct 12, 2025
59f7f41
[Feature][Core] Add PendingJobs info in the response of GetOverviewOp…
xiaochen-zhou Oct 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/en/seatunnel-engine/rest-api-v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Please refer [security](security.md)
"unassignedSlot":"0",
"works":"1",
"runningJobs":"0",
"pendingJobs":"0",
"finishedJobs":"0",
"failedJobs":"0",
"cancelledJobs":"0"
Expand Down
1 change: 1 addition & 0 deletions docs/zh/seatunnel-engine/rest-api-v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ seatunnel:
"unassignedSlot":"0",
"works":"1",
"runningJobs":"0",
"pendingJobs":"0",
"finishedJobs":"0",
"failedJobs":"0",
"cancelledJobs":"0"
Expand Down
6 changes: 4 additions & 2 deletions ...connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/RestApiIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@ public void testOverview() {
.statusCode(200)
.body("projectVersion", notNullValue())
.body("totalSlot", equalTo("40"))
.body("workers", equalTo("2"));
.body("workers", equalTo("2"))
.body("pendingJobs", notNullValue());
given().get(
HOST
+ value
Expand All @@ -680,7 +681,8 @@ public void testOverview() {
.statusCode(200)
.body("projectVersion", notNullValue())
.body("totalSlot", equalTo("40"))
.body("workers", equalTo("2"));
.body("workers", equalTo("2"))
.body("pendingJobs", notNullValue());
});
});
}
Expand Down
2 changes: 2 additions & 0 deletions ...va/org/apache/seatunnel/engine/server/resourcemanager/opeartion/GetOverviewOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public static OverviewInfo getOverviewInfo(
overviewInfo.setTotalSlot(assignedSlots.size() + unassignedSlots.size());
overviewInfo.setUnassignedSlot(unassignedSlots.size());
overviewInfo.setWorkers(resourceManager.workerCount(tags));
overviewInfo.setPendingJobs(
server.getCoordinatorService().getJobCountMetrics().getPendingJobCount());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about creating a method in CoordinatorService that directly returns only the pendingJobCount instead of using the getJobCountMetrics method?

Copy link
Member

@Hisoka-X Hisoka-X Sep 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use

seatunnel/seatunnel-engine/seatunnel-engine-server/src/main/java/org/apache/seatunnel/engine/server/utils/PeekBlockingQueue.java

Line 51 in b5f583b

private final Map<Long, E> jobIdMap = new ConcurrentHashMap<>();

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • the constructor method of the JobHistoryService
jobHistoryService =
                new JobHistoryService(
                        nodeEngine,
                        runningJobStateIMap,
                        logger,
                        pendingJobQueue.getJobIdMap(),
                        runningJobMasterMap,
                        nodeEngine.getHazelcastInstance().getMap(Constant.IMAP_FINISHED_JOB_STATE),
                        nodeEngine
                                .getHazelcastInstance()
                                .getMap(Constant.IMAP_FINISHED_JOB_METRICS),
                        nodeEngine
                                .getHazelcastInstance()
                                .getMap(Constant.IMAP_FINISHED_JOB_VERTEX_INFO),
                        engineConfig.getHistoryJobExpireMinutes());
  • the getJobStatusData method of JobHistoryService
public List<JobStatusData> getJobStatusData() {
        List<JobStatusData> status = new ArrayList<>();
        final List<JobState> runningJobStateList =
                runningJobMasterMap.values().stream()
                        .map(master -> toJobStateMapper(master, true))
                        .collect(Collectors.toList());
        Set<Long> runningJonIds =
                runningJobStateList.stream().map(JobState::getJobId).collect(Collectors.toSet());

        List<JobState> pendingJobStateList =
                pendingJobInfoMap.entrySet().stream()
                        .map(
                                entry -> {
                                    Long jobId = entry.getKey();
                                    JobImmutableInformation jobImmutableInformation =
                                            entry.getValue()
                                                    .getJobMaster()
                                                    .getJobImmutableInformation();
                                    return new JobState(
                                            jobId,
                                            jobImmutableInformation.getJobName(),
                                            JobStatus.PENDING,
                                            jobImmutableInformation.getCreateTime(),
                                            null,
                                            null,
                                            null,
                                            null);
                                })
                        .collect(Collectors.toList());
....

jobIdMap has been assigned to pendingJobInfoMap of the JobHistoryService

Copy link
Contributor

@dybyte dybyte Sep 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In my opinion, the getJobStatusData() and getJobCountMetrics() methods perform a lot of extra work that isn’t needed if we only want to get the pendingJobCount.

overviewInfo.setRunningJobs(
nodeEngine.getHazelcastInstance().getMap(Constant.IMAP_RUNNING_JOB_INFO).size());
overviewInfo.setFailedJobs(
Expand Down
1 change: 1 addition & 0 deletions ...c/main/java/org/apache/seatunnel/engine/server/resourcemanager/resource/OverviewInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class OverviewInfo implements Serializable {
private String gitCommitAbbrev;
private int totalSlot;
private int unassignedSlot;
private long pendingJobs;
private long runningJobs;
private long finishedJobs;
private long failedJobs;
Expand Down