[SCM] CTDB repository - branch master updated - ctdb-2.1-207-ge5a5ab5

[Michael Adam]

The branch, master has been updated
       via  e5a5ab53173d9aa4190ddf68c4ae316d4473eb56 (commit)
      from  75a620c516e384f042b5d675183b3a1b48fd6115 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e5a5ab53173d9aa4190ddf68c4ae316d4473eb56
Author: David Disseldorp <ddiss at samba.org>
Date:   Fri May 24 16:11:12 2013 +0200

    pmda: handle new ctdb_statistics format
    
    The ctdb_statistics structure was recently changed. Update the PMDA to
    dereference the new structure member names.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 utils/pmda/pmda_ctdb.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/utils/pmda/pmda_ctdb.c b/utils/pmda/pmda_ctdb.c
index c8983ef..e8033be 100644
--- a/utils/pmda/pmda_ctdb.c
+++ b/utils/pmda/pmda_ctdb.c
@@ -121,10 +121,10 @@ static pmdaMetric metrictab[] = {
 	/* pending_calls */
 	{ NULL, { PMDA_PMID(14,25), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT,
 		PMDA_PMUNITS(0,0,0,0,0,0) }, },
-	/* lockwait_calls */
+	/* locks.num_calls */
 	{ NULL, { PMDA_PMID(15,27), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_COUNTER,
 		PMDA_PMUNITS(0,0,1,0,0,PM_COUNT_ONE) }, },
-	/* pending_lockwait_calls */
+	/* locks.pending_calls */
 	{ NULL, { PMDA_PMID(16,27), PM_TYPE_U32, PM_INDOM_NULL, PM_SEM_INSTANT,
 		PMDA_PMUNITS(0,0,0,0,0,0) }, },
 	/* childwrite_calls */
@@ -148,10 +148,10 @@ static pmdaMetric metrictab[] = {
 	/* max_call_latency */
 	{ NULL, { PMDA_PMID(23,34), PM_TYPE_DOUBLE, PM_INDOM_NULL, PM_SEM_INSTANT,
 		PMDA_PMUNITS(0,1,0,0,PM_TIME_SEC,0) }, },
-	/* max_lockwait_latency */
+	/* locks.latency.max */
 	{ NULL, { PMDA_PMID(24,35), PM_TYPE_DOUBLE, PM_INDOM_NULL, PM_SEM_INSTANT,
 		PMDA_PMUNITS(0,1,0,0,PM_TIME_SEC,0) }, },
-	/* max_childwrite_latency */
+	/* childwrite_latency.max */
 	{ NULL, { PMDA_PMID(25,36), PM_TYPE_DOUBLE, PM_INDOM_NULL, PM_SEM_INSTANT,
 		PMDA_PMUNITS(0,1,0,0,PM_TIME_SEC,0) }, },
 	/* num_recoveries */
@@ -423,10 +423,10 @@ pmda_ctdb_fetch_cb(pmdaMetric *mdesc, unsigned int inst, pmAtomValue *atom)
 		atom->ul = stats->pending_calls;
 		break;
 	case 15:
-		atom->ul = stats->lockwait_calls;
+		atom->ul = stats->locks.num_calls;
 		break;
 	case 16:
-		atom->ul = stats->pending_lockwait_calls;
+		atom->ul = stats->locks.num_pending;
 		break;
 	case 17:
 		atom->ul = stats->childwrite_calls;
@@ -450,7 +450,7 @@ pmda_ctdb_fetch_cb(pmdaMetric *mdesc, unsigned int inst, pmAtomValue *atom)
 		atom->d = stats->call_latency.max;
 		break;
 	case 24:
-		atom->d = stats->lockwait_latency.max;
+		atom->d = stats->locks.latency.max;
 		break;
 	case 25:
 		atom->d = stats->childwrite_latency.max;


-- 
CTDB repository