Skip to content
GitLab
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
a4d26e2a
Commit
a4d26e2a
authored
Jul 23, 2019
by
Markus Scheidgen
Browse files
Minor fixes to re-processes CLI.
parent
35bdf4bf
Pipeline
#52332
passed with stages
in 20 minutes and 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nomad/admin/upload.py
View file @
a4d26e2a
...
...
@@ -40,9 +40,10 @@ def upload(ctx, user: str, staging: bool, processing: bool, outdated: bool):
query
&=
Q
(
process_status
=
proc
.
PROCESS_RUNNING
)
|
Q
(
tasks_status
=
proc
.
RUNNING
)
if
outdated
:
uploads
=
proc
.
Calc
.
objects
(
{
'metadata.nomad_version__ne'
:
config
.
version
}).
distinct
(
field
=
'upload_id'
)
query
&=
Q
(
uploads__in
=
uploads
)
uploads
=
proc
.
Calc
.
_get_collection
().
distinct
(
'upload_id'
,
{
'metadata.nomad_version'
:
{
'$ne'
:
config
.
version
}})
query
&=
Q
(
upload_id__in
=
uploads
)
ctx
.
obj
.
query
=
query
ctx
.
obj
.
uploads
=
proc
.
Upload
.
objects
(
query
)
...
...
@@ -155,11 +156,8 @@ def re_process(ctx, uploads):
logger
=
utils
.
get_logger
(
__name__
)
print
(
'%d uploads selected, re-processing ...'
%
uploads
.
count
())
def
re_process_upload
(
upload_id
:
str
):
logger
.
info
(
're-processing started'
,
upload_id
=
upload_id
)
upload
=
proc
.
Upload
.
objects
(
upload_id
=
upload_id
).
first
()
if
upload
is
None
:
logger
.
error
(
'upload for re-processing does not exist'
,
upload_id
=
upload_id
)
def
re_process_upload
(
upload
:
str
):
logger
.
info
(
're-processing started'
,
upload_id
=
upload
.
upload_id
)
upload
.
re_process_upload
()
upload
.
block_until_complete
(
interval
=
.
1
)
...
...
@@ -167,8 +165,8 @@ def re_process(ctx, uploads):
logger
.
info
(
're-processing complete'
,
upload_id
=
upload_id
)
count
=
0
for
upload
_id
in
uploads
:
re_process_upload
(
upload
_id
)
for
upload
in
uploads
:
re_process_upload
(
upload
)
count
+=
1
print
(
' re-processed %s of %s uploads'
%
(
count
,
len
(
uploads
)))
...
...
ops/deployments/nomad.migration.direct.env.sh
View file @
a4d26e2a
...
...
@@ -7,3 +7,4 @@ export NOMAD_FS_LOCAL_TMP=/nomad/fairdi/migration/fs/tmp
export
NOMAD_FS_STAGING
=
/nomad/fairdi/migration/fs/staging
export
NOMAD_FS_PUBLIC
=
/nomad/fairdi/migration/fs/public
export
NOMAD_FS_TMP
=
/nomad/fairdi/migration/fs/tmp
export
NOMAD_CELERY_ROUTING
=
worker
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment