[#574] Check if the container has been really removed from neo-go #624
5 changed files with 34 additions and 1 deletions
|
@ -31,6 +31,10 @@ func (c cnrSource) Get(id cid.ID) (*container.Container, error) {
|
||||||
return c.src.Get(id)
|
return c.src.Get(id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c cnrSource) DeletionInfo(cid cid.ID) (*container.DelInfo, error) {
|
||||||
|
return c.cli.DeletionInfo(cid)
|
||||||
|
}
|
||||||
|
|
||||||
func (c cnrSource) List() ([]cid.ID, error) {
|
func (c cnrSource) List() ([]cid.ID, error) {
|
||||||
return c.cli.ContainersOf(nil)
|
return c.cli.ContainersOf(nil)
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,6 +70,7 @@ const (
|
||||||
TreeContainerTreesHaveBeenSynced = "container trees have been synced"
|
TreeContainerTreesHaveBeenSynced = "container trees have been synced"
|
||||||
TreeCouldNotQueryTreesForSynchronization = "could not query trees for synchronization"
|
TreeCouldNotQueryTreesForSynchronization = "could not query trees for synchronization"
|
||||||
TreeRemovingRedundantTrees = "removing redundant trees..."
|
TreeRemovingRedundantTrees = "removing redundant trees..."
|
||||||
|
TreeCouldNotCheckIfContainerExisted = "could not check if the container ever existed"
|
||||||
TreeCouldNotRemoveRedundantTree = "could not remove redundant tree"
|
TreeCouldNotRemoveRedundantTree = "could not remove redundant tree"
|
||||||
TreeCouldNotCalculateContainerNodes = "could not calculate container nodes"
|
TreeCouldNotCalculateContainerNodes = "could not calculate container nodes"
|
||||||
TreeFailedToApplyReplicatedOperation = "failed to apply replicated operation"
|
TreeFailedToApplyReplicatedOperation = "failed to apply replicated operation"
|
||||||
|
|
|
@ -14,6 +14,9 @@ import (
|
||||||
|
|
||||||
type ContainerSource interface {
|
type ContainerSource interface {
|
||||||
container.Source
|
container.Source
|
||||||
|
|
||||||
|
DeletionInfo(cid.ID) (*container.DelInfo, error)
|
||||||
|
|
||||||
// List must return list of all the containers in the FrostFS network
|
// List must return list of all the containers in the FrostFS network
|
||||||
// at the moment of a call and any error that does not allow fetching
|
// at the moment of a call and any error that does not allow fetching
|
||||||
// container information.
|
// container information.
|
||||||
|
|
|
@ -53,6 +53,10 @@ func (s dummyContainerSource) Get(id cid.ID) (*containercore.Container, error) {
|
||||||
return cnt, nil
|
return cnt, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s dummyContainerSource) DeletionInfo(id cid.ID) (*containercore.DelInfo, error) {
|
||||||
|
return &containercore.DelInfo{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
type dummyEACLSource map[string]*containercore.EACL
|
type dummyEACLSource map[string]*containercore.EACL
|
||||||
|
|
||||||
func (s dummyEACLSource) GetEACL(id cid.ID) (*containercore.EACL, error) {
|
func (s dummyEACLSource) GetEACL(id cid.ID) (*containercore.EACL, error) {
|
||||||
|
|
|
@ -18,6 +18,7 @@ import (
|
||||||
metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
|
metrics "git.frostfs.info/TrueCloudLab/frostfs-observability/metrics/grpc"
|
||||||
tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
|
tracing "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing"
|
||||||
tracing_grpc "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
|
tracing_grpc "git.frostfs.info/TrueCloudLab/frostfs-observability/tracing/grpc"
|
||||||
|
apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status"
|
||||||
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
|
cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
|
||||||
netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
netmapSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap"
|
||||||
"github.com/panjf2000/ants/v2"
|
"github.com/panjf2000/ants/v2"
|
||||||
|
@ -440,6 +441,18 @@ func (s *Service) syncContainers(ctx context.Context, cnrs []cid.ID) {
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Service) containerEverExisted(cid cid.ID) (bool, error) {
|
||||||
|
_, err := s.cnrSource.DeletionInfo(cid)
|
||||||
|
if err == nil {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
var errContainerNotFound *apistatus.ContainerNotFound
|
||||||
|
if errors.As(err, &errContainerNotFound) {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID]struct{}) {
|
func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID]struct{}) {
|
||||||
ctx, span := tracing.StartSpanFromContext(ctx, "TreeService.removeContainers")
|
ctx, span := tracing.StartSpanFromContext(ctx, "TreeService.removeContainers")
|
||||||
defer span.End()
|
defer span.End()
|
||||||
|
@ -452,8 +465,16 @@ func (s *Service) removeContainers(ctx context.Context, newContainers map[cid.ID
|
||||||
if _, ok := newContainers[cnr]; ok {
|
if _, ok := newContainers[cnr]; ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
existed, err := s.containerEverExisted(cnr)
|
||||||
|
if err != nil {
|
||||||
|
s.log.Error(logs.TreeCouldNotCheckIfContainerExisted,
|
||||||
|
zap.Stringer("cid", cnr),
|
||||||
|
zap.Error(err))
|
||||||
|
} else if existed {
|
||||||
removed = append(removed, cnr)
|
removed = append(removed, cnr)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
for i := range removed {
|
for i := range removed {
|
||||||
delete(s.cnrMap, removed[i])
|
delete(s.cnrMap, removed[i])
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue