dstepanov-yadro/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1288] neofs-adm: Allow to store garbage in alphabet wallet dir

Browse source 
Check the full file name instead of just prefix. Also, fix a bug where
a single missing wallet could lead to an incorrect size calculation.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-04-05 10:16:35 +03:00 committed by Alex Vanin
parent 923db59149
commit a5cf38dcbf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/neofs-adm/internal/modules/morph/initialize.go
View file

@ -5,7 +5,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
"strings"
"time" "time"
"github.com/nspcc-dev/neo-go/pkg/core/native/nativenames" "github.com/nspcc-dev/neo-go/pkg/core/native/nativenames"
@ -193,14 +192,15 @@ func openAlphabetWallets(walletDir string) ([]*wallet.Wallet, error) {
var size int var size int
loop: loop:
for i := range walletFiles { for i := 0; i < len(walletFiles); i++ {
for j := 0; j < len(walletFiles); j++ { name := innerring.GlagoliticLetter(i).String() + ".json"
letter := innerring.GlagoliticLetter(j).String() for j := range walletFiles {
if strings.HasPrefix(walletFiles[i].Name(), letter) { if walletFiles[j].Name() == name {
size++ size++
continue loop continue loop
} }
} }
break
} }
if size == 0 { if size == 0 {
return nil, errors.New("alphabet wallets dir is empty (run `generate-alphabet` command first)") return nil, errors.New("alphabet wallets dir is empty (run `generate-alphabet` command first)")