forked from TrueCloudLab/frostfs-node
[#168] node: Refactor container services
Resolve containedctx for remoteLoadAnnounceWriter struct Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
parent
28dc9e2190
commit
56161d39b4
6 changed files with 12 additions and 16 deletions
|
@ -100,7 +100,7 @@ func (c *announceContext) announce() {
|
|||
}
|
||||
|
||||
// finish writing
|
||||
err = targetWriter.Close()
|
||||
err = targetWriter.Close(c.ctx)
|
||||
if err != nil {
|
||||
c.log.Debug("could not finish writing local announcements",
|
||||
zap.String("error", err.Error()),
|
||||
|
@ -301,7 +301,7 @@ func (c *stopContext) report() {
|
|||
}
|
||||
|
||||
// finish writing
|
||||
err = resultWriter.Close()
|
||||
err = resultWriter.Close(c.ctx)
|
||||
if err != nil {
|
||||
c.log.Debug("could not finish writing load estimations",
|
||||
zap.String("error", err.Error()),
|
||||
|
|
|
@ -69,7 +69,7 @@ func (s *testAnnouncementStorage) Put(v container.SizeEstimation) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *testAnnouncementStorage) Close() error {
|
||||
func (s *testAnnouncementStorage) Close(context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ package loadcontroller
|
|||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
|
||||
"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container"
|
||||
)
|
||||
|
@ -70,7 +69,7 @@ type Writer interface {
|
|||
// the Close's return.
|
||||
//
|
||||
// Methods must not be called after Close.
|
||||
io.Closer
|
||||
Close(ctx context.Context) error
|
||||
}
|
||||
|
||||
// WriterProvider is a group of methods provided
|
||||
|
|
|
@ -154,9 +154,9 @@ func (w *loadWriter) Put(a container.SizeEstimation) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (w *loadWriter) Close() error {
|
||||
func (w *loadWriter) Close(ctx context.Context) error {
|
||||
for key, wRemote := range w.mServers {
|
||||
err := wRemote.Close()
|
||||
err := wRemote.Close(ctx)
|
||||
if err != nil {
|
||||
w.router.log.Debug("could not close remote server writer",
|
||||
zap.String("key", key),
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package loadstorage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sort"
|
||||
"sync"
|
||||
|
||||
|
@ -89,7 +90,7 @@ func (s *Storage) Put(a container.SizeEstimation) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (s *Storage) Close() error {
|
||||
func (s *Storage) Close(context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue