-
Notifications
You must be signed in to change notification settings - Fork 42
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
hardening the cancelation functionality #675
Open
HansVRP
wants to merge
4
commits into
master
Choose a base branch
from
issue664-harden-prolonged-cancel
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+103
−10
Open
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -667,16 +667,25 @@ def on_job_cancel(self, job: BatchJob, row): | |
|
||
def _cancel_prolonged_job(self, job: BatchJob, row): | ||
"""Cancel the job if it has been running for too long.""" | ||
job_running_start_time = rfc3339.parse_datetime(row["running_start_time"], with_timezone=True) | ||
elapsed = datetime.datetime.now(tz=datetime.timezone.utc) - job_running_start_time | ||
if elapsed > self._cancel_running_job_after: | ||
try: | ||
_log.info( | ||
f"Cancelling long-running job {job.job_id} (after {elapsed}, running since {job_running_start_time})" | ||
) | ||
job.stop() | ||
except OpenEoApiError as e: | ||
_log.error(f"Failed to cancel long-running job {job.job_id}: {e}") | ||
try: | ||
running_start_time_str = row.get("running_start_time") | ||
if not running_start_time_str or pd.isna(running_start_time_str): | ||
_log.warning(f"Job {job.job_id} does not have a valid running start time. Cancellation skipped.") | ||
return | ||
|
||
job_running_start_time = rfc3339.parse_datetime(running_start_time_str, with_timezone=True) | ||
elapsed = datetime.datetime.now(tz=datetime.timezone.utc) - job_running_start_time | ||
|
||
if elapsed > self._cancel_running_job_after: | ||
try: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this nested try-except is bit overkill now and doesn't add any value. I'd remove it to keep this _cancel_prolonged_job more to the point |
||
_log.info( | ||
f"Cancelling long-running job {job.job_id} (after {elapsed}, running since {job_running_start_time})" | ||
) | ||
job.stop() | ||
except OpenEoApiError as e: | ||
_log.error(f"Failed to cancel long-running job {job.job_id}: {e}") | ||
except Exception as e: | ||
_log.error(f"Unexpected error while handling job {job.job_id}: {e}") | ||
|
||
def get_job_dir(self, job_id: str) -> Path: | ||
"""Path to directory where job metadata, results and error logs are be saved.""" | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This warning might be a bit too alarming. It will be shown every minute on each job that has no recorded start time, so this could be quite spammy.
"cancellation skipped" might also give wrong impression that job manager still thinks that job should be cancelled for some reason, but it's won't actually do it.
some possible improvements:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the underlying issue then in:
The problem would be removed if I also only run the cancel prolonged job if the previous state was created or queued. Then we know for sure that a starting time has been set?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that won't work in practice: you want cancelling to happen long after the state changed to "running", so both previous state and current state will be "running" when you typically want to cancel.
what you could do is changing the setting of "running_start_time", to something like (pseudo-code):
then
running_start_time
further degrades to a best effort guess of the actual start time, but at least you have something to work with