Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
fae4e077
Unverified
Commit
fae4e077
authored
Oct 31, 2023
by
Michael de Hoog
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix batcher panic
parent
9bfaf926
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
service.go
op-batcher/batcher/service.go
+5
-3
No files found.
op-batcher/batcher/service.go
View file @
fae4e077
...
@@ -290,9 +290,11 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
...
@@ -290,9 +290,11 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
bs
.
Log
.
Info
(
"Stopping batcher"
)
bs
.
Log
.
Info
(
"Stopping batcher"
)
var
result
error
var
result
error
if
bs
.
driver
!=
nil
{
if
err
:=
bs
.
driver
.
StopBatchSubmittingIfRunning
(
ctx
);
err
!=
nil
{
if
err
:=
bs
.
driver
.
StopBatchSubmittingIfRunning
(
ctx
);
err
!=
nil
{
result
=
errors
.
Join
(
result
,
fmt
.
Errorf
(
"failed to stop batch submitting: %w"
,
err
))
result
=
errors
.
Join
(
result
,
fmt
.
Errorf
(
"failed to stop batch submitting: %w"
,
err
))
}
}
}
if
bs
.
rpcServer
!=
nil
{
if
bs
.
rpcServer
!=
nil
{
// TODO(7685): the op-service RPC server is not built on top of op-service httputil Server, and has poor shutdown
// TODO(7685): the op-service RPC server is not built on top of op-service httputil Server, and has poor shutdown
...
@@ -328,7 +330,7 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
...
@@ -328,7 +330,7 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
if
result
==
nil
{
if
result
==
nil
{
bs
.
stopped
.
Store
(
true
)
bs
.
stopped
.
Store
(
true
)
bs
.
driver
.
Log
.
Info
(
"Batch Submitter stopped"
)
bs
.
Log
.
Info
(
"Batch Submitter stopped"
)
}
}
return
result
return
result
}
}
...
...
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