From d3b424c9f6e935f1e9a9c0580b9f18aca24e6f66 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Tue, 19 Jul 2022 16:53:18 +0700 Subject: [PATCH] Mdbx: GC BigFoot (#4750) --- cmd/downloader/downloader/downloadercfg/logger.go | 3 +++ go.mod | 4 ++-- go.sum | 8 ++++---- libmdbx | 2 +- turbo/snapshotsync/snapshothashes/erigon-snapshots | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cmd/downloader/downloader/downloadercfg/logger.go b/cmd/downloader/downloader/downloadercfg/logger.go index 7c71fa81e..27989595f 100644 --- a/cmd/downloader/downloader/downloadercfg/logger.go +++ b/cmd/downloader/downloader/downloadercfg/logger.go @@ -74,6 +74,9 @@ func (b adapterHandler) Handle(r lg.Record) { if strings.Contains(str, "being sole dirtier of piece") { // suppress useless errors break } + if strings.Contains(str, "requested chunk too long") { // suppress useless errors + break + } log.Warn(str) case lg.Error: diff --git a/go.mod b/go.mod index ca35ad108..efcd1b91f 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 github.com/kevinburke/go-bindata v3.21.0+incompatible - github.com/ledgerwatch/erigon-lib v0.0.0-20220719040828-9ceeeac385ad + github.com/ledgerwatch/erigon-lib v0.0.0-20220719082624-745b9b6b98dc github.com/ledgerwatch/log/v3 v3.4.1 github.com/ledgerwatch/secp256k1 v1.0.0 github.com/nxadm/tail v1.4.9-0.20211216163028-4472660a31a6 @@ -50,7 +50,7 @@ require ( github.com/stretchr/testify v1.8.0 github.com/tendermint/go-amino v0.14.1 github.com/tendermint/tendermint v0.31.11 - github.com/torquem-ch/mdbx-go v0.24.3-0.20220614090901-342411560dde + github.com/torquem-ch/mdbx-go v0.25.0 github.com/ugorji/go/codec v1.1.13 github.com/ugorji/go/codec/codecgen v1.1.13 github.com/urfave/cli v1.22.9 diff --git a/go.sum b/go.sum index 9e844b358..985b44713 100644 --- a/go.sum +++ b/go.sum @@ -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/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/ledgerwatch/erigon-lib v0.0.0-20220719040828-9ceeeac385ad h1:fdAdq41F6zH39l6FgsfezXZElEFzl80fXqnB7gKWCTE= -github.com/ledgerwatch/erigon-lib v0.0.0-20220719040828-9ceeeac385ad/go.mod h1:KXCwHR5gW/dv9naTlrx4Du8Wzj6H3ndTBC+vw3hnyWU= +github.com/ledgerwatch/erigon-lib v0.0.0-20220719082624-745b9b6b98dc h1:5opLy9YqL26YvSNGKxHcJO4X/R7Q3FU4ajp7jhbZPBE= +github.com/ledgerwatch/erigon-lib v0.0.0-20220719082624-745b9b6b98dc/go.mod h1:8wlgUF6YVdB3fjGg9VbQshirfJvi1h+qoHDYrPqAHoE= github.com/ledgerwatch/log/v3 v3.4.1 h1:/xGwlVulXnsO9Uq+tzaExc8OWmXXHU0dnLalpbnY5Bc= github.com/ledgerwatch/log/v3 v3.4.1/go.mod h1:VXcz6Ssn6XEeU92dCMc39/g1F0OYAjw1Mt+dGP5DjXY= github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= @@ -619,8 +619,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.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/torquem-ch/mdbx-go v0.24.3-0.20220614090901-342411560dde h1:1nzKGldWC9T0ApRfV0jzH28DaBy1Yg5+rmjSiJ/G0dI= -github.com/torquem-ch/mdbx-go v0.24.3-0.20220614090901-342411560dde/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E= +github.com/torquem-ch/mdbx-go v0.25.0 h1:k66O6GrqyAsXNn4tF87Q+ba4840aplv6O8Ph0FR1PCY= +github.com/torquem-ch/mdbx-go v0.25.0/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E= 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/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU= diff --git a/libmdbx b/libmdbx index 5d2eb580f..0018164fe 160000 --- a/libmdbx +++ b/libmdbx @@ -1 +1 @@ -Subproject commit 5d2eb580fdd61ccacf00aa93d7ee42e8e53afc8e +Subproject commit 0018164fef048b68dd84d503fde95dab5fdea94b diff --git a/turbo/snapshotsync/snapshothashes/erigon-snapshots b/turbo/snapshotsync/snapshothashes/erigon-snapshots index d90ddcf72..7e85e4d00 160000 --- a/turbo/snapshotsync/snapshothashes/erigon-snapshots +++ b/turbo/snapshotsync/snapshothashes/erigon-snapshots @@ -1 +1 @@ -Subproject commit d90ddcf72579066b48d631fc5a84dcfbbf2bac49 +Subproject commit 7e85e4d0028c27f747d97f65ac0b8c252a050b39