Add configuration option to disable lock file creation #1818
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ruadhri17
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Robot Results
Passed Tests
|
crates/core/tedge_mapper/src/main.rs
Outdated
| // Run only one instance of a mapper (if enabled) | ||
| if config.query(LockFilesSetting)?.is_set() { | ||
| let run_dir: PathBuf = config.query(RunPathSetting)?.into(); | ||
| let _flock = check_another_instance_is_not_running(&mapper_opt.name.to_string(), &run_dir)?; |
There was a problem hiding this comment.
Since the lock is released on drop, you have to use here the same trick as for the agent, i.e. to hold a reference to Some(Lock).
crates/core/tedge_agent/src/agent.rs
Outdated
Comment on lines
276
to
278
| let config_repository = | ||
| tedge_config::TEdgeConfigRepository::new(config.config_location.clone()); | ||
| let tedge_config = config_repository.load()?; |
There was a problem hiding this comment.
Minor. Since the config is already read to populate the SmAgentConfig, I wonder if one can simply extend the SmAgentConfig struct with a use_lock property that would be used here.
There was a problem hiding this comment.
It makes sense. I extended SmAgentConfig and now it looks for this flag there.
Ruadhri17
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
crates/core/tedge_mapper/src/main.rs
Outdated
Comment on lines
105
to
112
| if config.query(LockFilesSetting)?.is_set() { | ||
| let run_dir: PathBuf = config.query(RunPathSetting)?.into(); | ||
| let _flock = Some(check_another_instance_is_not_running( | ||
| &mapper_opt.name.to_string(), | ||
| &run_dir, | ||
| )?); | ||
| } |
There was a problem hiding this comment.
The lock must stay in scope up to the end of main(), as it would be released on drop.
Suggested change
| if config.query(LockFilesSetting)?.is_set() { | |
| let run_dir: PathBuf = config.query(RunPathSetting)?.into(); | |
| let _flock = Some(check_another_instance_is_not_running( | |
| &mapper_opt.name.to_string(), | |
| &run_dir, | |
| )?); | |
| } | |
| let mut flock = None; | |
| if config.query(LockFilesSetting)?.is_set() { | |
| let run_dir: PathBuf = config.query(RunPathSetting)?.into(); | |
| flock = Some(check_another_instance_is_not_running( | |
| &mapper_opt.name.to_string(), | |
| &run_dir, | |
| )?); | |
| } |
Ruadhri17
force-pushed
the
conditional-lock-files
branch
from
51f0dd0
to
d3b2dae
Compare
Ruadhri17
had a problem deploying
to
Test Pull Request
GitHub Actions
Failure
Ruadhri17
force-pushed
the
conditional-lock-files
branch
from
b1e44bd
to
32eb57b
Compare
Signed-off-by: Krzysztof Piotrowski <krzysztof.piotrowski@inetum.com>
Ruadhri17
force-pushed
the
conditional-lock-files
branch
from
32eb57b
to
3dbe5d5
Compare
Ruadhri17
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
didier-wenzek
approved these changes
Mar 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
This commit adds a configuration option to disable lock file creation by running the
tedge configcommand or editing thetedge.tomlfile. More information in #1802Types of changes
Paste Link to the issue
#1802
Checklist
cargo fmtas mentioned in CODING_GUIDELINEScargo clippyas mentioned in CODING_GUIDELINESFurther comments