|
 |
61f723 |
From a7b9a9ddbff47c2226e60e403374d5e451fac344 Mon Sep 17 00:00:00 2001
|
|
|
61f723 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
61f723 |
Date: Tue, 2 May 2017 13:48:33 -0400
|
|
|
61f723 |
Subject: [PATCH] Ticket 48989 - fix perf counters
|
|
|
61f723 |
|
|
|
61f723 |
Description: There was a copy & paste error where page_access_rate
|
|
|
61f723 |
was added, but it listed the wrong attribute name. However,
|
|
|
61f723 |
the page_access_rate formula doesn't make sense, nor are
|
|
|
61f723 |
there more page stats to use from Berklely DB. Because
|
|
|
61f723 |
of this I just removed page_access_rate.
|
|
|
61f723 |
|
|
|
61f723 |
https://pagure.io/389-ds-base/issue/48989
|
|
|
61f723 |
|
|
|
61f723 |
Reviewed by: firstyear(Thanks!)
|
|
|
61f723 |
|
|
|
61f723 |
(cherry picked from commit 18a77e957119bd9994833b7290747f99d73b3745)
|
|
|
61f723 |
---
|
|
|
61f723 |
ldap/servers/slapd/back-ldbm/perfctrs.c | 3 ---
|
|
|
61f723 |
ldap/servers/slapd/back-ldbm/perfctrs.h | 1 -
|
|
|
61f723 |
2 files changed, 4 deletions(-)
|
|
|
61f723 |
|
|
|
61f723 |
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c
|
|
|
61f723 |
index 5929dea..9132097 100644
|
|
|
61f723 |
--- a/ldap/servers/slapd/back-ldbm/perfctrs.c
|
|
|
61f723 |
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.c
|
|
|
61f723 |
@@ -165,7 +165,6 @@ void perfctrs_update(perfctrs_private *priv, DB_ENV *db_env)
|
|
|
61f723 |
if (0 == ret) {
|
|
|
61f723 |
#define ONEG 1073741824
|
|
|
61f723 |
perf->cache_size_bytes = mpstat->st_gbytes * ONEG + mpstat->st_bytes;
|
|
|
61f723 |
- perf->page_access_rate = mpstat->st_cache_hit + mpstat->st_cache_miss;
|
|
|
61f723 |
perf->cache_hit = mpstat->st_cache_hit;
|
|
|
61f723 |
perf->cache_try = mpstat->st_cache_hit + mpstat->st_cache_miss;
|
|
|
61f723 |
perf->page_create_rate = mpstat->st_page_create;
|
|
|
61f723 |
@@ -257,8 +256,6 @@ static SlapiLDBMPerfctrATMap perfctr_at_map[] = {
|
|
|
61f723 |
offsetof( performance_counters, log_write_rate ) },
|
|
|
61f723 |
{ SLAPI_LDBM_PERFCTR_AT_PREFIX "longest-chain-length",
|
|
|
61f723 |
offsetof( performance_counters, longest_chain_length ) },
|
|
|
61f723 |
- { SLAPI_LDBM_PERFCTR_AT_PREFIX "objects-locked",
|
|
|
61f723 |
- offsetof( performance_counters, page_access_rate ) },
|
|
|
61f723 |
{ SLAPI_LDBM_PERFCTR_AT_PREFIX "page-create-rate",
|
|
|
61f723 |
offsetof( performance_counters, page_create_rate ) },
|
|
|
61f723 |
{ SLAPI_LDBM_PERFCTR_AT_PREFIX "page-read-rate",
|
|
|
61f723 |
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.h b/ldap/servers/slapd/back-ldbm/perfctrs.h
|
|
|
61f723 |
index 64c79e1..a6213ec 100644
|
|
|
61f723 |
--- a/ldap/servers/slapd/back-ldbm/perfctrs.h
|
|
|
61f723 |
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.h
|
|
|
61f723 |
@@ -32,7 +32,6 @@ struct _performance_counters {
|
|
|
61f723 |
uint64_t log_write_rate;
|
|
|
61f723 |
uint64_t log_bytes_since_checkpoint;
|
|
|
61f723 |
uint64_t cache_size_bytes;
|
|
|
61f723 |
- uint64_t page_access_rate;
|
|
|
61f723 |
uint64_t cache_hit;
|
|
|
61f723 |
uint64_t cache_try;
|
|
|
61f723 |
uint64_t page_create_rate;
|
|
|
61f723 |
--
|
|
|
61f723 |
2.9.3
|
|
|
61f723 |
|