Skip to content
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.

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

handle more job status on SGE system #491

Merged
merged 63 commits into from
Sep 3, 2024
Merged

Conversation

thangckt
Copy link
Contributor

@thangckt thangckt commented Sep 3, 2024

Summary by CodeRabbit

  • New Features
    • Enhanced job status tracking with the addition of new status conditions for improved accuracy in job state representation.
  • Bug Fixes
    • Modified logic for determining job status to better reflect current conditions, improving system responsiveness.

thangckt and others added 30 commits March 26, 2024 16:25
- add option: "strategy": {"customized_script_header_template_file": ""},

- add option: `sge_pe_name`
Copy link
Contributor

coderabbitai bot commented Sep 3, 2024

Walkthrough

Walkthrough

The changes to the check_status method in the default_resources class of dpdispatcher/machines/pbs.py enhance the job status evaluation by incorporating additional job status conditions. New status words such as "hqw", "t", "Rr", "Eqw", "dr", and "dt" have been added to improve the accuracy of job state reporting.

Changes

Files Change Summary
dpdispatcher/machines/pbs.py Modified the check_status method to include new job status conditions and updated logic for job state evaluation.

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 39846ae and 1ded55e.

Files selected for processing (1)
  • dpdispatcher/machines/pbs.py (2 hunks)
Additional context used
GitHub Check: codecov/patch
dpdispatcher/machines/pbs.py

[warning] 298-298: dpdispatcher/machines/pbs.py#L298
Added line #L298 was not covered by tests


[warning] 300-300: dpdispatcher/machines/pbs.py#L300
Added line #L300 was not covered by tests


[warning] 302-303: dpdispatcher/machines/pbs.py#L302-L303
Added lines #L302 - L303 were not covered by tests

Additional comments not posted (1)
dpdispatcher/machines/pbs.py (1)

298-303: Add unit tests for new status words.

The static analysis tool indicates that the new lines (298, 300, 302-303) are not covered by tests. To ensure the reliability of these changes and facilitate future maintenance, it's important to add unit tests for these new status words.

Please add unit tests that cover the following scenarios:

  1. Job status is "hqw" or "t" (should return JobStatus.waiting)
  2. Job status is "Rr" (should return JobStatus.running)
  3. Job status is "Eqw", "dr", or "dt" (should return JobStatus.terminated)

Here's a shell script to verify the existence of test files:

Tools
GitHub Check: codecov/patch

[warning] 298-298: dpdispatcher/machines/pbs.py#L298
Added line #L298 was not covered by tests


[warning] 300-300: dpdispatcher/machines/pbs.py#L300
Added line #L300 was not covered by tests


[warning] 302-303: dpdispatcher/machines/pbs.py#L302-L303
Added lines #L302 - L303 were not covered by tests


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Tip

Early access features: enabled

We are currently testing the following features in early access:

  • Anthropic claude-3-5-sonnet for code reviews: Anthropic claims that the new Claude model has stronger code understanding and code generation capabilities than their previous models. Note: Our default code review model was also updated late last week. Please compare the quality of the reviews between the two models by toggling the early access feature.

Note:

  • You can enable or disable early access features from the CodeRabbit UI or by updating the CodeRabbit configuration file.
  • Please join our Discord Community to provide feedback and report issues on the discussion post.

Copy link

codecov bot commented Sep 3, 2024

Codecov Report

Attention: Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.

Project coverage is 47.78%. Comparing base (39846ae) to head (1ded55e).
Report is 10 commits behind head on master.

Files with missing lines Patch % Lines
dpdispatcher/machines/pbs.py 0.00% 4 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (39846ae) and HEAD (1ded55e). Click for more details.

HEAD has 16 uploads less than BASE
Flag BASE (39846ae) HEAD (1ded55e)
30 14
Additional details and impacted files
@@             Coverage Diff             @@
##           master     #491       +/-   ##
===========================================
- Coverage   60.25%   47.78%   -12.47%     
===========================================
  Files          39       39               
  Lines        3857     3859        +2     
===========================================
- Hits         2324     1844      -480     
- Misses       1533     2015      +482     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

Outside diff range, codebase verification and nitpick comments (1)
dpdispatcher/machines/pbs.py (1)

264-264: Improved job status handling with additional states.

The added comment and new status words enhance the method's ability to handle different job states. This is a good improvement that makes the code more robust.

Consider adding a brief explanation for each new status word in a comment, to improve code maintainability. For example:

# Status word meanings:
# qw: queued and waiting
# hqw: hold, queued, and waiting
# t: transferring
# r: running
# Rr: running (restart)
# Eqw: error, queued, and waiting
# dr: deleted and running
# dt: deleted and transferring

Also applies to: 298-303

Comment on lines +298 to +303
if status_word in ["qw", "hqw", "t"]:
return JobStatus.waiting
elif status_word in ["r"]:
elif status_word in ["r", "Rr"]:
return JobStatus.running
elif status_word in ["Eqw", "dr", "dt"]:
return JobStatus.terminated
Copy link
Contributor

Choose a reason for hiding this comment

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

Consider refactoring status checks for better maintainability.

The current structure of multiple if-elif statements might become hard to maintain if more status words are added in the future. Consider refactoring this part of the code to use a dictionary for status mapping, which would make it more maintainable and easier to extend.

Here's a suggested refactoring:

STATUS_MAPPING = {
    'qw': JobStatus.waiting,
    'hqw': JobStatus.waiting,
    't': JobStatus.waiting,
    'r': JobStatus.running,
    'Rr': JobStatus.running,
    'Eqw': JobStatus.terminated,
    'dr': JobStatus.terminated,
    'dt': JobStatus.terminated,
}

def check_status(self, job):
    # ... (previous code remains the same)
    
    status_word = status_line.split()[4]
    return STATUS_MAPPING.get(status_word, JobStatus.unknown)

This approach centralizes the status mapping, making it easier to add or modify statuses in the future without changing the method's logic.

Tools
GitHub Check: codecov/patch

[warning] 298-298: dpdispatcher/machines/pbs.py#L298
Added line #L298 was not covered by tests


[warning] 300-300: dpdispatcher/machines/pbs.py#L300
Added line #L300 was not covered by tests


[warning] 302-303: dpdispatcher/machines/pbs.py#L302-L303
Added lines #L302 - L303 were not covered by tests

@thangckt
Copy link
Contributor Author

thangckt commented Sep 3, 2024

@njzjz

@njzjz njzjz merged commit 6c767cf into deepmodeling:master Sep 3, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants