From 9bab34db4deeccbe4d91fbdc3b0d7b052e9d82c5 Mon Sep 17 00:00:00 2001
From: Timothy St. Clair <tstclair@redhat.com>
Date: Feb 03 2014 20:48:13 +0000
Subject: Current rawhide WIP


---

diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 99f541a..4604c64 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -1,4 +1,4 @@
-%global commit      7acadf30b652ee835864b47742fd74fed9d50618
+%global commit      520c15109e9651c3cd95a563941ad821c8fb5503
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global shortname   tachyon
 
@@ -9,7 +9,7 @@ Version:       0.4.0
 Release:       7.SNAPSHOT.%{shortcommit}%{?dist}
 Summary:       Reliable file sharing at memory speed across cluster frameworks
 License:       ASL 2.0
-URL:           https://github.com/amplab/tachyon/wiki
+URL:           http://tachyon-project.org/
 Source0:       https://github.com/amplab/tachyon/archive/%{commit}/%{shortname}-%{version}-%{shortcommit}.tar.gz
 Source1:       %{shortname}-tmpfiles.conf
 Source2:       %{shortname}-master.service
@@ -18,6 +18,7 @@ Source4:       %{shortname}-layout.sh
 Source5:       %{shortname}-env.sh
 
 Patch0:        tachyon-0.4.0-SNAPSHOT-log4props.patch
+Patch1:        tachyon-0.4.0-defaults.patch
 
 BuildRequires: java-devel
 BuildRequires: mvn(commons-io:commons-io)
@@ -78,6 +79,7 @@ find -name '*.class' -print -delete
 find -name '*.jar' -print -delete
 
 %patch0 -p1
+%patch1 -p1
 
 sed -i "s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|" pom.xml
 
@@ -179,7 +181,7 @@ mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
 %systemd_postun_with_restart %{shortname}-slave.service %{shortname}-master.service
 
 %changelog
-* Tue Jan 28 2014 Timothy St. Clair<tstclair@redhat.com> 0.4.0-7.SNAPSHOT.7acadf3
+* Tue Jan 28 2014 Timothy St. Clair<tstclair@redhat.com> 0.4.0-7.SNAPSHOT.520c151
 - Update to latest
 
 * Fri Dec 6 2013 Timothy St. Clair<tstclair@redhat.com> 0.4.0-6.SNAPSHOT.8e4e9a4
diff --git a/sources b/sources
index 65ce86b..cc5539b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-542331bf300a64798a3106342e13f4ed  tachyon-0.4.0-7acadf3.tar.gz
+02bb0a1ea465b20e6b04cfd8843a681e  tachyon-0.4.0-520c151.tar.gz
diff --git a/tachyon-0.4.0-defaults.patch b/tachyon-0.4.0-defaults.patch
new file mode 100644
index 0000000..eb9197d
--- /dev/null
+++ b/tachyon-0.4.0-defaults.patch
@@ -0,0 +1,76 @@
+diff --git a/bin/tachyon b/bin/tachyon
+index d795ed0..7d1ce67 100755
+--- a/bin/tachyon
++++ b/bin/tachyon
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+ function printUsage {
+-  echo "Usage: tachyon COMMAND "
++  echo "Usage: tachyon.sh COMMAND "
+   echo "where COMMAND is one of:"
+   echo -e "  format        \t Format Tachyon"
+   echo -e "  tfs           \t Command line input for generic filesystem user client."
+@@ -30,7 +30,7 @@ TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
+ . $TACHYON_LIBEXEC_DIR/tachyon-config.sh
+ 
+ function runTest {
+-  Usage="Usage: tachyon runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
++  Usage="Usage: tachyon.sh runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
+ 
+   if [ "$#" -ne 2 ]; then
+     echo $Usage
+@@ -43,15 +43,15 @@ function runTest {
+   fi
+ 
+   if [[ "$1" == "Basic" ]]; then
+-    $bin/tachyon tfs rm /Basic_File_$2
++    $bin/tachyon.sh tfs rm /Basic_File_$2
+     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR tachyon.examples.BasicOperations $MASTER_ADDRESS:19998 /BasicFile_$2 $2
+     exit 0
+   elif [[ "$1" == "BasicRawTable" ]]; then
+-    $bin/tachyon tfs rm /Basic_Raw_Table_$2
++    $bin/tachyon.sh tfs rm /Basic_Raw_Table_$2
+     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR tachyon.examples.BasicRawTableOperations $MASTER_ADDRESS:19998 /BasicRawTable_$2 $2
+     exit 0
+   elif [[ "$1" == "BasicCheckpoint" ]]; then
+-    $bin/tachyon tfs rm /BasicCheckpoint
++    $bin/tachyon.sh tfs rm /BasicCheckpoint
+     $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR tachyon.examples.BasicCheckpoint $MASTER_ADDRESS:19998 /BasicCheckpoint 10
+     exit 0
+   fi
+@@ -116,10 +116,10 @@ elif [ "$COMMAND" == "runTests" ]; then
+ 
+   for op in ${opArr[@]}
+   do
+-    echo $bin/tachyon runTest Basic $op
+-    $bin/tachyon runTest Basic $op
+-    echo $bin/tachyon runTest BasicRawTable $op
+-    $bin/tachyon runTest BasicRawTable $op
++    echo $bin/tachyon.sh runTest Basic $op
++    $bin/tachyon.sh runTest Basic $op
++    echo $bin/tachyon.sh runTest BasicRawTable $op
++    $bin/tachyon.sh runTest BasicRawTable $op
+   done
+ 
+   exit 0
+diff --git a/src/main/java/tachyon/conf/CommonConf.java b/src/main/java/tachyon/conf/CommonConf.java
+index b3c6974..6e3af0a 100644
+--- a/src/main/java/tachyon/conf/CommonConf.java
++++ b/src/main/java/tachyon/conf/CommonConf.java
+@@ -42,14 +42,7 @@ public class CommonConf extends Utils {
+   public final boolean ASYNC_ENABLED;
+ 
+   private CommonConf() {
+-    if (System.getProperty("tachyon.home") == null) {
+-      LOG.warn("tachyon.home is not set. Using /mnt/tachyon_default_home as the default value.");
+-      File file = new File("/mnt/tachyon_default_home");
+-      if (!file.exists()) {
+-        file.mkdirs();
+-      }
+-    }
+-    TACHYON_HOME = getProperty("tachyon.home", "/mnt/tachyon_default_home");
++    TACHYON_HOME = getProperty("tachyon.home", "/var/lib/tachyon");
+     UNDERFS_ADDRESS = getProperty("tachyon.underfs.address", TACHYON_HOME + "/underfs");
+     UNDERFS_DATA_FOLDER = getProperty("tachyon.data.folder", UNDERFS_ADDRESS + "/tachyon/data");
+     UNDERFS_WORKERS_FOLDER =