Skip to content

Fix incorrect metric for agg_copy bytes written #11508

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

Merged
JosiahWI merged 1 commit into from
Jul 3, 2024
Merged

Fix incorrect metric for agg_copy bytes written #11508

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
5 changes: 2 additions & 3 deletions src/iocore/cache/CacheWrite.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,10 +734,9 @@ Stripe::_agg_copy(CacheVC *vc)
ProxyMutex *mutex ATS_UNUSED = this->mutex.get();
ink_assert(mutex->thread_holding == this_ethread());

// ToDo: Why are these for debug only ?
#ifdef DEBUG
Metrics::Counter::increment(cache_rsb.write_backlog_failure);
Metrics::Counter::increment(this->cache_vol->vol_rsb.write_backlog_failure);
Metrics::Counter::increment(cache_rsb.write_bytes, vc->write_len);
Metrics::Counter::increment(this->cache_vol->vol_rsb.write_bytes, vc->write_len);
#endif
}
if (vc->f.rewrite_resident_alt) {
Expand Down
10 changes: 5 additions & 5 deletions src/iocore/cache/unit_tests/test_Stripe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@ attach_tmpfile_to_stripe(Stripe &stripe)
static std::FILE *
init_stripe_for_writing(Stripe &stripe, StripteHeaderFooter &header, CacheVol &cache_vol)
{
stripe.cache_vol = &cache_vol;
cache_rsb.write_backlog_failure = Metrics::Counter::createPtr("unit_test.write.backlog.failure");
stripe.cache_vol->vol_rsb.write_backlog_failure = Metrics::Counter::createPtr("unit_test.write.backlog.failure");
cache_rsb.gc_frags_evacuated = Metrics::Counter::createPtr("unit_test.gc.frags.evacuated");
stripe.cache_vol->vol_rsb.gc_frags_evacuated = Metrics::Counter::createPtr("unit_test.gc.frags.evacuated");
stripe.cache_vol = &cache_vol;
cache_rsb.write_bytes = Metrics::Counter::createPtr("unit_test.write.bytes");
stripe.cache_vol->vol_rsb.write_bytes = Metrics::Counter::createPtr("unit_test.write.bytes");
cache_rsb.gc_frags_evacuated = Metrics::Counter::createPtr("unit_test.gc.frags.evacuated");
stripe.cache_vol->vol_rsb.gc_frags_evacuated = Metrics::Counter::createPtr("unit_test.gc.frags.evacuated");

// A number of things must be initialized in a certain way for Stripe
// not to segfault, hit an assertion, or exhibit zero-division.
Expand Down