Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
nni
Commits
8f002c8b
Unverified
Commit
8f002c8b
authored
May 21, 2021
by
SparkSnail
Committed by
GitHub
May 21, 2021
Browse files
Set version check as warning (#3654)
parent
03ff3741
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
nni/tools/trial_tool/trial_keeper.py
nni/tools/trial_tool/trial_keeper.py
+1
-2
nni/tools/trial_tool/trial_runner.py
nni/tools/trial_tool/trial_runner.py
+1
-2
No files found.
nni/tools/trial_tool/trial_keeper.py
View file @
8f002c8b
...
@@ -151,14 +151,13 @@ def check_version(args):
...
@@ -151,14 +151,13 @@ def check_version(args):
nni_log
(
LogType
.
Info
,
'nni_manager_version is {0}'
.
format
(
nni_manager_version
))
nni_log
(
LogType
.
Info
,
'nni_manager_version is {0}'
.
format
(
nni_manager_version
))
log_entry
=
{}
log_entry
=
{}
if
trial_keeper_version
!=
nni_manager_version
:
if
trial_keeper_version
!=
nni_manager_version
:
nni_log
(
LogType
.
Error
,
'Version does not match!'
)
nni_log
(
LogType
.
Warning
,
'Version does not match!'
)
error_message
=
'NNIManager version is {0}, TrialKeeper version is {1}, NNI version does not match!'
.
format
(
error_message
=
'NNIManager version is {0}, TrialKeeper version is {1}, NNI version does not match!'
.
format
(
nni_manager_version
,
trial_keeper_version
)
nni_manager_version
,
trial_keeper_version
)
log_entry
[
'tag'
]
=
'VCFail'
log_entry
[
'tag'
]
=
'VCFail'
log_entry
[
'msg'
]
=
error_message
log_entry
[
'msg'
]
=
error_message
rest_post
(
gen_send_version_url
(
args
.
nnimanager_ip
,
args
.
nnimanager_port
),
json
.
dumps
(
log_entry
),
10
,
rest_post
(
gen_send_version_url
(
args
.
nnimanager_ip
,
args
.
nnimanager_port
),
json
.
dumps
(
log_entry
),
10
,
False
)
False
)
os
.
_exit
(
1
)
else
:
else
:
nni_log
(
LogType
.
Info
,
'Version match!'
)
nni_log
(
LogType
.
Info
,
'Version match!'
)
log_entry
[
'tag'
]
=
'VCSuccess'
log_entry
[
'tag'
]
=
'VCSuccess'
...
...
nni/tools/trial_tool/trial_runner.py
View file @
8f002c8b
...
@@ -119,7 +119,7 @@ def check_version(args):
...
@@ -119,7 +119,7 @@ def check_version(args):
nni_log
(
LogType
.
Info
,
'{0}: nni_manager_version is {1}'
.
format
(
args
.
node_id
,
nni_manager_version
))
nni_log
(
LogType
.
Info
,
'{0}: nni_manager_version is {1}'
.
format
(
args
.
node_id
,
nni_manager_version
))
log_entry
=
{}
log_entry
=
{}
if
trial_runner_version
!=
nni_manager_version
:
if
trial_runner_version
!=
nni_manager_version
:
nni_log
(
LogType
.
Error
,
'{0}: Version does not match!'
.
format
(
args
.
node_id
))
nni_log
(
LogType
.
Warning
,
'{0}: Version does not match!'
.
format
(
args
.
node_id
))
error_message
=
'{0}: NNIManager version is {1}, Trial runner version is {2}, NNI version does not match!'
.
format
(
error_message
=
'{0}: NNIManager version is {1}, Trial runner version is {2}, NNI version does not match!'
.
format
(
args
.
node_id
,
nni_manager_version
,
trial_runner_version
)
args
.
node_id
,
nni_manager_version
,
trial_runner_version
)
log_entry
[
'tag'
]
=
'VCFail'
log_entry
[
'tag'
]
=
'VCFail'
...
@@ -127,7 +127,6 @@ def check_version(args):
...
@@ -127,7 +127,6 @@ def check_version(args):
command_channel
.
send
(
CommandType
.
VersionCheck
,
log_entry
)
command_channel
.
send
(
CommandType
.
VersionCheck
,
log_entry
)
while
not
command_channel
.
sent
():
while
not
command_channel
.
sent
():
time
.
sleep
(
1
)
time
.
sleep
(
1
)
os
.
_exit
(
1
)
else
:
else
:
nni_log
(
LogType
.
Info
,
'{0}: Version match!'
.
format
(
args
.
node_id
))
nni_log
(
LogType
.
Info
,
'{0}: Version match!'
.
format
(
args
.
node_id
))
log_entry
[
'tag'
]
=
'VCSuccess'
log_entry
[
'tag'
]
=
'VCSuccess'
...
...
Write
Preview
Markdown
is supported
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