Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
9a0855a9
Commit
9a0855a9
authored
Jul 25, 2019
by
Markus Scheidgen
Browse files
Fixed issue with reoccuring calcs in re-process and indexing re-processed calcs with datasets.
parent
d6fa8c46
Pipeline
#52482
passed with stages
in 15 minutes and 7 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nomad/processing/data.py
View file @
9a0855a9
...
...
@@ -73,7 +73,8 @@ class Calc(Proc):
(
'upload_id'
,
'mainfile'
),
(
'upload_id'
,
'parser'
),
(
'upload_id'
,
'tasks_status'
),
(
'upload_id'
,
'process_status'
)
(
'upload_id'
,
'process_status'
),
(
'upload_id'
,
'metadata.nomad_version'
)
]
}
...
...
@@ -633,7 +634,10 @@ class Upload(Proc):
self
.
_continue_with
(
'parse_all'
)
try
:
for
calc
in
Calc
.
objects
(
upload_id
=
self
.
upload_id
):
# we use a copy of the mongo queryset; reasons are cursor timeouts and
# changing results on modifying the calc entries
calcs
=
list
(
Calc
.
objects
(
upload_id
=
self
.
upload_id
))
for
calc
in
calcs
:
if
calc
.
process_running
:
if
calc
.
current_process
==
're_process_calc'
:
logger
.
warn
(
're_process_calc is already running'
,
calc_id
=
calc
.
calc_id
)
...
...
nomad/search.py
View file @
9a0855a9
...
...
@@ -64,7 +64,7 @@ class Dataset(InnerDoc):
def
from_dataset_popo
(
cls
,
dataset
):
return
cls
(
id
=
dataset
.
id
,
doi
=
dataset
.
doi
.
value
if
dataset
.
doi
is
not
None
else
None
,
doi
=
dataset
.
doi
[
'
value
'
]
if
dataset
.
doi
is
not
None
else
None
,
name
=
dataset
.
name
)
id
=
Keyword
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment