Skip to content

Fix overlay only mode #5401

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

Open
marta-lokhova wants to merge 1 commit into
base: overlay-v2-shared
Choose a base branch
from
+14 −1
Open

Fix overlay only mode #5401

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
2 changes: 1 addition & 1 deletion ci-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ echo "Using RND_SEED: $RND_SEED"
ulimit -n 65536
export INTERACTIVE=0

export TEST_SPEC='[overlay-ipc]'
export TEST_SPEC='[overlay-ipc],[loadgen]'
export SKIP_SOROBAN_TESTS=true
export STELLAR_OVERLAY_BINARY="${SRC_DIR}/build-${CC}-${PROTOCOL}/stellar-overlay"
time make check
Expand Down
9 changes: 9 additions & 0 deletions src/ledger/LedgerManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ LedgerManagerImpl::LedgerApplyMetrics::LedgerApplyMetrics(
, mLedgerAgeClosedHistogram(
registry.NewHistogram({"ledger", "age", "closed-histogram"},
medida::SamplingInterface::kSliding))
, mPendingTxsSelfCount(
registry.NewCounter({"herder", "pending-txs", "self-count"}))
, mPendingSorobanTxsSelfCount(
registry.NewCounter({"herder", "pending-soroban-txs", "self-count"}))
#endif
, mLedgerAge(registry.NewCounter({"ledger", "age", "current-seconds"}))
, mTransactionApplySucceeded(
Expand Down Expand Up @@ -1803,6 +1807,11 @@ LedgerManagerImpl::applyLedger(LedgerCloseData const& ledgerData,
static_cast<int64_t>(numOps));
TracyPlot("ledger.operation.count", static_cast<int64_t>(numOps));

mApplyState.getMetrics().mPendingTxsSelfCount.inc(
static_cast<int64_t>(numClassicTxs));
mApplyState.getMetrics().mPendingSorobanTxsSelfCount.inc(
static_cast<int64_t>(numSorobanTxs));

CLOG_INFO(Ledger,
"Overlay-only mode: skipping apply for ledger {} "
"({} classic, {} soroban, {} total txs)",
Expand Down
4 changes: 4 additions & 0 deletions src/ledger/LedgerManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ class LedgerManagerImpl : public LedgerManager
medida::Buckets& mLedgerAgeClosed;
#ifdef BUILD_TESTS
medida::Histogram& mLedgerAgeClosedHistogram;
// Externalized tx counters maintained in overlay-only mode; loadgen's
// completion check reads these to track applied transactions.
medida::Counter& mPendingTxsSelfCount;
medida::Counter& mPendingSorobanTxsSelfCount;
#endif
medida::Counter& mLedgerAge;
medida::Counter& mTransactionApplySucceeded;
Expand Down