tstclair pushed to mesos (f21). "Merge branch 'f21'"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Mar 30 18:29:25 UTC 2015
>From ffe83c394d866158324cd38e47fdc3197fd52dcb Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Wed, 1 Oct 2014 11:10:56 -0500
Subject: WIP update for complete systemd and sysconfig integration
diff --git a/mesos-master b/mesos-master
new file mode 100644
index 0000000..a40ec32
--- /dev/null
+++ b/mesos-master
@@ -0,0 +1,12 @@
+# This file contains environment variables that are passed to mesos-master.
+# To get a description of all options run mesos-master --help; any option
+# supported as a command-line option is also supported as an environment
+# variable.
+
+# Some options you're likely to want to set:
+MESOS_log_dir=/var/log/mesos
+MESOS_work_dir=/var/run/mesos
+MESOS_port=5050
+
+# For isolated sandbox testing
+#MESOS_ip=127.0.0.1
diff --git a/mesos-master-env.sh b/mesos-master-env.sh
deleted file mode 100644
index 211db5d..0000000
--- a/mesos-master-env.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file contains environment variables that are passed to mesos-master.
-# To get a description of all options run mesos-master --help; any option
-# supported as a command-line option is also supported as an environment
-# variable.
-
-# 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
-
-# For isolated sandbox testing
-#export MESOS_ip=127.0.0.1
diff --git a/mesos-master.service b/mesos-master.service
index f6be194..5434bc1 100644
--- a/mesos-master.service
+++ b/mesos-master.service
@@ -5,8 +5,8 @@ After=network.target
Wants=network.target
[Service]
-Type=forking
-ExecStart=/usr/sbin/mesos-daemon.sh mesos-master
+EnvironmentFile=/etc/sysconfig/mesos-master
+ExecStart=/usr/sbin/mesos-master $MESOS_MASTER_OPTS
ExecStop=/usr/bin/killall -s 15 mesos-master
ExecReload=/bin/kill -HUP $MAINPID
User=root
diff --git a/mesos-slave b/mesos-slave
new file mode 100644
index 0000000..096e94e
--- /dev/null
+++ b/mesos-slave
@@ -0,0 +1,21 @@
+# This file contains environment variables that are passed to mesos-slave.
+# To get a description of all options run mesos-slave --help; any option
+# supported as a command-line option is also supported as an environment
+# variable.
+
+# The mesos master URL to contact. Should be host:port for
+# non-ZooKeeper based masters, otherwise a zk:// or file:// URL.
+MESOS_master=$HOSTNAME:5050
+
+# For isolated sandbox testing
+#MESOS_master=127.0.0.1:5050
+
+# For a complete listing of options execute 'mesos-slave --help'
+MESOS_log_dir=/var/log/mesos
+MESOS_work_dir=/var/run/mesos
+MESOS_containerizers=docker,mesos
+
+# systemd cgroup integration
+MESOS_isolation='cgroups/cpu,cgroups/mem'
+MESOS_cgroups_root='system.slice/mesos-slave.service'
+MESOS_cgroups_hierarchy=/sys/fs/cgroup
diff --git a/mesos-slave-env.sh b/mesos-slave-env.sh
deleted file mode 100644
index 02284e0..0000000
--- a/mesos-slave-env.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file contains environment variables that are passed to mesos-slave.
-# To get a description of all options run mesos-slave --help; any option
-# supported as a command-line option is also supported as an environment
-# variable.
-
-# You must at least set MESOS_master.
-
-# The mesos master URL to contact. Should be host:port for
-# non-ZooKeeper based masters, otherwise a zk:// or file:// URL.
-export MESOS_master=$HOSTNAME:5050
-
-# For isolated sandbox testing
-#export MESOS_master=127.0.0.1:5050
-
-# For a complete listing of options execute 'mesos-slave --help'
-export MESOS_log_dir=/var/log/mesos
-export MESOS_work_dir=/var/run/mesos
-export MESOS_containerizers=docker,mesos
-
-# systemd cgroup integration
-export MESOS_isolation='cgroups/cpu,cgroups/mem'
-export MESOS_cgroups_root='system.slice/mesos-slave.service'
-export MESOS_cgroups_hierarchy=/sys/fs/cgroup
-
diff --git a/mesos-slave.service b/mesos-slave.service
index e2b7513..2df6bd2 100644
--- a/mesos-slave.service
+++ b/mesos-slave.service
@@ -5,8 +5,8 @@ After=network.target
Wants=network.target
[Service]
-Type=forking
-ExecStart=/usr/sbin/mesos-daemon.sh mesos-slave
+EnvironmentFile=/etc/sysconfig/mesos-slave
+ExecStart=/usr/sbin/mesos-slave $MESOS_SLAVE_OPTS
ExecStop=/usr/bin/killall -s 15 mesos-slave
ExecReload=/bin/kill -HUP $MAINPID
#######################################
diff --git a/mesos.spec b/mesos.spec
index 985ba23..f6fd85d 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -17,7 +17,7 @@
Name: mesos
Version: 0.21.0
-Release: 1.SNAPSHOT.%{shortcommit}%{?dist}
+Release: 2.SNAPSHOT.%{shortcommit}%{?dist}
Summary: Cluster manager for sharing distributed application frameworks
License: ASL 2.0
URL: http://mesos.apache.org/
@@ -26,8 +26,8 @@ Source0: https://github.com/apache/mesos/archive/%{commit}/%{name}-%{versi
Source1: %{name}-tmpfiles.conf
Source2: %{name}-master.service
Source3: %{name}-slave.service
-Source4: %{name}-master-env.sh
-Source5: %{name}-slave-env.sh
+Source4: %{name}-master
+Source5: %{name}-slave
####################################
Patch0: mesos-0.21-integ.patch
@@ -158,7 +158,8 @@ autoreconf -vfi
%configure --disable-static
%endif
-make %{?_smp_mflags}
+make
+#%{?_smp_mflags}
%check
######################################
@@ -219,15 +220,20 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig
+install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig
+
+# NOTE: The following removes the deployment scripts and tooling.
+# It's still debatable if we should use it.
+rm -rf %{buildroot}%{_sysconfdir}/%{name}
+rm -f %{buildroot}%{_sbindir}/mesos-*.sh
mkdir -p -m0755 %{buildroot}/%{_var}/log/%{name}
mkdir -p -m0755 %{buildroot}/%{_var}/lib/%{name}
mkdir -p %{buildroot}%{_unitdir}
install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/
-
######################
# install java bindings
######################
@@ -242,13 +248,12 @@ install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/
%{_sbindir}/mesos-*
%{_datadir}/%{name}/
%{_libexecdir}/%{name}/
-#system integration aspects
-%{_sysconfdir}/%{name}/*.template
+#system integration files
%{python_sitelib}/%{name}/
%attr(0755,mesos,mesos) %{_var}/log/%{name}/
%attr(0755,mesos,mesos) %{_var}/lib/%{name}/
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/*env.sh
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}*
%{_unitdir}/%{name}*.service
######################
@@ -297,9 +302,12 @@ exit 0
/sbin/ldconfig
%changelog
+* Tue Sep 30 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-2.SNAPSHOT.3133734
+- Removing scripts and updating systemd settings.
+
* Tue Sep 23 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-1.SNAPSHOT.3133734
-- Initial prototyping
-
+- Initial prototyping
+
* Wed Aug 27 2014 Timothy St. Clair <tstclair at redhat.com> - 0.20.0-2.f421ffd
- Fixes for system integration
--
cgit v0.10.2
>From c3e3cc40adcbcb8c227cb5e67fd5ba618a96c1a9 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Thu, 9 Oct 2014 10:59:52 -0500
Subject: Temporary work in progress update to track the lastest modifications.
The source is not in the look-aside buffer yet as I'm waiting on a release.
Thus if you want to rebuild run:
spectool -g mesos.spec
to obtain the sources.
diff --git a/mesos.spec b/mesos.spec
index f6fd85d..0cee526 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -1,4 +1,4 @@
-%global commit 31337348cef29719890bffb59fbf8df8b18b39d0
+%global commit c96ba8f6035329acebb25ca0f52215284bbf8f8f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global tag 0.21.0
%global skiptests 1
@@ -17,7 +17,7 @@
Name: mesos
Version: 0.21.0
-Release: 2.SNAPSHOT.%{shortcommit}%{?dist}
+Release: 3.SNAPSHOT.%{shortcommit}%{?dist}
Summary: Cluster manager for sharing distributed application frameworks
License: ASL 2.0
URL: http://mesos.apache.org/
@@ -71,9 +71,13 @@ BuildRequires: protobuf-java
BuildRequires: zookeeper-lib-devel
BuildRequires: protobuf-devel
BuildRequires: picojson-devel
+BuildRequires: python-pip
+BuildRequires: python-wheel
Requires: protobuf-python
Requires: python-boto
+Requires: python-pip
+Requires: python-wheel
%endif
%ifarch x86_64
@@ -122,7 +126,7 @@ The python-%{name} package contains Python bindings for %{name}.
%prep
%setup -q -n %{name}-%{commit}
-%patch0 -p1
+%patch0 -p1 -F2
%if %unbundled
# remove all bundled elements prior to build
@@ -209,6 +213,7 @@ popd
# fedora guidelines no .a|.la
rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/libexamplemodule*
# Move the inclusions under mesos folder for developers
mv -f %{buildroot}%{_includedir}/stout %{buildroot}%{_includedir}/%{name}
@@ -302,6 +307,9 @@ exit 0
/sbin/ldconfig
%changelog
+* Thu Oct 9 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-3.SNAPSHOT.c96ba8f6
+- Update and shifting configs to latest.
+
* Tue Sep 30 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-2.SNAPSHOT.3133734
- Removing scripts and updating systemd settings.
diff --git a/sources b/sources
index 35ace3b..5f184a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ee469f51b1b971d7fb3120ddbffc1f69 mesos-0.21.0-3133734.tar.gz
+bb48e15e96befc627f3b17244eebe517 mesos-0.21.0-c96ba8f.tar.gz
--
cgit v0.10.2
>From 2d24786757a1450cdecd1b664e9e8bba0b0ad6f3 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Thu, 23 Oct 2014 13:49:37 -0500
Subject: re-enable arm
diff --git a/mesos.spec b/mesos.spec
index d0e2236..dc56fbd 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -32,9 +32,6 @@ Source5: %{name}-slave
####################################
Patch0: mesos-0.21-integ.patch
-# Transitive from zookeeper.
-ExcludeArch: %{arm}
-
BuildRequires: libtool
BuildRequires: automake
BuildRequires: autoconf
--
cgit v0.10.2
>From 3e7c6dbb13a722154325efee93faec53dd1e1714 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair at redhat.com>
Date: Thu, 23 Oct 2014 14:43:21 -0500
Subject: update to include examples
diff --git a/mesos.spec b/mesos.spec
index 0cee526..6e6bb42 100644
--- a/mesos.spec
+++ b/mesos.spec
@@ -1,4 +1,4 @@
-%global commit c96ba8f6035329acebb25ca0f52215284bbf8f8f
+%global commit e960cdffec20d54b4f57f552d13cd92004f8e437
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global tag 0.21.0
%global skiptests 1
@@ -17,7 +17,7 @@
Name: mesos
Version: 0.21.0
-Release: 3.SNAPSHOT.%{shortcommit}%{?dist}
+Release: 4.SNAPSHOT.%{shortcommit}%{?dist}
Summary: Cluster manager for sharing distributed application frameworks
License: ASL 2.0
URL: http://mesos.apache.org/
@@ -63,12 +63,15 @@ BuildRequires: glog-devel
BuildRequires: gmock-devel
BuildRequires: gflags-devel
BuildRequires: gtest-devel
+%ifnarch s390 s390x
BuildRequires: gperftools-devel
+%endif
BuildRequires: libev-source
BuildRequires: leveldb-devel
BuildRequires: protobuf-python
BuildRequires: protobuf-java
-BuildRequires: zookeeper-lib-devel
+BuildRequires: zookeeper-devel
+#BuildRequires: zookeeper-lib-devel
BuildRequires: protobuf-devel
BuildRequires: picojson-devel
BuildRequires: python-pip
@@ -88,6 +91,10 @@ Requires: docker
%endif
%endif
+# The slaves will indirectly require time syncing with the master
+# nodes so just call out the dependency.
+Requires: ntp
+
%description
Apache Mesos is a cluster manager that provides efficient resource
isolation and sharing across distributed applications, or frameworks.
@@ -142,6 +149,8 @@ autoreconf -i
%endif
%build
+
+echo "CXXFLAGS=$CXXFLAGS"
######################################
# We need to rebuild libev and bind statically
# See https://bugzilla.redhat.com/show_bug.cgi?id=1049554 for details
@@ -196,8 +205,8 @@ pushd src/python
python setup.py install --root=%{buildroot} --prefix=/usr
popd
-mkdir -p %{buildroot}%{python_sitelib}
-mv %{buildroot}%{_libexecdir}/%{name}/python/%{name} %{buildroot}%{python_sitelib}
+mkdir -p %{buildroot}%{python_sitelib}
+cp -rf %{buildroot}%{_libexecdir}/%{name}/python/%{name}/* %{buildroot}%{python_sitelib}
rm -rf %{buildroot}%{_libexecdir}/%{name}/python
pushd src/python/native
@@ -245,6 +254,13 @@ install -m 0644 %{SOURCE2} %{SOURCE3} %{buildroot}%{_unitdir}/
%mvn_artifact src/java/%{name}.pom src/java/target/%{name}-%{version}.jar
%mvn_install
+######################
+# install the examples
+######################
+make clean
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -rf src/examples %{buildroot}%{_datadir}/%{name}
+
############################################
%files
%doc LICENSE NOTICE
@@ -307,6 +323,9 @@ exit 0
/sbin/ldconfig
%changelog
+* Thu Oct 23 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-4.SNAPSHOT.e960cdf
+- Update to include examples
+
* Thu Oct 9 2014 Timothy St. Clair <tstclair at redhat.com> - 0.21.0-3.SNAPSHOT.c96ba8f6
- Update and shifting configs to latest.
diff --git a/sources b/sources
index 5f184a9..1c2e88b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb48e15e96befc627f3b17244eebe517 mesos-0.21.0-c96ba8f.tar.gz
+7828d770a1c24187f70b431933ecf698 mesos-0.21.0-e960cdf.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/mesos.git/commit/?h=f21&id=a075856815763d85f7e98eee6054cc58fb26540c
More information about the scm-commits
mailing list