ctdb-pcp.patch

   1 --- ctdb-2.0/utils/pmda/pmda_ctdb.c.orig        2012-12-22 18:36:54.933169295 +0100
   2 +++ ctdb-2.0/utils/pmda/pmda_ctdb.c     2012-12-22 19:04:46.719801116 +0100
   3 @@ -423,10 +423,10 @@
   4                 atom->ul = stats->pending_calls;
   5                 break;
   6         case 15:
   7 -               atom->ul = stats->lockwait_calls;
   8 +               atom->ul = stats->locks.num_calls;
   9                 break;
  10         case 16:
  11 -               atom->ul = stats->pending_lockwait_calls;
  12 +               atom->ul = stats->locks.num_pending;
  13                 break;
  14         case 17:
  15                 atom->ul = stats->childwrite_calls;
  16 @@ -450,7 +450,7 @@
  17                 atom->d = stats->call_latency.max;
  18                 break;
  19         case 24:
  20 -               atom->d = stats->lockwait_latency.max;
  21 +               atom->d = stats->locks.latency.max;
  22                 break;
  23         case 25:
  24                 atom->d = stats->childwrite_latency.max;
  25 --- ctdb-2.0/Makefile.in.orig   2012-12-22 19:49:01.286412453 +0100
  26 +++ ctdb-2.0/Makefile.in        2012-12-22 20:40:38.173014572 +0100
  27 @@ -46,7 +46,7 @@
  28
  29  PMDA_LIBS = -lpcp -lpcp_pmda
  30  PMDA_INSTALL = @CTDB_PMDA_INSTALL@
  31 -PMDA_DEST_DIR = /var/lib/pcp/pmdas
  32 +PMDA_DEST_DIR = /var/lib/pcp/pmdas/ctdb
  33
  34  CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
  35         $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
  36 @@ -368,10 +368,10 @@
  37         if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi
  38
  39  install_pmda:
  40 -       $(INSTALLCMD) -m 755 -d $(PMDA_DEST_DIR)
  41 -       $(INSTALLCMD) -m 755 pmda/Install pmda/Remove $(PMDA_DEST_DIR)
  42 -       $(INSTALLCMD) -m 644 pmda/pmns pmda/domain.h pmda/help pmda/README $(PMDA_DEST_DIR)
  43 -       $(INSTALLCMD) -m 755 bin/pmdactdb $(PMDA_DEST_DIR)
  44 +       $(INSTALLCMD) -m 755 -d $(DESTDIR)$(PMDA_DEST_DIR)
  45 +       $(INSTALLCMD) -m 755 utils/pmda/Install utils/pmda/Remove $(DESTDIR)$(PMDA_DEST_DIR)
  46 +       $(INSTALLCMD) -m 644 utils/pmda/pmns utils/pmda/domain.h utils/pmda/help utils/pmda/README $(DESTDIR)$(PMDA_DEST_DIR)
  47 +       $(INSTALLCMD) -m 755 bin/pmdactdb $(DESTDIR)$(PMDA_DEST_DIR)
  48
  49  # Should use $(datarootdir) but older autoconfs don't do this.  :-(
  50  install_tests: all