[mesos/f20] Continued system integration

Thu Aug 28 13:41:17 UTC 2014

commit 093f3f4fdbcac048384a2b5961e2c7f5c4ba7b1c
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Thu Aug 28 08:38:08 2014 -0500

    Continued system integration

 mesos-0.20-integ.patch |   13 +++++++++++++
 mesos-master-env.sh    |    1 +
 mesos-slave-env.sh     |    8 +++++---
 mesos.spec             |   37 ++++++++++++++++++++++++++++---------
 4 files changed, 47 insertions(+), 12 deletions(-)
---

diff --git a/mesos-0.20-integ.patch b/mesos-0.20-integ.patch
index 65d609c..92bebab 100644
--- a/mesos-0.20-integ.patch
+++ b/mesos-0.20-integ.patch
@@ -118,6 +118,19 @@ index 40b9f6b..047fc04 100644
    mesos_tests_LDFLAGS = $(AM_LDFLAGS)
    mesos_tests_DEPENDENCIES += $(EXAMPLES_JAR)
  
+diff --git a/src/deploy/mesos-daemon.sh.in b/src/deploy/mesos-daemon.sh.in
+index b9866ac..e929738 100644
+--- a/src/deploy/mesos-daemon.sh.in
++++ b/src/deploy/mesos-daemon.sh.in
+@@ -3,7 +3,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ 
+-deploy_dir=@localstatedir@/@PACKAGE@/deploy
++deploy_dir=@sysconfdir@/@PACKAGE@
+ 
+ # Increase the default number of open file descriptors.
+ ulimit -n 8192
 diff --git a/src/examples/java/test-log.in b/src/examples/java/test-log.in
 index 4c8547a..7723e73 100644
 --- a/src/examples/java/test-log.in
diff --git a/mesos-master-env.sh b/mesos-master-env.sh
index e011db1..781c061 100644
--- a/mesos-master-env.sh
+++ b/mesos-master-env.sh
@@ -5,4 +5,5 @@
 
 # Some options you're likely to want to set:
 export MESOS_log_dir=/var/log/mesos
+export MESOS_work_dir=/var/run/mesos
 export MESOS_port=5050
diff --git a/mesos-slave-env.sh b/mesos-slave-env.sh
index cfe170b..120e243 100644
--- a/mesos-slave-env.sh
+++ b/mesos-slave-env.sh
@@ -12,7 +12,9 @@ export MESOS_master=$HOSTNAME:5050
 # Other options you're likely to want to set:
 export MESOS_log_dir=/var/log/mesos
 export MESOS_work_dir=/var/run/mesos
-#export MESOS_isolation='cgroups/cpu,cgroups/mem'
-#export MESOS_cgroups_root='system.slice/mesos-slave.service'
-#export MESOS_hierarchy=/sys/fs/cgroup
+export MESOS_containerizers=docker,mesos
+# https://issues.apache.org/jira/browse/MESOS-1195
+# export MESOS_isolation='cgroups/cpu,cgroups/mem'
+# export MESOS_cgroups_root='system.slice/mesos-slave.service'
+# export MESOS_hierarchy=/sys/fs/cgroup
 
diff --git a/mesos.spec b/mesos.spec
index 64cbdad..334109d 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -2,12 +2,13 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global tag         0.20.0-rc2
 %global skiptests   1
+%global unbundled   1
 %global libevver    4.15
 %global py_version  2.7
 
 Name:          mesos
 Version:       0.20.0
-Release:       1.%{shortcommit}%{?dist}
+Release:       2.%{shortcommit}%{?dist}
 Summary:       Cluster manager for sharing distributed application frameworks
 License:       ASL 2.0
 URL:           http://mesos.apache.org/
@@ -28,6 +29,13 @@ BuildRequires: autoconf
 BuildRequires: java-devel
 BuildRequires: zlib-devel
 BuildRequires: libcurl-devel
+BuildRequires: python-setuptools
+BuildRequires: python2-devel
+BuildRequires: openssl-devel
+BuildRequires: cyrus-sasl-devel
+BuildRequires: systemd
+
+%if %unbundled
 BuildRequires: http-parser-devel
 BuildRequires: boost-devel
 BuildRequires: glog-devel
@@ -37,16 +45,12 @@ BuildRequires: gtest-devel
 BuildRequires: gperftools-devel
 BuildRequires: libev-source
 BuildRequires: leveldb-devel
-BuildRequires: protobuf-devel
-BuildRequires: python-setuptools
 BuildRequires: protobuf-python
 BuildRequires: protobuf-java
-BuildRequires: python2-devel
 BuildRequires: zookeeper-lib-devel
-BuildRequires: openssl-devel
-BuildRequires: cyrus-sasl-devel
-BuildRequires: systemd
+BuildRequires: protobuf-devel
 
+# Typically folks will install their own mvn
 BuildRequires: maven-local
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-gpg-plugin
@@ -56,10 +60,12 @@ BuildRequires: maven-dependency-plugin
 BuildRequires: exec-maven-plugin
 BuildRequires: maven-remote-resources-plugin
 BuildRequires: maven-site-plugin
-BuildRequires: protobuf-python
-BuildRequires: python-boto
 
 Requires: protobuf-python
+%endif
+
+# Explicit call out of installation requirements not found via
+# package dependency tracking.
 Requires: python-boto
 Requires: docker-io
 
@@ -118,6 +124,8 @@ autoreconf -i
 ######################################
 # We need to rebuild libev and bind statically
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1049554 for details
+%if %unbundled
+
 cd libev-%{libevver}
 export CFLAGS="$RPM_OPT_FLAGS -DEV_CHILD_ENABLE=0 -I$PWD"
 export CXXFLAGS="$RPM_OPT_FLAGS -DEV_CHILD_ENABLE=0 -I$PWD"
@@ -129,6 +137,11 @@ export M2_HOME=/usr/share/xmvn
 autoreconf -vfi
 export LDFLAGS="$RPM_LD_FLAGS -L$PWD/libev-%{libevver}/.libs"
 ZOOKEEPER_JAR="/usr/share/java/zookeeper/zookeeper.jar:/usr/share/java/slf4j/api.jar:/usr/share/java/slf4j/log4j12.jar:/usr/share/java/log4j.jar" %configure --disable-bundled --disable-static
+
+%else
+%configure
+%endif
+
 make %{?_smp_mflags}
 
 %check
@@ -150,9 +163,12 @@ make %{?_smp_mflags}
 
 ######################################
 # NOTE: https://issues.apache.org/jira/browse/MESOS-899
+%if %unbundled
 export CFLAGS="$RPM_OPT_FLAGS -DEV_CHILD_ENABLE=0 -I$PWD"
 export CXXFLAGS="$RPM_OPT_FLAGS -DEV_CHILD_ENABLE=0 -I$PWD"
 export LDFLAGS="$RPM_LD_FLAGS -L$PWD/libev-%{libevver}/.libs"
+%endif
+
 export PYTHONPATH=%{buildroot}%{python_sitearch}
 mkdir -p %{buildroot}%{python_sitearch}
 pushd src/python
@@ -260,6 +276,9 @@ exit 0
 /sbin/ldconfig
 
 %changelog
+* Wed Aug 27 2014 Timothy St. Clair <tstclair at redhat.com> - 0.20.0-2.f421ffd
+- Fixes for system integration
+
 * Wed Aug 20 2014 Timothy St. Clair <tstclair at redhat.com> - 0.20.0-1.f421ffd
 - Rebase to new release 0.20
 
