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

DM-41229: Distribute log files across subdirs. #22

Merged
merged 1 commit into from Nov 3, 2023

Conversation

MichelleGower
Copy link
Contributor

@MichelleGower MichelleGower commented Oct 18, 2023

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

@codecov
Copy link

codecov bot commented Oct 18, 2023

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (0782abd) 39.28% compared to head (32fb5b5) 47.32%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #22      +/-   ##
==========================================
+ Coverage   39.28%   47.32%   +8.04%     
==========================================
  Files          10       11       +1     
  Lines         336      374      +38     
  Branches       60       61       +1     
==========================================
+ Hits          132      177      +45     
+ Misses        198      191       -7     
  Partials        6        6              
Files Coverage Δ
tests/test_job.py 100.00% <100.00%> (ø)
python/lsst/ctrl/bps/parsl/job.py 45.55% <83.33%> (+15.55%) ⬆️

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

"replaceVars": False,
"default": "",
},
)
Copy link
Contributor

Choose a reason for hiding this comment

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

get_bps_config_value exists to simplify these kind of lookups. What are you trying to do that it does not accomplish?
Is a default of "" suitable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Am I missing something in the get_bps_config_value code? I need to be able to not replace the variables in the value returned (

options: dict[str, Any] = dict(expandEnvVars=True, replaceVars=True, required=required)
explicitly says to replace the variables) because I need to replace the variables later with information from the GenericWorkflowJob and I need to pass in other search options (the curvals) but don't see a way to do that in get_bps_config_value.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, that sounds rather more complicated than get_bps_config_value can handle. We could extend it, but maybe it's not worth it for a single use case.

@MichelleGower MichelleGower force-pushed the tickets/DM-41229 branch 3 times, most recently from a22b6a8 to b0fb04b Compare October 26, 2023 17:09
Copy link
Contributor

@PaulPrice PaulPrice left a comment

Choose a reason for hiding this comment

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

Great, thanks! I'm especially grateful for the test.

@@ -52,6 +52,9 @@ The following configuration settings can be used in configuring the plugin:
* ``parsl.log_level`` (`str`): logging level for Parsl; may be one of ``CRITICAL``, ``DEBUG``, ``ERROR``, ``FATAL``, ``INFO``, ``WARN``.
* ``project`` (`str`): project name; defaults to ``bps``.
* ``campaign`` (`str`): campaign name; defaults to the user name (which can also be set via the ``username`` setting).
* ``subDirTemplate`` (`str`): template used to define log subdirectories in order to avoid having too many files in a single directory; defaults to a very generic template defined by ctrl_bps in bps_defaults.yaml_. To run with no subdirectories (original plugin behavior), in the submit yaml set ``subDirTemplate`` to the empty string (``subDirTemplate: ''``).
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think there's a need to mention "original plugin behavior".

@MichelleGower MichelleGower merged commit 4a2cdae into main Nov 3, 2023
16 checks passed
@MichelleGower MichelleGower deleted the tickets/DM-41229 branch November 3, 2023 17:00
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.

None yet

2 participants