commit 3368fcbdf5c6df1955455e1d26b4bbd06959875d
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Wed Feb 5 10:44:26 2014 -0600
Update includes fixed for hadoop
amplab-tachyon.spec | 15 ++++++++++-----
tachyon-0.4.0-defaults.patch | 20 ++++++++++++++++++++
tachyon-env.sh | 1 +
3 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 4604c64..974ad08 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -96,8 +96,8 @@ sed -i
"s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|"
p
%pom_add_dep org.apache.hadoop:hadoop-common
%pom_add_dep org.apache.hadoop:hadoop-hdfs
-# This is required to update to the latest thrift.
-./bin/tachyon thriftGen
+# Disabled b/c upstream has updated to 0.9.0
+# ./bin/tachyon thriftGen
%build
@@ -137,6 +137,10 @@ mkdir -p -m0755 %{buildroot}/%{_var}/log/%{shortname}
mkdir -p -m0755 %{buildroot}%{_var}/lib/%{shortname}/journal
#######################
+mkdir -p -m0755 %{buildroot}/%{_datadir}/%{shortname}/web
+cp -rf src/main/java/tachyon/web/resources %{buildroot}/%{_datadir}/%{shortname}/web
+
+#######################
# NOTE: The following is plugging into hadoop without
# having administrative steps.
mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
@@ -158,16 +162,17 @@ mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
%attr(0755,hdfs,hdfs) %dir %{_var}/lib/%{shortname}/journal
%{_datadir}/hadoop/common/lib/%{shortname}.jar
%{_datadir}/hadoop/common/lib/libthrift.jar
+%{_datadir}/%{shortname}
%files javadoc -f .mfiles-javadoc
%doc LICENSE
############################################
-#%pre
+#%%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
+# useradd -r -g tachyon -d %%{_sharedstatedir}/%%{shortname} -s /sbin/nologin \
+# -c "%%{shortname} daemon account" tachyon
#fi
#exit 0
diff --git a/tachyon-0.4.0-defaults.patch b/tachyon-0.4.0-defaults.patch
index eb9197d..45ebb37 100644
--- a/tachyon-0.4.0-defaults.patch
+++ b/tachyon-0.4.0-defaults.patch
@@ -74,3 +74,23 @@ index b3c6974..6e3af0a 100644
UNDERFS_ADDRESS = getProperty("tachyon.underfs.address", TACHYON_HOME +
"/underfs");
UNDERFS_DATA_FOLDER = getProperty("tachyon.data.folder", UNDERFS_ADDRESS +
"/tachyon/data");
UNDERFS_WORKERS_FOLDER =
+diff --git a/src/main/java/tachyon/web/UIWebServer.java
b/src/main/java/tachyon/web/UIWebServer.java
+index 6d31515..b6f2c3b 100644
+--- a/src/main/java/tachyon/web/UIWebServer.java
++++ b/src/main/java/tachyon/web/UIWebServer.java
+@@ -58,7 +58,7 @@ public class UIWebServer {
+ WebAppContext webappcontext = new WebAppContext();
+
+ webappcontext.setContextPath("/");
+- File warPath = new File(CommonConf.get().TACHYON_HOME +
"/src/main/java/tachyon/web/resources");
++ File warPath = new File("/usr/share/tachyon/web/resources");
+ webappcontext.setWar(warPath.getAbsolutePath());
+ HandlerList handlers = new HandlerList();
+ webappcontext.addServlet(
+@@ -90,4 +90,4 @@ public class UIWebServer {
+ public void shutdownWebServer() throws Exception {
+ mServer.stop();
+ }
+-}
+\ No newline at end of file
++}
diff --git a/tachyon-env.sh b/tachyon-env.sh
index eacd5d5..78e7e50 100644
--- a/tachyon-env.sh
+++ b/tachyon-env.sh
@@ -23,6 +23,7 @@ CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}"
)" && pwd )"
export TACHYON_JAVA_OPTS+="
-Dlog4j.configuration=file:$CONF_DIR/log4j.properties
+ -Dhadoop.home.dir=/usr
-Dtachyon.debug=false
-Dtachyon.underfs.address=$TACHYON_UNDERFS_ADDRESS
-Dtachyon.worker.memory.size=$TACHYON_WORKER_MEMORY_SIZE
Show replies by date