TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 4 Projects Releases 1 Activity Actions

[#574] Check if the container has been really removed from neo-go #624

Merged
fyrchik merged 1 commit from aarifullin/frostfs-node:fix/574-tree_del_info into master 2024-09-04 19:51:02 +00:00
Conversation 0 Commits 1 Files changed 5 +34 -1
5 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/frostfs-node/tree.go
View file

@ -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)
} }

1
internal/logs/logs.go
View file

@ -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"

3
pkg/services/tree/options.go
View file

@ -14,6 +14,9 @@ import (
type ContainerSource interface { type ContainerSource interface {
container.Source container.Source
DeletionInfo(cid.ID) (*container.DelInfo, error)
fyrchik marked this conversation as resolved Outdated
fyrchik commented 2023-08-21 08:06:27 +00:00
Outdated
Review
Copy link

at the moment of a call is somewhat obvious (and, probably, doesn't say what you wanted to). How about to get rid of it?

`at the moment of a call` is somewhat obvious (and, probably, doesn't say what you wanted to). How about to get rid of it?
aarifullin commented 2023-08-21 08:43:28 +00:00
Outdated
Review
Copy link

This was comment for a comment :) Removed

This was comment for a comment :) Removed
// 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.

4
pkg/services/tree/signature_test.go
View file

@ -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) {

21
pkg/services/tree/sync.go
View file

@ -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
fyrchik marked this conversation as resolved Outdated
fyrchik commented 2023-08-21 08:41:07 +00:00
Outdated
Review
Copy link

I am not sure Is will work now as expected (compared to As), do we use Is anywhere for status errors?

I am not sure `Is` will work now as expected (compared to `As`), do we use `Is` anywhere for status errors?
fyrchik marked this conversation as resolved Outdated
fyrchik commented 2023-08-21 08:41:10 +00:00
Outdated
Review
Copy link

I am not sure Is will work now as expected (compared to As), do we use Is anywhere for status errors?

I am not sure `Is` will work now as expected (compared to `As`), do we use `Is` anywhere for status errors?
aarifullin commented 2023-08-21 08:58:50 +00:00
Outdated
Review
Copy link

Sorry, some ideas "mixed" up in my mind.
Fixed to errors.As

Sorry, some [ideas](https://github.com/nspcc-dev/neofs-node/issues/2465#issuecomment-1661642640) "mixed" up in my mind. Fixed to `errors.As`
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)
aarifullin commented 2023-08-18 14:27:26 +00:00
Outdated
Review
Copy link

@fyrchik
I am not sure that this can be incorrectly ignored (the container cannot be appended to removed list and thus sync will try to sync the container?). Anyway, the netmap cannot be updated until we cannot get info about the container

@fyrchik I am not sure that this can be incorrectly ignored (the container cannot be appended to `removed` list and thus sync will try to sync the container?). Anyway, the netmap cannot be updated until we cannot get info about the container
fyrchik commented 2023-08-21 08:51:38 +00:00
Outdated
Review
Copy link

How is netmap update connected to all this?
It is right, not to remove container in case "unknown" error happens.

How is netmap update connected to all this? It is right, not to remove container in case "unknown" error happens.
aarifullin commented 2023-08-21 09:03:36 +00:00
Outdated
Review
Copy link

How is netmap update connected to all this?

Sorry, nevermind

newMap, cnrsToSync := s.containersToSync(cnrs)

s.syncContainers(ctx, cnrsToSync)

s.removeContainers(ctx, newMap)

I have mistaken newMap for netmap :)

> How is netmap update connected to all this? Sorry, nevermind ```golang newMap, cnrsToSync := s.containersToSync(cnrs) s.syncContainers(ctx, cnrsToSync) s.removeContainers(ctx, newMap) ``` I have mistaken `newMap` for `netmap` :)
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])
} }