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

Jump to bottom

remove e3 metrics from e2 #11374

Merged
merged 2 commits into from
Jul 29, 2024
Merged

remove e3 metrics from e2 #11374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61da675
save
AskAlexSharov Jul 28, 2024
f9b4669
save
AskAlexSharov Jul 28, 2024
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
24 changes: 0 additions & 24 deletions erigon-lib/state/aggregator_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,12 @@ import (
"github.com/holiman/uint256"
"github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/length"
"github.com/ledgerwatch/erigon-lib/metrics"
)

// StepsInBiggestFile - files of this size are completely frozen/immutable.
// files of smaller size are also immutable, but can be removed after merge to bigger files.
const StepsInBiggestFile = 32

var (
mxCurrentTx = metrics.GetOrCreateGauge("domain_tx_processed") //nolint
mxCurrentBlock = metrics.GetOrCreateGauge("domain_block_current") //nolint
mxRunningMerges = metrics.GetOrCreateGauge("domain_running_merges") //nolint
mxRunningCollations = metrics.GetOrCreateGauge("domain_running_collations") //nolint
mxCollateTook = metrics.GetOrCreateHistogram("domain_collate_took") //nolint
mxPruneTook = metrics.GetOrCreateHistogram("domain_prune_took") //nolint
mxPruneHistTook = metrics.GetOrCreateHistogram("domain_prune_hist_took") //nolint
mxPruningProgress = metrics.GetOrCreateGauge("domain_pruning_progress") //nolint
mxCollationSize = metrics.GetOrCreateGauge("domain_collation_size") //nolint
mxCollationSizeHist = metrics.GetOrCreateGauge("domain_collation_hist_size") //nolint
mxPruneSize = metrics.GetOrCreateCounter("domain_prune_size") //nolint
mxBuildTook = metrics.GetOrCreateSummary("domain_build_files_took") //nolint
mxStepCurrent = metrics.GetOrCreateGauge("domain_step_current") //nolint
mxStepTook = metrics.GetOrCreateHistogram("domain_step_took") //nolint
mxCommitmentKeys = metrics.GetOrCreateCounter("domain_commitment_keys") //nolint
mxCommitmentRunning = metrics.GetOrCreateGauge("domain_running_commitment") //nolint
mxCommitmentTook = metrics.GetOrCreateSummary("domain_commitment_took") //nolint
mxCommitmentWriteTook = metrics.GetOrCreateHistogram("domain_commitment_write_took") //nolint
mxCommitmentUpdates = metrics.GetOrCreateCounter("domain_commitment_updates") //nolint
mxCommitmentUpdatesApplied = metrics.GetOrCreateCounter("domain_commitment_updates_applied") //nolint
)

type SelectedStaticFiles struct {
accounts []*filesItem
accountsIdx []*filesItem
Expand Down
4 changes: 0 additions & 4 deletions erigon-lib/state/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,6 @@ func (d *Domain) integrateFiles(sf StaticFiles, txNumFrom, txNumTo uint64) {
// [txFrom; txTo)
func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uint64, logEvery *time.Ticker) error {
defer func(t time.Time) { d.stats.LastPruneTook = time.Since(t) }(time.Now())
mxPruningProgress.Inc()
defer mxPruningProgress.Dec()

var (
_state = "scan steps"
Expand Down Expand Up @@ -948,7 +946,6 @@ func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uin
if err := keysCursor.DeleteCurrent(); err != nil {
return fmt.Errorf("prune key %x: %w", k, err)
}
mxPruneSize.Inc()
keyMaxSteps[string(k)] = s
}
}
Expand Down Expand Up @@ -992,7 +989,6 @@ func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uin
if err := valsCursor.DeleteCurrent(); err != nil {
return fmt.Errorf("prune val %x: %w", k, err)
}
mxPruneSize.Inc()
}
pos.Add(1)
//_prog = 100 * (float64(pos) / float64(totalKeys))
Expand Down
Loading