diff options
| -rw-r--r-- | INSTALL | 1 | ||||
| -rw-r--r-- | configure.ac | 33 | ||||
| -rw-r--r-- | doc/developer-guide/Building GlusterFS.md | 1 | ||||
| -rw-r--r-- | doc/developer-guide/Compiling-RPMS.md | 4 | ||||
| -rw-r--r-- | doc/developer-guide/Development-Workflow.md | 4 | ||||
| -rw-r--r-- | doc/developer-guide/Using-Gluster-Test-Framework.md | 12 | ||||
| -rw-r--r-- | glusterfs.spec.in | 7 |
7 files changed, 10 insertions, 52 deletions
@@ -19,7 +19,6 @@ Installation Instructions georeplication : yes Linux-AIO : yes Enable Debug : no - systemtap : no Block Device xlator : yes glupy : yes Use syslog : yes diff --git a/configure.ac b/configure.ac index 08403bd1434..6c22e0940b4 100644 --- a/configure.ac +++ b/configure.ac @@ -775,38 +775,6 @@ AC_SUBST(SQLITE_LIBS) AM_CONDITIONAL(BUILD_GFDB, test "x${BUILD_GFDB}" = "xyes") AM_CONDITIONAL(USE_GFDB, test "x${BUILD_GFDB}" = "xyes") -# check for systemtap/dtrace -BUILD_SYSTEMTAP=no -AC_MSG_CHECKING([whether to include systemtap tracing support]) -AC_ARG_ENABLE([systemtap], - [AS_HELP_STRING([--enable-systemtap], - [Enable inclusion of systemtap trace support])], - [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP="def"]) - -AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test "x${ENABLE_SYSTEMTAP}" = "xyes"]) -AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) - -if test "x${ENABLE_SYSTEMTAP}" != "xno"; then - AC_CHECK_PROG(DTRACE, dtrace, "yes", "no") - AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND="yes"], - [SDT_H_FOUND="no"]) -fi - -if test "x${ENABLE_SYSTEMTAP}" = "xyes"; then - if test "x${DTRACE}" = "xno"; then - AC_MSG_ERROR([dtrace not found]) - elif test "$x{SDT_H_FOUND}" = "xno"; then - AC_MSG_ERROR([systemtap support needs sys/sdt.h header]) - fi -fi - -if test "x${DTRACE}" = "xyes" -a "x${SDT_H_FOUND}" = "xyes"; then - AC_MSG_CHECKING([x"${DTRACE}"xy"${SDT_H_FOUND}"y]) - AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using probes.]) - BUILD_SYSTEMTAP=yes -fi -# end of systemtap/dtrace - # xml-output AC_ARG_ENABLE([xml-output], AC_HELP_STRING([--disable-xml-output], @@ -1372,7 +1340,6 @@ echo "readline : $BUILD_READLINE" echo "georeplication : $BUILD_SYNCDAEMON" echo "Linux-AIO : $BUILD_LIBAIO" echo "Enable Debug : $BUILD_DEBUG" -## echo "systemtap : $BUILD_SYSTEMTAP" echo "Block Device xlator : $BUILD_BD_XLATOR" echo "glupy : $BUILD_GLUPY" echo "Use syslog : $USE_SYSLOG" diff --git a/doc/developer-guide/Building GlusterFS.md b/doc/developer-guide/Building GlusterFS.md index 160216921ad..ab287820f21 100644 --- a/doc/developer-guide/Building GlusterFS.md +++ b/doc/developer-guide/Building GlusterFS.md @@ -75,7 +75,6 @@ configure script should give the below configure summary, georeplication : yes Linux-AIO : yes Enable Debug : no - systemtap : no Block Device xlator : yes glupy : yes Use syslog : yes diff --git a/doc/developer-guide/Compiling-RPMS.md b/doc/developer-guide/Compiling-RPMS.md index b1bd39b26f8..7a243ded739 100644 --- a/doc/developer-guide/Compiling-RPMS.md +++ b/doc/developer-guide/Compiling-RPMS.md @@ -111,7 +111,7 @@ installed. libattr-devel libibverbs-devel librdmacm-devel libtool libxml2-devel lvm2-devel make \ openssl-devel pkgconfig pyliblzma python-devel python-eventlet python-netifaces \ python-paste-deploy python-simplejson python-sphinx python-webob pyxattr readline-devel \ - rpm-build systemtap-sdt-devel tar libcmocka-devel + rpm-build tar libcmocka-devel 2. Clone the GlusterFS git repository @@ -175,4 +175,4 @@ containing the RPMs. -rw-rw-r-- 1 jc jc 44943 Mar 2 12:17 glusterfs-rdma-3git-1.el5.centos.x86_64.rpm -rw-rw-r-- 1 jc jc 123065 Mar 2 12:17 glusterfs-regression-tests-3git-1.el5.centos.x86_64.rpm -rw-rw-r-- 1 jc jc 16224 Mar 2 12:17 glusterfs-resource-agents-3git-1.el5.centos.x86_64.rpm - -rw-rw-r-- 1 jc jc 654043 Mar 2 12:17 glusterfs-server-3git-1.el5.centos.x86_64.rpm
\ No newline at end of file + -rw-rw-r-- 1 jc jc 654043 Mar 2 12:17 glusterfs-server-3git-1.el5.centos.x86_64.rpm diff --git a/doc/developer-guide/Development-Workflow.md b/doc/developer-guide/Development-Workflow.md index d36b932c0a8..4c80327bff0 100644 --- a/doc/developer-guide/Development-Workflow.md +++ b/doc/developer-guide/Development-Workflow.md @@ -164,8 +164,8 @@ Ubuntu: To setup the build environment on an Ubuntu system, type the following command to install the required packages: - sudo apt-get -y install python-pyxattr libreadline-dev systemtap-sdt-dev - tar python-pastedeploy python-simplejson python-sphinx python-webob libssl-dev + sudo apt-get -y install python-pyxattr libreadline-dev tar + python-pastedeploy python-simplejson python-sphinx python-webob libssl-dev pkg-config python-dev python-eventlet python-netifaces libaio-dev libibverbs-dev libtool libxml2-dev liblvm2-dev make autoconf automake bison dos2unix flex libfuse-dev diff --git a/doc/developer-guide/Using-Gluster-Test-Framework.md b/doc/developer-guide/Using-Gluster-Test-Framework.md index 5256e973fbc..96fa9247e84 100644 --- a/doc/developer-guide/Using-Gluster-Test-Framework.md +++ b/doc/developer-guide/Using-Gluster-Test-Framework.md @@ -33,7 +33,7 @@ acl lvm2 rpm libaio-dev libibverbs-dev librdmacm-dev libtool libxml2-dev libxml2-utils liblvm2-dev make libssl-dev pkg-config libpython-dev python-eventlet python-netifaces python-simplejson python-pyxattr -libreadline-dev systemtap-sdt-dev tar +libreadline-dev tar 4) Install cmockery2 from github (https://github.com/lpabon/cmockery2) and compile and make install as in Readme @@ -70,7 +70,7 @@ Preparation steps for CentOS 7 (only) librdmacm-devel libtool libxml2-devel lvm2-devel make openssl-devel pkgconfig \ python-devel python-eventlet python-netifaces python-paste-deploy \ python-simplejson python-sphinx python-webob pyxattr readline-devel rpm-build \ - systemtap-sdt-devel tar + tar 3. Create the mock user @@ -91,7 +91,7 @@ Preparation steps for CentOS 6.3+ (only) librdmacm-devel libtool libxml2-devel lvm2-devel make openssl-devel pkgconfig \ python-devel python-eventlet python-netifaces python-paste-deploy \ python-simplejson python-sphinx python-webob pyxattr readline-devel rpm-build \ - systemtap-sdt-devel tar + tar 3. Create the mock user @@ -118,7 +118,7 @@ framework. librdmacm-devel libtool libxml2-devel lvm2-devel make openssl-devel pkgconfig \ python-devel python-eventlet python-netifaces python-paste-deploy \ python-simplejson python-sphinx python-webob pyxattr readline-devel rpm-build \ - systemtap-sdt-devel tar + tar 4. Create the mock user @@ -137,7 +137,7 @@ Preparation steps for Fedora 16-19 (only) librdmacm-devel libtool libxml2-devel lvm2-devel make openssl-devel pkgconfig \ python-devel python-eventlet python-netifaces python-paste-deploy \ python-simplejson python-sphinx python-webob pyxattr readline-devel rpm-build \ - systemtap-sdt-devel tar + tar 3. Create the mock user @@ -267,4 +267,4 @@ bugs subdirectory: ### EXPECT\_KEYWORD -- Defined in include.rc, but seems to be unused?
\ No newline at end of file +- Defined in include.rc, but seems to be unused? diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 109819f3ecf..7a1c867dbe7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -99,9 +99,6 @@ %define _with_tmpfilesdir --without-tmpfilesdir %endif -# there is no systemtap support! Perhaps some day there will be -%global _without_systemtap --enable-systemtap=no - # From https://fedoraproject.org/wiki/Packaging:Python#Macros %if ( 0%{?rhel} && 0%{?rhel} <= 5 ) %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} @@ -220,9 +217,6 @@ BuildRequires: libcmocka-devel >= 1.0.1 %if ( 0%{!?_without_tiering:1} ) BuildRequires: sqlite-devel %endif -%if ( 0%{!?_without_systemtap:1} ) -BuildRequires: systemtap-sdt-devel -%endif %if ( 0%{!?_without_bd:1} ) BuildRequires: lvm2-devel %endif @@ -608,7 +602,6 @@ This package provides the translators needed on any GlusterFS client. %{?_without_qemu_block} \ %{?_without_rdma} \ %{?_without_syslog} \ - %{?_without_systemtap} \ %{?_without_tiering} # fix hardening and remove rpath in shlibs |