Update from latest testing, still pending on issue before next spin

This commit is contained in:
Timothy St. Clair 2013-12-18 16:03:14 -06:00
commit 0f96ceae6c
4 changed files with 33 additions and 18 deletions

View file

@ -1,4 +1,4 @@
%global commit 515c2c84b3e402c723e46fcc9f2b885ca39a51b0
%global commit 8e4e9a491b9f7d2391b2936aed0c351ffa50e67c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global shortname tachyon
@ -6,7 +6,7 @@ Name: amplab-%{shortname}
# Given the naming conflicts with other packages, and eventually this will
# switch to apache-tachyon should
Version: 0.4.0
Release: 4.SNAPSHOT.%{shortcommit}%{?dist}
Release: 6.SNAPSHOT.%{shortcommit}%{?dist}
Summary: Reliable file sharing at memory speed across cluster frameworks
License: ASL 2.0
URL: https://github.com/amplab/tachyon/wiki
@ -136,6 +136,13 @@ install -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/%{shortname}
mkdir -p -m0755 %{buildroot}/%{_var}/log/%{shortname}
mkdir -p -m0755 %{buildroot}%{_var}/lib/%{shortname}/journal
#######################
# NOTE: The following is plugging into hadoop without
# having administrative steps.
mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
%{__ln_s} %{_jnidir}/%{shortname}.jar %{buildroot}/%{_datadir}/hadoop/common/lib
%{__ln_s} %{_jnidir}/libthrift.jar %{buildroot}/%{_datadir}/hadoop/common/lib
%files -f .mfiles
%doc LICENSE README.md
%dir %{_sysconfdir}/%{shortname}
@ -147,20 +154,22 @@ mkdir -p -m0755 %{buildroot}%{_var}/lib/%{shortname}/journal
%{_libexecdir}/tachyon*
%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{shortname}.conf
%{_unitdir}/*
%attr(0755,tachyon,tachyon) %dir %{_var}/log/%{shortname}
%attr(0755,tachyon,tachyon) %dir %{_var}/lib/%{shortname}/journal
%attr(0755,hdfs,hdfs) %dir %{_var}/log/%{shortname}
%attr(0755,hdfs,hdfs) %dir %{_var}/lib/%{shortname}/journal
%{_datadir}/hadoop/common/lib/%{shortname}.jar
%{_datadir}/hadoop/common/lib/libthrift.jar
%files javadoc -f .mfiles-javadoc
%doc LICENSE
############################################
%pre
getent group tachyon >/dev/null || groupadd -f -r tachyon
if ! getent passwd tachyon >/dev/null ; then
useradd -r -g tachyon -d %{_sharedstatedir}/%{shortname} -s /sbin/nologin \
-c "%{shortname} daemon account" tachyon
fi
exit 0
#%pre
#getent group tachyon >/dev/null || groupadd -f -r tachyon
#if ! getent passwd tachyon >/dev/null ; then
# useradd -r -g tachyon -d %{_sharedstatedir}/%{shortname} -s /sbin/nologin \
# -c "%{shortname} daemon account" tachyon
#fi
#exit 0
%post
%systemd_post %{shortname}-master.service %{shortname}-slave.service
@ -172,6 +181,12 @@ exit 0
%systemd_postun_with_restart %{shortname}-slave.service %{shortname}-master.service
%changelog
* Fri Dec 6 2013 Timothy St. Clair<tstclair@redhat.com> 0.4.0-6.SNAPSHOT.8e4e9a4
- Update to latest modifications
* Wed Nov 20 2013 Timothy St. Clair<tstclair@redhat.com> 0.4.0-5.SNAPSHOT.515c2c8
- Update to exclude arm due to missing dependencies
* Fri Nov 15 2013 Timothy St. Clair<tstclair@redhat.com> 0.4.0-4.SNAPSHOT.515c2c8
- Patches accepted upstream, thus changing source url to be canonical

View file

@ -1 +1 @@
6e1e5fb5413cd9609fbd902d297051df tachyon-0.4.0-515c2c8.tar.gz
c2b675833888f339adb3b2300263f49c tachyon-0.4.0-8e4e9a4.tar.gz

View file

@ -9,8 +9,8 @@ Wants=network.target
Type=forking
ExecStart=/usr/bin/tachyon-start.sh master
ExecStop=/usr/bin/tachyon-killall.sh tachyon.Master
User=tachyon
Group=tachyon
User=hdfs
Group=hdfs
LimitNOFILE=16384
Restart=always
RestartSec=20

View file

@ -5,13 +5,13 @@ After=network.target
Wants=network.target
[Service]
#EnvironmentFile=-/etc/sysconfig/tachyon-slave
#EnvironmentFile=-/etc/sysconfig/tachyon-slave
Type=forking
ExecStart=/usr/bin/tachyon-start.sh worker
ExecStart=/usr/bin/tachyon-start.sh worker NoMount
ExecStop=/usr/bin/tachyon-killall.sh tachyon.Worker
ExecReload=/bin/kill -HUP $MAINPID
User=tachyon
Group=tachyon
User=hdfs
Group=hdfs
LimitNOFILE=16384
Restart=always
RestartSec=20