fix 64kb pageSize page_full corner case (#4847)

This commit is contained in:
Alex Sharov 2022-08-01 11:03:28 +07:00 committed by GitHub
parent 2b517b7630
commit bd4bed5933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

4
go.mod
View File

@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon
go 1.18 go 1.18
require ( require (
github.com/ledgerwatch/erigon-lib v0.0.0-20220729021340-dd32747db2ed github.com/ledgerwatch/erigon-lib v0.0.0-20220801035435-b552ed43868a
github.com/ledgerwatch/erigon-snapshot v1.0.0 github.com/ledgerwatch/erigon-snapshot v1.0.0
github.com/ledgerwatch/log/v3 v3.4.1 github.com/ledgerwatch/log/v3 v3.4.1
github.com/ledgerwatch/secp256k1 v1.0.0 github.com/ledgerwatch/secp256k1 v1.0.0
@ -56,7 +56,7 @@ require (
github.com/stretchr/testify v1.8.0 github.com/stretchr/testify v1.8.0
github.com/tendermint/go-amino v0.14.1 github.com/tendermint/go-amino v0.14.1
github.com/tendermint/tendermint v0.31.11 github.com/tendermint/tendermint v0.31.11
github.com/torquem-ch/mdbx-go v0.25.1-0.20220720103744-b96489e94ece github.com/torquem-ch/mdbx-go v0.25.1
github.com/ugorji/go/codec v1.1.13 github.com/ugorji/go/codec v1.1.13
github.com/ugorji/go/codec/codecgen v1.1.13 github.com/ugorji/go/codec/codecgen v1.1.13
github.com/urfave/cli v1.22.9 github.com/urfave/cli v1.22.9

8
go.sum
View File

@ -390,8 +390,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0= github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/ledgerwatch/erigon-lib v0.0.0-20220729021340-dd32747db2ed h1:E1z7ukl4o1DjXTQ/tCR6js8l3z9gNbRsJiarq/4xXSY= github.com/ledgerwatch/erigon-lib v0.0.0-20220801035435-b552ed43868a h1:gpVgb4azStjEma/JF1YZxANn/ebSPJscqM9AuUdXVY0=
github.com/ledgerwatch/erigon-lib v0.0.0-20220729021340-dd32747db2ed/go.mod h1:19wwSb5qbagorz9a4QN9FzNqSPjmOJkwa5TezGjloks= github.com/ledgerwatch/erigon-lib v0.0.0-20220801035435-b552ed43868a/go.mod h1:H1yhcOcu+HDEU1i5Q+g0ezSoQszsJR+vbowF19a63yA=
github.com/ledgerwatch/erigon-snapshot v1.0.0 h1:bp/7xoPdM5lK7LFdqEMH008RZmqxMZV0RUVEQiWs7v4= github.com/ledgerwatch/erigon-snapshot v1.0.0 h1:bp/7xoPdM5lK7LFdqEMH008RZmqxMZV0RUVEQiWs7v4=
github.com/ledgerwatch/erigon-snapshot v1.0.0/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/erigon-snapshot v1.0.0/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
github.com/ledgerwatch/log/v3 v3.4.1 h1:/xGwlVulXnsO9Uq+tzaExc8OWmXXHU0dnLalpbnY5Bc= github.com/ledgerwatch/log/v3 v3.4.1 h1:/xGwlVulXnsO9Uq+tzaExc8OWmXXHU0dnLalpbnY5Bc=
@ -623,8 +623,8 @@ github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDW
github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/torquem-ch/mdbx-go v0.25.1-0.20220720103744-b96489e94ece h1:jwLF5BKBWPb00kMfRmSHJl0Hwe52HonOVpNkBJZR+XI= github.com/torquem-ch/mdbx-go v0.25.1 h1:4UxZdwTU+hPp7/czW2yb9qU1SwuwtPf86BXMYggWLZ4=
github.com/torquem-ch/mdbx-go v0.25.1-0.20220720103744-b96489e94ece/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E= github.com/torquem-ch/mdbx-go v0.25.1/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E=
github.com/ugorji/go v1.1.13/go.mod h1:jxau1n+/wyTGLQoCkjok9r5zFa/FxT6eI5HiHKQszjc= github.com/ugorji/go v1.1.13/go.mod h1:jxau1n+/wyTGLQoCkjok9r5zFa/FxT6eI5HiHKQszjc=
github.com/ugorji/go/codec v1.1.13 h1:013LbFhocBoIqgHeIHKlV4JWYhqogATYWZhIcH0WHn4= github.com/ugorji/go/codec v1.1.13 h1:013LbFhocBoIqgHeIHKlV4JWYhqogATYWZhIcH0WHn4=
github.com/ugorji/go/codec v1.1.13/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU= github.com/ugorji/go/codec v1.1.13/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU=

@ -1 +1 @@
Subproject commit 0018164fef048b68dd84d503fde95dab5fdea94b Subproject commit 1cac65363763e7523ed3b52eed8f2c617cead973

View File

@ -766,7 +766,7 @@ func BuildMissedIndices(ctx context.Context, dir string, chainID uint256.Int, tm
defer sem.Release(1) defer sem.Release(1)
defer wg.Done() defer wg.Done()
log.Log(log.LvlInfo, "[snapshots] BuildMissedIndices", "from", sn.From, "to", sn.To) log.Log(log.LvlInfo, "[snapshots] Build missed indices", "type", t.String(), "from", sn.From, "to", sn.To)
if err := buildIdx(ctx, sn, chainID, tmpDir, lvl); err != nil { if err := buildIdx(ctx, sn, chainID, tmpDir, lvl); err != nil {
errs <- err errs <- err
} }