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

Make lsf driver submit signal invalid instead of abort #6193

Merged
merged 1 commit into from
Sep 28, 2023

Conversation

eivindjahren
Copy link
Contributor

@eivindjahren eivindjahren commented Sep 27, 2023

Fixes an issue where lsf driver submit fail would inconsistently abort instead of signal failure.

Pre review checklist

  • Read through the code changes carefully after finishing work
  • Make sure tests pass locally (after every commit!)
  • Prepare changes in small commits for more convenient review (optional)
  • PR title captures the intent of the changes, and is fitting for release notes.
  • Updated documentation
  • Ensured that unit tests are added for all new behavior (See
    Ground Rules),
    and changes to existing code have good test coverage.

Pre merge checklist

  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.

@eivindjahren eivindjahren force-pushed the fix_lsf_parse_handling branch 3 times, most recently from 38dc905 to eab7ab6 Compare September 27, 2023 13:03
@eivindjahren eivindjahren self-assigned this Sep 27, 2023
@eivindjahren eivindjahren added the release-notes:skip If there should be no mention of this in release notes label Sep 27, 2023
@eivindjahren eivindjahren changed the title Make lsf driver signal invalid instead of abort Make lsf driver submit signal invalid instead of abort Sep 27, 2023
@@ -28,31 +28,19 @@ void test_OK() {

void test_file_does_not_exist() {
test_assert_int_equal(lsf_job_parse_bsub_stdout("bsub", "does/not/exist"),
0);
-1);
}

void parse_invalid(void *arg) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This function can be deleted as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@@ -71,13 +103,15 @@ def test_submit_attempt_is_initinally_zero(job_queue_node):
def test_when_submit_command_returns_invalid_output_then_submit_fails(
Copy link
Contributor

Choose a reason for hiding this comment

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

there is a typo on line 97 (initinally), fly-by-fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

@eivindjahren eivindjahren force-pushed the fix_lsf_parse_handling branch 2 times, most recently from 73776d2 to a2d53fc Compare September 28, 2023 11:43
@codecov-commenter
Copy link

codecov-commenter commented Sep 28, 2023

Codecov Report

Merging #6193 (9a937d4) into main (3843d9d) will increase coverage by 0.02%.
The diff coverage is 25.00%.

@@            Coverage Diff             @@
##             main    #6193      +/-   ##
==========================================
+ Coverage   82.64%   82.66%   +0.02%     
==========================================
  Files         347      347              
  Lines       21249    21248       -1     
  Branches      834      833       -1     
==========================================
+ Hits        17561    17565       +4     
+ Misses       3390     3385       -5     
  Partials      298      298              
Files Coverage Δ
src/clib/lib/job_queue/lsf_driver.cpp 36.32% <25.00%> (+0.28%) ⬆️

... and 2 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@berland berland left a comment

Choose a reason for hiding this comment

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

cute fifo!

@eivindjahren eivindjahren enabled auto-merge (rebase) September 28, 2023 13:44
@eivindjahren eivindjahren merged commit 68ff10b into equinor:main Sep 28, 2023
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes:skip If there should be no mention of this in release notes
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants