Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

agg: move integrity methods to integrity.go #13188

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+219 −204
Open

agg: move integrity methods to integrity.go #13188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 0 additions & 73 deletions erigon-lib/state/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,79 +1863,6 @@ func (ac *AggregatorRoTx) GetLatest(domain kv.Domain, k []byte, tx kv.Tx) (v []b
return ac.d[domain].GetLatest(k, tx)
}

// search key in all files of all domains and print file names
func (ac *AggregatorRoTx) DebugKey(domain kv.Domain, k []byte) error {
l, err := ac.d[domain].DebugKVFilesWithKey(k)
if err != nil {
return err
}
if len(l) > 0 {
ac.a.logger.Info("[dbg] found in", "files", l)
}
return nil
}
func (ac *AggregatorRoTx) DebugEFKey(domain kv.Domain, k []byte) error {
return ac.d[domain].DebugEFKey(k)
}

func (ac *AggregatorRoTx) DebugEFAllValuesAreInRange(ctx context.Context, name kv.InvertedIdx, failFast bool, fromStep uint64) error {
switch name {
case kv.AccountsHistoryIdx:
err := ac.d[kv.AccountsDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.StorageHistoryIdx:
err := ac.d[kv.CodeDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.CodeHistoryIdx:
err := ac.d[kv.StorageDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.CommitmentHistoryIdx:
err := ac.d[kv.CommitmentDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.ReceiptHistoryIdx:
err := ac.d[kv.ReceiptDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
//case kv.GasUsedHistoryIdx:
// err := ac.d[kv.GasUsedDomain].ht.iit.DebugEFAllValuesAreInRange(ctx)
// if err != nil {
// return err
// }
case kv.TracesFromIdx:
err := ac.iis[kv.TracesFromIdxPos].DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.TracesToIdx:
err := ac.iis[kv.TracesToIdxPos].DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.LogAddrIdx:
err := ac.iis[kv.LogAddrIdxPos].DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.LogTopicIdx:
err := ac.iis[kv.LogTopicIdxPos].DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
default:
panic(fmt.Sprintf("unexpected: %s", name))
}
return nil
}

// --- Domain part END ---

func (ac *AggregatorRoTx) Close() {
Expand Down
69 changes: 1 addition & 68 deletions erigon-lib/state/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ import (
btree2 "github.com/tidwall/btree"
"golang.org/x/sync/errgroup"

"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/recsplit/eliasfano32"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/background"
"github.com/erigontech/erigon-lib/common/dbg"
Expand All @@ -43,6 +40,7 @@ import (
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/order"
"github.com/erigontech/erigon-lib/kv/stream"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/recsplit"
"github.com/erigontech/erigon-lib/seg"
)
Expand Down Expand Up @@ -703,71 +701,6 @@ func (dt *DomainRoTx) getLatestFromFile(i int, filekey []byte) (v []byte, ok boo

}

func (dt *DomainRoTx) DebugKVFilesWithKey(k []byte) (res []string, err error) {
for i := len(dt.files) - 1; i >= 0; i-- {
_, ok, _, err := dt.getLatestFromFile(i, k)
if err != nil {
return res, err
}
if ok {
res = append(res, dt.files[i].src.decompressor.FileName())
}
}
return res, nil
}
func (dt *DomainRoTx) DebugEFKey(k []byte) error {
dt.ht.iit.ii.dirtyFiles.Walk(func(items []*filesItem) bool {
for _, item := range items {
if item.decompressor == nil {
continue
}
accessor := item.index
if accessor == nil {
fPath := dt.d.efAccessorFilePath(item.startTxNum/dt.d.aggregationStep, item.endTxNum/dt.d.aggregationStep)
exists, err := dir.FileExist(fPath)
if err != nil {
_, fName := filepath.Split(fPath)
dt.d.logger.Warn("[agg] InvertedIndex.openDirtyFiles", "err", err, "f", fName)
continue
}
if exists {
var err error
accessor, err = recsplit.OpenIndex(fPath)
if err != nil {
_, fName := filepath.Split(fPath)
dt.d.logger.Warn("[agg] InvertedIndex.openDirtyFiles", "err", err, "f", fName)
continue
}
defer accessor.Close()
} else {
continue
}
}

offset, ok := accessor.GetReaderFromPool().Lookup(k)
if !ok {
continue
}
g := item.decompressor.MakeGetter()
g.Reset(offset)
key, _ := g.NextUncompressed()
if !bytes.Equal(k, key) {
continue
}
eliasVal, _ := g.NextUncompressed()
ef, _ := eliasfano32.ReadEliasFano(eliasVal)

last2 := uint64(0)
if ef.Count() > 2 {
last2 = ef.Get(ef.Count() - 2)
}
log.Warn(fmt.Sprintf("[dbg] see1: %s, min=%d,max=%d, before_max=%d, all: %d\n", item.decompressor.FileName(), ef.Min(), ef.Max(), last2, stream.ToArrU64Must(ef.Iterator())))
}
return true
})
return nil
}

func (d *Domain) BeginFilesRo() *DomainRoTx {
for i := 0; i < len(d._visible.files); i++ {
if !d._visible.files[i].src.frozen {
Expand Down
215 changes: 215 additions & 0 deletions erigon-lib/state/integrity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
package state

import (
"bytes"
"context"
"fmt"
"path/filepath"
"time"

"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/dir"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/stream"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/recsplit"
"github.com/erigontech/erigon-lib/recsplit/eliasfano32"
)

// search key in all files of all domains and print file names
func (ac *AggregatorRoTx) IntegrityKey(domain kv.Domain, k []byte) error {
l, err := ac.d[domain].IntegrityDomainFilesWithKey(k)
if err != nil {
return err
}
if len(l) > 0 {
ac.a.logger.Info("[dbg] found in", "files", l)
}
return nil
}
func (ac *AggregatorRoTx) IntegirtyInvertedIndexKey(domain kv.Domain, k []byte) error {
return ac.d[domain].IntegrityKey(k)
}

func (ac *AggregatorRoTx) IntegrityInvertedIndexAllValuesAreInRange(ctx context.Context, name kv.InvertedIdx, failFast bool, fromStep uint64) error {
switch name {
case kv.AccountsHistoryIdx:
err := ac.d[kv.AccountsDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.StorageHistoryIdx:
err := ac.d[kv.CodeDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.CodeHistoryIdx:
err := ac.d[kv.StorageDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.CommitmentHistoryIdx:
err := ac.d[kv.CommitmentDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.ReceiptHistoryIdx:
err := ac.d[kv.ReceiptDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
//case kv.GasUsedHistoryIdx:
// err := ac.d[kv.GasUsedDomain].ht.iit.IntegrityInvertedIndexAllValuesAreInRange(ctx)
// if err != nil {
// return err
// }
case kv.TracesFromIdx:
err := ac.iis[kv.TracesFromIdxPos].IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.TracesToIdx:
err := ac.iis[kv.TracesToIdxPos].IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.LogAddrIdx:
err := ac.iis[kv.LogAddrIdxPos].IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
case kv.LogTopicIdx:
err := ac.iis[kv.LogTopicIdxPos].IntegrityInvertedIndexAllValuesAreInRange(ctx, failFast, fromStep)
if err != nil {
return err
}
default:
panic(fmt.Sprintf("unexpected: %s", name))
}
return nil
}

func (dt *DomainRoTx) IntegrityDomainFilesWithKey(k []byte) (res []string, err error) {
for i := len(dt.files) - 1; i >= 0; i-- {
_, ok, _, err := dt.getLatestFromFile(i, k)
if err != nil {
return res, err
}
if ok {
res = append(res, dt.files[i].src.decompressor.FileName())
}
}
return res, nil
}
func (dt *DomainRoTx) IntegrityKey(k []byte) error {
dt.ht.iit.ii.dirtyFiles.Walk(func(items []*filesItem) bool {
for _, item := range items {
if item.decompressor == nil {
continue
}
accessor := item.index
if accessor == nil {
fPath := dt.d.efAccessorFilePath(item.startTxNum/dt.d.aggregationStep, item.endTxNum/dt.d.aggregationStep)
exists, err := dir.FileExist(fPath)
if err != nil {
_, fName := filepath.Split(fPath)
dt.d.logger.Warn("[agg] InvertedIndex.openDirtyFiles", "err", err, "f", fName)
continue
}
if exists {
var err error
accessor, err = recsplit.OpenIndex(fPath)
if err != nil {
_, fName := filepath.Split(fPath)
dt.d.logger.Warn("[agg] InvertedIndex.openDirtyFiles", "err", err, "f", fName)
continue
}
defer accessor.Close()
} else {
continue
}
}

offset, ok := accessor.GetReaderFromPool().Lookup(k)
if !ok {
continue
}
g := item.decompressor.MakeGetter()
g.Reset(offset)
key, _ := g.NextUncompressed()
if !bytes.Equal(k, key) {
continue
}
eliasVal, _ := g.NextUncompressed()
ef, _ := eliasfano32.ReadEliasFano(eliasVal)

last2 := uint64(0)
if ef.Count() > 2 {
last2 = ef.Get(ef.Count() - 2)
}
log.Warn(fmt.Sprintf("[dbg] see1: %s, min=%d,max=%d, before_max=%d, all: %d\n", item.decompressor.FileName(), ef.Min(), ef.Max(), last2, stream.ToArrU64Must(ef.Iterator())))
}
return true
})
return nil
}

func (iit *InvertedIndexRoTx) IntegrityInvertedIndexAllValuesAreInRange(ctx context.Context, failFast bool, fromStep uint64) error {
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
fromTxNum := fromStep * iit.ii.aggregationStep
iterStep := func(item visibleFile) error {
g := item.src.decompressor.MakeGetter()
g.Reset(0)
defer item.src.decompressor.EnableReadAhead().DisableReadAhead()

for g.HasNext() {
k, _ := g.NextUncompressed()
_ = k
eliasVal, _ := g.NextUncompressed()
ef, _ := eliasfano32.ReadEliasFano(eliasVal)
if ef.Count() == 0 {
continue
}
if item.startTxNum > ef.Min() {
err := fmt.Errorf("[integrity] .ef file has foreign txNum: %d > %d, %s, %x", item.startTxNum, ef.Min(), g.FileName(), common.Shorten(k, 8))
if failFast {
return err
} else {
log.Warn(err.Error())
}
}
if item.endTxNum < ef.Max() {
err := fmt.Errorf("[integrity] .ef file has foreign txNum: %d < %d, %s, %x", item.endTxNum, ef.Max(), g.FileName(), common.Shorten(k, 8))
if failFast {
return err
} else {
log.Warn(err.Error())
}
}

select {
case <-ctx.Done():
return ctx.Err()
case <-logEvery.C:
log.Info(fmt.Sprintf("[integrity] InvertedIndex: %s, prefix=%x", g.FileName(), common.Shorten(k, 8)))
default:
}
}
return nil
}

for _, item := range iit.files {
if item.src.decompressor == nil {
continue
}
if item.endTxNum <= fromTxNum {
continue
}
if err := iterStep(item); err != nil {
return err
}
//log.Warn(fmt.Sprintf("[dbg] see1: %s, min=%d,max=%d, before_max=%d, all: %d\n", item.src.decompressor.FileName(), ef.Min(), ef.Max(), last2, stream.ToArrU64Must(ef.Iterator())))
}
return nil
}
Loading
Loading