fix: replace raw substring match with real markers when detecting concore processes - #581
Open
bhuvan-somisetty wants to merge 1 commit into
Open
bhuvan-somisetty wants to merge 1 commit into
bhuvan-somisetty wants to merge 1 commit into
Conversation
concore stop / concore status flagged any process as a concore process just because "concore" appeared anywhere in its cmdline. That matches anything run from a directory that happens to be named "concore" (the default clone directory name for this repo), which has nothing to do with a real concore node and would get force killed on the next concore stop. Match is now based on the generated concorekill.bat filename, or on the process's actual working directory containing the runtime marker files mkconcore.py writes into every generated study (concore.iport plus concore.py/concoredocker.py), instead of a plain text search. Fixes ControlCore-Project#580
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #580
concore_cli/commands/stop.pyandstatus.pywere deciding whether a process was a concore process with a raw substring check,"concore" in cmdline_str.lower(). Anything launched from inside a folder that just happens to have "concore" somewhere in its path (the default clone directory name for this repo, for one) matched that, soconcore stopcould end up force killing processes that have nothing to do with concore.Changes:
concore_cli/commands/_process_match.pywithis_concore_process(), used by bothstatus.pyandstop.pyinstead of each having its own copy of the checkconcorekill.batby filename, or its actual working directory contains the runtime marker files mkconcore.py writes into every generated study (concore.iportplusconcore.py/concoredocker.py), checked viaproc.cwd()tests/test_process_match.py, including a couple of tests that reproduce the original bug directly (a process launched from a folder literally namedconcoreno longer matches)Scope is just the process discovery step in these two commands, nothing about the actual kill logic (taskkill/terminate/kill) changed.
Verified with:
pytest tests/ -q(197 passed, 7 skipped, no failures)