Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dm-docs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
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
Code review analytics
Issue 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
hammonds
dm-docs
Commits
7a35df3a
Commit
7a35df3a
authored
8 years ago
by
sveseli
Browse files
Options
Downloads
Patches
Plain Diff
introduce new status for stopping daqs
parent
4253d91c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/python/dm/common/constants/dmProcessingStatus.py
+2
-0
2 additions, 0 deletions
src/python/dm/common/constants/dmProcessingStatus.py
src/python/dm/common/objects/daqInfo.py
+6
-4
6 additions, 4 deletions
src/python/dm/common/objects/daqInfo.py
with
8 additions
and
4 deletions
src/python/dm/common/constants/dmProcessingStatus.py
+
2
−
0
View file @
7a35df3a
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
DM_PROCESSING_STATUS_ANY
=
'
any
'
DM_PROCESSING_STATUS_ANY
=
'
any
'
DM_PROCESSING_STATUS_PENDING
=
'
pending
'
DM_PROCESSING_STATUS_PENDING
=
'
pending
'
DM_PROCESSING_STATUS_RUNNING
=
'
running
'
DM_PROCESSING_STATUS_RUNNING
=
'
running
'
DM_PROCESSING_STATUS_FINALIZING
=
'
finalizing
'
DM_PROCESSING_STATUS_DONE
=
'
done
'
DM_PROCESSING_STATUS_DONE
=
'
done
'
DM_PROCESSING_STATUS_FAILED
=
'
failed
'
DM_PROCESSING_STATUS_FAILED
=
'
failed
'
DM_PROCESSING_STATUS_SKIPPED
=
'
skipped
'
DM_PROCESSING_STATUS_SKIPPED
=
'
skipped
'
...
@@ -15,6 +16,7 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [
...
@@ -15,6 +16,7 @@ DM_ALLOWED_PROCESSING_STATUS_LIST = [
DM_PROCESSING_STATUS_ANY
,
DM_PROCESSING_STATUS_ANY
,
DM_PROCESSING_STATUS_PENDING
,
DM_PROCESSING_STATUS_PENDING
,
DM_PROCESSING_STATUS_RUNNING
,
DM_PROCESSING_STATUS_RUNNING
,
DM_PROCESSING_STATUS_FINALIZING
,
DM_PROCESSING_STATUS_DONE
,
DM_PROCESSING_STATUS_DONE
,
DM_PROCESSING_STATUS_FAILED
,
DM_PROCESSING_STATUS_FAILED
,
DM_PROCESSING_STATUS_SKIPPED
,
DM_PROCESSING_STATUS_SKIPPED
,
...
...
This diff is collapsed.
Click to expand it.
src/python/dm/common/objects/daqInfo.py
+
6
−
4
View file @
7a35df3a
...
@@ -76,10 +76,12 @@ class DaqInfo(DmObject):
...
@@ -76,10 +76,12 @@ class DaqInfo(DmObject):
self
[
'
percentageProcessed
'
]
=
'
%.2f
'
%
percentageProcessed
self
[
'
percentageProcessed
'
]
=
'
%.2f
'
%
percentageProcessed
self
[
'
percentageProcessingErrors
'
]
=
'
%.2f
'
%
percentageProcessingErrors
self
[
'
percentageProcessingErrors
'
]
=
'
%.2f
'
%
percentageProcessingErrors
if
self
.
get
(
'
endTime
'
)
and
nCompletedFiles
==
nFiles
:
if
self
.
get
(
'
endTime
'
):
daqStatus
=
'
done
'
daqStatus
=
dmProcessingStatus
.
DM_PROCESSING_STATUS_FINALIZING
if
nProcessingErrors
:
if
nCompletedFiles
==
nFiles
:
daqStatus
=
'
failed
'
daqStatus
=
dmProcessingStatus
.
DM_PROCESSING_STATUS_DONE
if
nProcessingErrors
:
daqStatus
=
dmProcessingStatus
.
DM_PROCESSING_STATUS_FAILED
lastFileProcessingErrorTime
=
self
.
get
(
'
lastFileProcessingErrorTime
'
)
lastFileProcessingErrorTime
=
self
.
get
(
'
lastFileProcessingErrorTime
'
)
lastFileProcessedTime
=
self
.
get
(
'
lastFileProcessedTime
'
)
lastFileProcessedTime
=
self
.
get
(
'
lastFileProcessedTime
'
)
endTime
=
lastFileProcessedTime
endTime
=
lastFileProcessedTime
...
...
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