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
text-generation-inference
Commits
e3a63b6f
Unverified
Commit
e3a63b6f
authored
Apr 13, 2023
by
OlivierDehaene
Committed by
GitHub
Apr 13, 2023
Browse files
fix(launcher): revert change on shard errors (#173)
parent
880a76ee
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
7 deletions
+13
-7
launcher/src/main.rs
launcher/src/main.rs
+13
-7
No files found.
launcher/src/main.rs
View file @
e3a63b6f
...
...
@@ -349,8 +349,8 @@ fn main() -> ExitCode {
Err
(
TryRecvError
::
Empty
)
=>
{
sleep
(
Duration
::
from_millis
(
100
));
}
Ok
(
ShardStatus
::
Failed
(
rank
))
=>
{
tracing
::
error!
(
"Shard {} failed to start
.
"
,
rank
);
Ok
(
ShardStatus
::
Failed
(
(
rank
,
err
)
))
=>
{
tracing
::
error!
(
"Shard {} failed to start
:
\n
{}
"
,
rank
,
err
);
shutdown_shards
(
shutdown
,
&
shutdown_receiver
);
return
ExitCode
::
FAILURE
;
}
...
...
@@ -457,8 +457,8 @@ fn main() -> ExitCode {
let
mut
exit_code
=
ExitCode
::
SUCCESS
;
while
running
.load
(
Ordering
::
SeqCst
)
{
if
let
Ok
(
ShardStatus
::
Failed
(
rank
))
=
status_receiver
.try_recv
()
{
tracing
::
error!
(
"Shard {rank} failed
.
"
);
if
let
Ok
(
ShardStatus
::
Failed
(
(
rank
,
err
)
))
=
status_receiver
.try_recv
()
{
tracing
::
error!
(
"Shard {rank} failed
:
\n
{err}
"
);
exit_code
=
ExitCode
::
FAILURE
;
break
;
};
...
...
@@ -488,7 +488,7 @@ fn main() -> ExitCode {
#[derive(Debug)]
enum
ShardStatus
{
Ready
,
Failed
(
usize
),
Failed
(
(
usize
,
String
)
),
}
#[allow(clippy::too_many_arguments)]
...
...
@@ -627,7 +627,9 @@ fn shard_manager(
tracing
::
error!
(
"Please install it with `make install-server`"
)
}
}
status_sender
.send
(
ShardStatus
::
Failed
(
rank
))
.unwrap
();
status_sender
.send
(
ShardStatus
::
Failed
((
rank
,
err
.to_string
())))
.unwrap
();
return
;
}
};
...
...
@@ -656,7 +658,11 @@ fn shard_manager(
loop
{
// Process exited
if
p
.poll
()
.is_some
()
{
status_sender
.send
(
ShardStatus
::
Failed
(
rank
))
.unwrap
();
let
mut
err
=
String
::
new
();
p
.stderr
.take
()
.unwrap
()
.read_to_string
(
&
mut
err
)
.unwrap
();
status_sender
.send
(
ShardStatus
::
Failed
((
rank
,
err
)))
.unwrap
();
return
;
}
...
...
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