Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
2c200831
Commit
2c200831
authored
2 years ago
by
Charlotte Hausman
Browse files
Options
Downloads
Patches
Plain Diff
make reacquire system not try to launch monitor processes for missing directories
parent
a890aee7
No related branches found
Branches containing commit
Tags
2.5.0-rc2
Tags containing commit
4 merge requests
!1059
Catchup 2.7 with main
,
!1058
Draft: Rebase 2.7 on main
,
!1004
Draft: Deleted all unused files from ingest/ingest/
,
!1001
make reacquire system not try to launch monitor processes for missing directories
Pipeline
#6023
passed
2 years ago
Stage: cache-build
Stage: build
Stage: unit-test
Stage: push
Stage: generate-yaml
Stage: trigger
Stage: deploy
Stage: .post
Pipeline: workspaces
#6025
Pipeline: workspaces
#6024
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
shared/workspaces/workspaces/workflow/services/recovery.py
+3
-1
3 additions, 1 deletion
shared/workspaces/workspaces/workflow/services/recovery.py
with
5 additions
and
1 deletion
.gitlab-ci.yml
+
2
−
0
View file @
2c200831
...
...
@@ -175,6 +175,8 @@ unit test coverage:
coverage_report
:
coverage_format
:
cobertura
path
:
coverage.xml
paths
:
-
htmlcov/
dependencies
:
-
unit test workflow
-
unit test capability
...
...
This diff is collapsed.
Click to expand it.
shared/workspaces/workspaces/workflow/services/recovery.py
+
3
−
1
View file @
2c200831
...
...
@@ -137,6 +137,7 @@ class MonitorRecover:
f
"
Results directory
{
results_dir
}
for request #
{
wf_request
.
workflow_request_id
}
"
f
"
is not a directory! Skipping.
"
)
# signal not a directory with current location
return
Path
(
"
.
"
)
@staticmethod
...
...
@@ -148,7 +149,8 @@ class MonitorRecover:
:param wf_request: The WorkflowRequest to update
:return:
"""
if
logfile
==
Path
.
cwd
():
# because for some reason these are not the same....
if
logfile
==
Path
.
cwd
()
or
logfile
==
Path
(
"
.
"
):
return
logger
.
info
(
"
Running wf_monitor.
"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment