TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 108 Pull requests 4 Projects Releases 2 Activity Actions

[#9999] amd: Adopt zombie scan to EC objects
Some checks failed
DCO action / DCO (pull_request) Successful in 30s
Details
Vulncheck / Vulncheck (pull_request) Successful in 1m19s
Details
Build / Build Components (pull_request) Successful in 1m48s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m49s
Details
Tests and linters / Tests (pull_request) Successful in 1m59s
Details
Tests and linters / Staticcheck (pull_request) Successful in 2m13s
Details
Tests and linters / gopls check (pull_request) Failing after 2m20s
Details
Tests and linters / Lint (pull_request) Successful in 2m50s
Details
Tests and linters / Tests with -race (pull_request) Successful in 2m49s
Details

Browse source 
Change-Id: Ida3f339bb6e8343519933b60cdc4b544f7a02f1c
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
Dmitrii Stepanov 2025-04-09 11:28:07 +03:00
parent d54eb9d7ab
commit e7aa9d7dd6
Signed by: dstepanov-yadro
GPG key ID: 237AF1A763293BC0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cmd/frostfs-adm/internal/modules/maintenance/zombie/scan.go
View file

@ -15,6 +15,7 @@ import (
commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common" commonCmd "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/internal/common"
clientCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client" clientCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/client"
netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap" netmapCore "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/netmap"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/core/object"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/local_object_storage/engine"
cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container" cntClient "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/container"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client/netmap"
@ -102,9 +103,9 @@ const (
statusQuarantine status = "quarantine" statusQuarantine status = "quarantine"
) )
func checkAddr(ctx context.Context, cnrCli *cntClient.Client, nmCli *netmap.Client, cc *cache.ClientCache, addr oid.Address) (status, error) { func checkAddr(ctx context.Context, cnrCli *cntClient.Client, nmCli *netmap.Client, cc *cache.ClientCache, obj object.Info) (status, error) {
rawCID := make([]byte, sha256.Size) rawCID := make([]byte, sha256.Size)
cid := addr.Container() cid := obj.Address.Container()
cid.Encode(rawCID) cid.Encode(rawCID)
cnr, err := cnrCli.Get(rawCID) cnr, err := cnrCli.Get(rawCID)
@ -127,12 +128,17 @@ func checkAddr(ctx context.Context, cnrCli *cntClient.Client, nmCli *netmap.Clie
nodes = append([][]netmap.NodeInfo{}, nm.Nodes()) nodes = append([][]netmap.NodeInfo{}, nm.Nodes())
} }
objID := addr.Object() objID := obj.Address.Object()
cnrID := addr.Container() cnrID := obj.Address.Container()
local := true
if obj.ECInfo != nil {
objID = obj.ECInfo.ParentID
local = false
}
prm := clientSDK.PrmObjectHead{ prm := clientSDK.PrmObjectHead{
ObjectID: &objID, ObjectID: &objID,
ContainerID: &cnrID, ContainerID: &cnrID,
Local: true, Local: local,
} }
var ni clientCore.NodeInfo var ni clientCore.NodeInfo
@ -156,7 +162,7 @@ func checkAddr(ctx context.Context, cnrCli *cntClient.Client, nmCli *netmap.Clie
} }
} }
if cnr.Value.PlacementPolicy().NumberOfReplicas() == 1 && cnr.Value.PlacementPolicy().ReplicaNumberByIndex(0) == 1 { if cnr.Value.PlacementPolicy().NumberOfReplicas() == 1 && cnr.Value.PlacementPolicy().ReplicaDescriptor(0).NumberOfObjects() == 1 {
return statusFound, nil return statusFound, nil
} }
return statusQuarantine, nil return statusQuarantine, nil
@ -202,7 +208,7 @@ func scanStorageEngine(cmd *cobra.Command, batchSize uint32, storageEngine *engi
for i := range addrList { for i := range addrList {
addr := addrList[i] addr := addrList[i]
eg.Go(func() error { eg.Go(func() error {
result, err := checkAddr(egCtx, cnrCli, nmCli, cc, addr.Address) result, err := checkAddr(egCtx, cnrCli, nmCli, cc, addr)
if err != nil { if err != nil {
return fmt.Errorf("check object %s status: %w", addr.Address, err) return fmt.Errorf("check object %s status: %w", addr.Address, err)
} }