- build pcp agent (PMDA)

- added pcp patch (build fixes for it)

diff --git a/ctdb-pcp.patch b/ctdb-pcp.patch
new file mode 100644 (file)
index 0000000..daf366a
--- /dev/null
+++ b/ctdb-pcp.patch
@@ -0,0 +1,50 @@
+--- ctdb-2.0/utils/pmda/pmda_ctdb.c.orig       2012-12-22 18:36:54.933169295 +0100
++++ ctdb-2.0/utils/pmda/pmda_ctdb.c    2012-12-22 19:04:46.719801116 +0100
+@@ -423,10 +423,10 @@
+               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 @@
+               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-2.0/Makefile.in.orig  2012-12-22 19:49:01.286412453 +0100
++++ ctdb-2.0/Makefile.in       2012-12-22 20:40:38.173014572 +0100
+@@ -46,7 +46,7 @@
+ 
+ PMDA_LIBS = -lpcp -lpcp_pmda
+ PMDA_INSTALL = @CTDB_PMDA_INSTALL@
+-PMDA_DEST_DIR = /var/lib/pcp/pmdas
++PMDA_DEST_DIR = /var/lib/pcp/pmdas/ctdb
+ 
+ CFLAGS=@CPPFLAGS@ -g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
+        $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
+@@ -368,10 +368,10 @@
+       if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi
+ 
+ install_pmda:
+-      $(INSTALLCMD) -m 755 -d $(PMDA_DEST_DIR)
+-      $(INSTALLCMD) -m 755 pmda/Install pmda/Remove $(PMDA_DEST_DIR)
+-      $(INSTALLCMD) -m 644 pmda/pmns pmda/domain.h pmda/help pmda/README $(PMDA_DEST_DIR)
+-      $(INSTALLCMD) -m 755 bin/pmdactdb $(PMDA_DEST_DIR)
++      $(INSTALLCMD) -m 755 -d $(DESTDIR)$(PMDA_DEST_DIR)
++      $(INSTALLCMD) -m 755 utils/pmda/Install utils/pmda/Remove $(DESTDIR)$(PMDA_DEST_DIR)
++      $(INSTALLCMD) -m 644 utils/pmda/pmns utils/pmda/domain.h utils/pmda/help utils/pmda/README $(DESTDIR)$(PMDA_DEST_DIR)
++      $(INSTALLCMD) -m 755 bin/pmdactdb $(DESTDIR)$(PMDA_DEST_DIR)
+ 
+ # Should use $(datarootdir) but older autoconfs don't do this.  :-(
+ install_tests: all

diff --git a/ctdb.spec b/ctdb.spec
index 5968d19f9020b31f3fbabcf12ddf9b45dcb64e65..7b9ffd5b56fe8832c5dc9066f5fb14024fd430e4 100644 (file)
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -11,6 +11,7 @@
 #
 # Conditional build:
 %bcond_without ibverbs         # InfiniBand support
+%bcond_without pcp             # Performance Co-Pilot support
 #
 Summary:       A Clustered Database based on Samba's Trivial Database (TDB)
 Summary(pl.UTF-8):     Klastrowa baza danych oparta na bazie danych Trivial Database z Samby (TDB)
@@ -22,7 +23,9 @@ Group:                Daemons
 Source0:       http://www.samba.org/ftp/ctdb/%{name}-%{version}.tar.gz
 # Source0-md5: 89a397e165e7f5347f06a6cf45fd6b60
 Patch0:                %{name}-ib.patch
+Patch1:                %{name}-pcp.patch
 URL:           http://ctdb.samba.org/
+%{?with_pcp:BuildRequires:     pcp-devel}
 BuildRequires: popt-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: talloc-devel
@@ -65,12 +68,29 @@ Header files etc. you can use to develop CTDB applications.
 Pliki nagłówkowe i inne, przy użyciu których można tworzyć aplikacje
 wykorzystujące CTDB.
 
+%package -n pcp-ctdb
+Summary:       CTDB PMDA
+Summary(pl.UTF-8):     PMDA CTDB
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      pcp
+
+%description -n pcp-ctdb
+This PMDA extracts metrics from the locally running ctdbd daemon for
+export to PMCD.
+
+%description -n pcp-ctdb -l pl.UTF-8
+Ten PMDA odczytuje pomiary z lokalnie działającego demona ctdbd w celu
+wyeksportowania do PMCD.
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
+       %{!?with_pcp:ac_cv_header_pcp_pmda_h=no} \
        %{?with_ibverbs:--enable-infiniband}
 %{__make} showflags
 %{__make}
@@ -139,3 +159,14 @@ fi
 %{_libdir}/libctdb.a
 %{_includedir}/ctdb*.h
 %{_pkgconfigdir}/ctdb.pc
+
+%files -n pcp-ctdb
+%defattr(644,root,root,755)
+%dir /var/lib/pcp/pmdas/ctdb
+%doc /var/lib/pcp/pmdas/ctdb/README
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/pmdactdb
+/var/lib/pcp/pmdas/ctdb/domain.h
+/var/lib/pcp/pmdas/ctdb/help
+/var/lib/pcp/pmdas/ctdb/pmns