Skip to content

Consolidate querying both running and history jobs in pbspro #9

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

Merged
mnakao merged 1 commit into from
Jun 25, 2025
Merged

Consolidate querying both running and history jobs in pbspro #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions lib/schedulers/pbspro.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,14 @@ def query(jobs, bin = nil, bin_overrides = nil, ssh_wrapper = nil)

qstat = get_command_path("qstat", bin, bin_overrides)

# Try to get info for running jobs
command = [ssh_wrapper, qstat, "-f -t", jobs.join(" ")].compact.join(" ")
stdout1, stderr1, status1 = Open3.capture3(command)
return nil, [stdout1, stderr1].join(" ") unless status1.success?

info = {}
parse_qstat_output(stdout1, info)
remaining_jobs = jobs.reject { |id| info.key?(id) }
return info, nil if remaining_jobs.empty?

# Try to get info for completed jobs
command = [ssh_wrapper, qstat, "-f -t -x", remaining_jobs.join(" ")].compact.join(" ")
stdout2, stderr2, status2 = Open3.capture3(command)
return nil, [stdout2, stderr2].join(" ") unless status2.success?
# Try to get info for both running and completed jobs
# command = [ssh_wrapper, qstat, "-f -t -x", jobs.join(" ")].compact.join(" ")
command = [ssh_wrapper, qstat, "-f -t -x"].compact.join(" ")
stdout, stderr, status = Open3.capture3(command)
return nil, [stdout, stderr].join(" ") unless status.success?

parse_qstat_output(stdout2, info)
parse_qstat_output(stdout, info)
return info, nil
rescue Exception => e
return nil, e.message
Expand Down