From e1092200ca9cabb1508b8c0b4d53c46d731c791c Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Thu, 24 Aug 2023 08:32:33 +0700 Subject: [PATCH 1/2] save --- kv/kv_interface.go | 52 +++++++++++++++++++++++----------------------- kv/mdbx/kv_mdbx.go | 3 ++- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/kv/kv_interface.go b/kv/kv_interface.go index bd51347cd..d1d4f0de5 100644 --- a/kv/kv_interface.go +++ b/kv/kv_interface.go @@ -82,29 +82,29 @@ const Unlim int = -1 var ( ErrAttemptToDeleteNonDeprecatedBucket = errors.New("only buckets from dbutils.ChaindataDeprecatedTables can be deleted") - DbSize = metrics.NewCounter(`db_size`) //nolint - TxLimit = metrics.NewCounter(`tx_limit`) //nolint - TxSpill = metrics.NewCounter(`tx_spill`) //nolint - TxUnspill = metrics.NewCounter(`tx_unspill`) //nolint - TxDirty = metrics.NewCounter(`tx_dirty`) //nolint - - DbCommitPreparation = metrics.GetOrCreateSummary(`db_commit_seconds{phase="preparation"}`) //nolint - DbGCWallClock = metrics.GetOrCreateSummary(`db_commit_seconds{phase="gc_wall_clock"}`) //nolint - DbGCCpuTime = metrics.GetOrCreateSummary(`db_commit_seconds{phase="gc_cpu_time"}`) //nolint - DbCommitAudit = metrics.GetOrCreateSummary(`db_commit_seconds{phase="audit"}`) //nolint - DbCommitWrite = metrics.GetOrCreateSummary(`db_commit_seconds{phase="write"}`) //nolint - DbCommitSync = metrics.GetOrCreateSummary(`db_commit_seconds{phase="sync"}`) //nolint - DbCommitEnding = metrics.GetOrCreateSummary(`db_commit_seconds{phase="ending"}`) //nolint - DbCommitTotal = metrics.GetOrCreateSummary(`db_commit_seconds{phase="total"}`) //nolint - - DbPgopsNewly = metrics.NewCounter(`db_pgops{phase="newly"}`) //nolint - DbPgopsCow = metrics.NewCounter(`db_pgops{phase="cow"}`) //nolint - DbPgopsClone = metrics.NewCounter(`db_pgops{phase="clone"}`) //nolint - DbPgopsSplit = metrics.NewCounter(`db_pgops{phase="split"}`) //nolint - DbPgopsMerge = metrics.NewCounter(`db_pgops{phase="merge"}`) //nolint - DbPgopsSpill = metrics.NewCounter(`db_pgops{phase="spill"}`) //nolint - DbPgopsUnspill = metrics.NewCounter(`db_pgops{phase="unspill"}`) //nolint - DbPgopsWops = metrics.NewCounter(`db_pgops{phase="wops"}`) //nolint + DbSize = metrics.GetOrCreateCounter(`db_size`) //nolint + TxLimit = metrics.GetOrCreateCounter(`tx_limit`) //nolint + TxSpill = metrics.GetOrCreateCounter(`tx_spill`) //nolint + TxUnspill = metrics.GetOrCreateCounter(`tx_unspill`) //nolint + TxDirty = metrics.GetOrCreateCounter(`tx_dirty`) //nolint + + DbCommitPreparation = metrics.GetOrCreateSummary(`db_commit_seconds{phase="preparation"}`) //nolint + //DbGCWallClock = metrics.GetOrCreateSummary(`db_commit_seconds{phase="gc_wall_clock"}`) //nolint + //DbGCCpuTime = metrics.GetOrCreateSummary(`db_commit_seconds{phase="gc_cpu_time"}`) //nolint + //DbCommitAudit = metrics.GetOrCreateSummary(`db_commit_seconds{phase="audit"}`) //nolint + DbCommitWrite = metrics.GetOrCreateSummary(`db_commit_seconds{phase="write"}`) //nolint + DbCommitSync = metrics.GetOrCreateSummary(`db_commit_seconds{phase="sync"}`) //nolint + DbCommitEnding = metrics.GetOrCreateSummary(`db_commit_seconds{phase="ending"}`) //nolint + DbCommitTotal = metrics.GetOrCreateSummary(`db_commit_seconds{phase="total"}`) //nolint + + DbPgopsNewly = metrics.GetOrCreateCounter(`db_pgops{phase="newly"}`) //nolint + DbPgopsCow = metrics.GetOrCreateCounter(`db_pgops{phase="cow"}`) //nolint + DbPgopsClone = metrics.GetOrCreateCounter(`db_pgops{phase="clone"}`) //nolint + DbPgopsSplit = metrics.GetOrCreateCounter(`db_pgops{phase="split"}`) //nolint + DbPgopsMerge = metrics.GetOrCreateCounter(`db_pgops{phase="merge"}`) //nolint + DbPgopsSpill = metrics.GetOrCreateCounter(`db_pgops{phase="spill"}`) //nolint + DbPgopsUnspill = metrics.GetOrCreateCounter(`db_pgops{phase="unspill"}`) //nolint + DbPgopsWops = metrics.GetOrCreateCounter(`db_pgops{phase="wops"}`) //nolint /* DbPgopsPrefault = metrics.NewCounter(`db_pgops{phase="prefault"}`) //nolint DbPgopsMinicore = metrics.NewCounter(`db_pgops{phase="minicore"}`) //nolint @@ -138,9 +138,9 @@ var ( //DbGcSelfPnlMergeVolume = metrics.NewCounter(`db_gc_pnl{phase="self_merge_volume"}`) //nolint //DbGcSelfPnlMergeCalls = metrics.NewCounter(`db_gc_pnl{phase="slef_merge_calls"}`) //nolint - GcLeafMetric = metrics.NewCounter(`db_gc_leaf`) //nolint - GcOverflowMetric = metrics.NewCounter(`db_gc_overflow`) //nolint - GcPagesMetric = metrics.NewCounter(`db_gc_pages`) //nolint + GcLeafMetric = metrics.GetOrCreateCounter(`db_gc_leaf`) //nolint + GcOverflowMetric = metrics.GetOrCreateCounter(`db_gc_overflow`) //nolint + GcPagesMetric = metrics.GetOrCreateCounter(`db_gc_pages`) //nolint ) diff --git a/kv/mdbx/kv_mdbx.go b/kv/mdbx/kv_mdbx.go index 45eebc919..f9dbb69a9 100644 --- a/kv/mdbx/kv_mdbx.go +++ b/kv/mdbx/kv_mdbx.go @@ -85,6 +85,7 @@ func NewMDBX(log log.Logger) MdbxOpts { growthStep: 2 * datasize.GB, mergeThreshold: 3 * 8192, shrinkThreshold: -1, // default + label: kv.InMem, } return opts } @@ -803,7 +804,7 @@ func (tx *MdbxTx) Commit() error { if tx.db.opts.label == kv.ChainDB { kv.DbCommitPreparation.Update(latency.Preparation.Seconds()) - kv.DbCommitAudit.Update(latency.Audit.Seconds()) + //kv.DbCommitAudit.Update(latency.Audit.Seconds()) kv.DbCommitWrite.Update(latency.Write.Seconds()) kv.DbCommitSync.Update(latency.Sync.Seconds()) kv.DbCommitEnding.Update(latency.Ending.Seconds()) From 9befdfad5bdd8473131f01180ad5e81b891475a4 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Thu, 24 Aug 2023 09:07:35 +0700 Subject: [PATCH 2/2] save --- .golangci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.golangci.yml b/.golangci.yml index 3717f3d40..a227f0e75 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -8,6 +8,7 @@ linters: - unused - performance disable: + - gosec - exhaustive - musttag - contextcheck