Merge pull request #1 from TachyonNexus/package

[RENAME] renaming tachyon package to alluxio

.gitignore

@@ -1,4 +1,4 @@
-**/tachyon-site.properties
+**/alluxio-site.properties
 *.iml
 *.pyc
 *.swo
@@ -13,8 +13,8 @@
 .metadata/
 .project
 .settings/
-/conf/tachyon-env.sh
-/conf/tachyon-env.sh.bootstrap.bk
+/conf/alluxio-env.sh
+/conf/alluxio-env.sh.bootstrap.bk
 /data/
 /deploy/vagrant/.request_ids
 /deploy/vagrant/.vagrant/
@@ -25,7 +25,7 @@
 /deploy/vagrant/spot/roles/create_ec2/vars/
 /deploy/vagrant/spot/roles/tag_ec2/vars/
 /deploy/vagrant/vbox/.vagrant/
-/deploy/vagrant/vbox/tachyon-dev.box
+/deploy/vagrant/vbox/alluxio-dev.box
 /docs/_site/
 /docs/api/
 /docs/serve/

assembly/pom.xml

@@ -155,7 +155,7 @@
           <skipAssembly>false</skipAssembly>
           <appendAssemblyId>false</appendAssemblyId>
           <attach>false</attach>
-          <finalName>tachyon-${project.version}</finalName>
+          <finalName>alluxio-${project.version}</finalName>
           <descriptors>
             <descriptor>src/main/assembly/tachyon-dist.xml</descriptor>
           </descriptors>

assembly/src/main/assembly/tachyon-dist.xml

@@ -1,5 +1,5 @@
 <assembly>
-  <id>tachyon-dist</id>
+  <id>alluxio-dist</id>
   <formats>
     <format>tar.gz</format>
     <format>dir</format>
@@ -49,7 +49,7 @@
       <directory>${basedir}/..</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
-        <include>**/tachyon-*-jar-with-dependencies.jar</include>
+        <include>**/alluxio-*-jar-with-dependencies.jar</include>
       </includes>
     </fileSet>
     <fileSet>

bin/tachyon → bin/alluxio

@@ -8,7 +8,7 @@ fi
 BIN=$(cd "$( dirname "$0" )"; pwd)
 
 function printUsage {
-  echo "Usage: tachyon COMMAND "
+  echo "Usage: alluxio COMMAND "
   echo "where COMMAND is one of:"
   echo -e "  format [-s]   \t Format Tachyon (if -s specified, only format if underfs is local and doesn't already exist)"
   echo -e "  formatWorker  \t Format Tachyon worker storage"
@@ -19,7 +19,7 @@ function printUsage {
   echo -e "  runTest       \t Run a end-to-end test on a Tachyon cluster."
   echo -e "  runKVTest     \t Run a test of key-value store operations."
   echo -e "  runTests      \t Run all end-to-end tests on a Tachyon cluster."
-  echo -e "  runJournalCrashTest\t Test the Master Journal System in a crash scenario. Try 'tachyon runJournalCrashTest -help' for more help."
+  echo -e "  runJournalCrashTest\t Test the Master Journal System in a crash scenario. Try 'alluxio runJournalCrashTest -help' for more help."
   echo -e "                  \t NOTE: This command will stop the existing server and creates a new one!"
   echo -e "  readJournal   \t Read a Tachyon journal file from stdin and write a human-readable version of it to stdout."
   echo -e "  killAll <WORD>\t Kill processes containing the WORD."
@@ -47,7 +47,7 @@ function bootstrapConf {
   fi
 
   TACHYON_CONF_DIR=${BIN}/../conf
-  if [[ ! -e "${TACHYON_CONF_DIR}/tachyon-env.sh" ]]; then
+  if [[ ! -e "${TACHYON_CONF_DIR}/alluxio-env.sh" ]]; then
     if [[ `uname -a` == Darwin* ]]; then
       # osx sed wants an argument to -i, use .bootstrap.bk
       TACHYON_SED="sed -i .bootstrap.bk"
@@ -61,24 +61,24 @@ function bootstrapConf {
     fi
 
     # Create a default config that can be overridden later
-    cp ${TACHYON_CONF_DIR}/tachyon-env.sh.template ${TACHYON_CONF_DIR}/tachyon-env.sh
-    ${TACHYON_SED} "s/TACHYON_MASTER_ADDRESS=localhost/TACHYON_MASTER_ADDRESS=$1/" ${TACHYON_CONF_DIR}/tachyon-env.sh
-    ${TACHYON_SED} "s/TACHYON_WORKER_MEMORY_SIZE=1GB/TACHYON_WORKER_MEMORY_SIZE=${TOTAL_MEM}KB/" ${TACHYON_CONF_DIR}/tachyon-env.sh
+    cp ${TACHYON_CONF_DIR}/alluxio-env.sh.template ${TACHYON_CONF_DIR}/alluxio-env.sh
+    ${TACHYON_SED} "s/TACHYON_MASTER_ADDRESS=localhost/TACHYON_MASTER_ADDRESS=$1/" ${TACHYON_CONF_DIR}/alluxio-env.sh
+    ${TACHYON_SED} "s/TACHYON_WORKER_MEMORY_SIZE=1GB/TACHYON_WORKER_MEMORY_SIZE=${TOTAL_MEM}KB/" ${TACHYON_CONF_DIR}/alluxio-env.sh
   fi
 }
 
-# bootstrap creates tachyon-env.sh
+# bootstrap creates alluxio-env.sh
 if [[ "${COMMAND}" == "bootstrap-conf" ]]; then
   bootstrapConf "$@"
   exit 0
 fi
 
 DEFAULT_LIBEXEC_DIR="${BIN}"/../libexec
 TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
-. ${TACHYON_LIBEXEC_DIR}/tachyon-config.sh
+. ${TACHYON_LIBEXEC_DIR}/alluxio-config.sh
 
 function runTest {
-  Usage="Usage: tachyon runTest <Basic|BasicNonByteBuffer> <CACHE_PROMOTE|CACHE|NO_CACHE> <MUST_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
+  Usage="Usage: alluxio runTest <Basic|BasicNonByteBuffer> <CACHE_PROMOTE|CACHE|NO_CACHE> <MUST_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
 
   if [[ $# -ne 3 ]]; then
     echo ${Usage}
@@ -95,19 +95,19 @@ function runTest {
   case "$1" in
     Basic)
       file+="/BasicFile_$2_$3"
-      class="tachyon.examples.BasicOperations"
+      class="alluxio.examples.BasicOperations"
       ;;
     BasicNonByteBuffer)
       file+="/BasicNonByteBuffer_$2_$3"
-      class="tachyon.examples.BasicNonByteBufferOperations"
+      class="alluxio.examples.BasicNonByteBufferOperations"
       ;;
     *)
       echo "Unknown test: $1 with type $2 $3" 1>&2
       echo "${Usage}"
       exit 1
       ;;
   esac
-  ${LAUNCHER} ${BIN}/tachyon tfs rmr ${file}
+  ${LAUNCHER} ${BIN}/alluxio tfs rmr ${file}
   ${JAVA} -cp ${CLASSPATH} ${TACHYON_JAVA_OPTS} ${class} tachyon://${MASTER_ADDRESS}:19998 ${file} $2 $3
 
   # If test process received a signal abort early
@@ -134,7 +134,7 @@ function runClass {
   local class="$1"
   shift
 
-  ${JAVA} -cp ${CLASSPATH} -Dtachyon.home=${TACHYON_HOME} -Dtachyon.master.hostname=${MASTER_ADDRESS} ${TACHYON_JAVA_OPTS} ${class} $@
+  ${JAVA} -cp ${CLASSPATH} -Dalluxio.home=${TACHYON_HOME} -Dalluxio.master.hostname=${MASTER_ADDRESS} ${TACHYON_JAVA_OPTS} ${class} $@
   RET=$?
 
   # If test process received a signal abort early
@@ -147,24 +147,24 @@ function runClass {
 }
 
 function runJournalCrashTest {
-  runClass tachyon.examples.JournalCrashTest $@
+  runClass alluxio.examples.JournalCrashTest $@
 }
 
 function readJournal {
-  local class="tachyon.master.journal.JournalTool"
+  local class="alluxio.master.journal.JournalTool"
 
-  ${JAVA} -cp ${CLASSPATH} -Dtachyon.home=${TACHYON_HOME} -Dtachyon.master.hostname=${MASTER_ADDRESS} -Dtachyon.logs.dir=${TACHYON_LOGS_DIR} -Dtachyon.logger.type=USER_LOGGER ${TACHYON_JAVA_OPTS} ${class} $@
+  ${JAVA} -cp ${CLASSPATH} -Dalluxio.home=${TACHYON_HOME} -Dalluxio.master.hostname=${MASTER_ADDRESS} -Dalluxio.logs.dir=${TACHYON_LOGS_DIR} -Dalluxio.logger.type=USER_LOGGER ${TACHYON_JAVA_OPTS} ${class} $@
   RET=$?
   return ${RET}
 }
 
 function runKVTest {
-  runClass tachyon.examples.keyvalue.KeyValueStoreOperations /default_tests_files/KeyValueStoreOperations
+  runClass alluxio.examples.keyvalue.KeyValueStoreOperations /default_tests_files/KeyValueStoreOperations
 }
 
 function killAll {
   if [[ $# -ne 1 ]]; then
-    echo "Usage: tachyon killAll <WORD>"
+    echo "Usage: alluxio killAll <WORD>"
     exit
   fi
 
@@ -191,7 +191,7 @@ function killAll {
 
 function copyDir {
   if [[ $# -ne 1 ]] ; then
-    echo "Usage: tachyon copyDir <path>"
+    echo "Usage: alluxio copyDir <path>"
     exit 1
   fi
 
@@ -244,22 +244,22 @@ case ${COMMAND} in
     TACHYON_MASTER_ADDRESS=localhost
   fi
 
-  ${LAUNCHER} ${BIN}/tachyon-workers.sh ${BIN}/tachyon formatWorker
+  ${LAUNCHER} ${BIN}/alluxio-workers.sh ${BIN}/alluxio formatWorker
 
   echo "Formatting Tachyon Master @ ${TACHYON_MASTER_ADDRESS}"
-  CLASS=tachyon.Format
+  CLASS=alluxio.Format
   PARAMETER=master
 ;;
 "formatWorker")
   echo "Formatting Tachyon Worker @ `hostname -f`"
-  CLASS=tachyon.Format
+  CLASS=alluxio.Format
   PARAMETER=worker
 ;;
 "tfs")
-  CLASS=tachyon.shell.TfsShell
+  CLASS=alluxio.shell.TfsShell
 ;;
 "loadufs")
-  CLASS=tachyon.client.UfsUtils
+  CLASS=alluxio.client.UfsUtils
 ;;
 "runClass")
   runClass $@
@@ -281,8 +281,8 @@ case ${COMMAND} in
   for readType in ${readTypes[@]}; do
     for writeType in ${writeTypes[@]}; do
       for example in Basic BasicNonByteBuffer; do
-        echo ${LAUNCHER} ${BIN}/tachyon runTest ${example} ${readType} ${writeType}
-        ${LAUNCHER} ${BIN}/tachyon runTest ${example} ${readType} ${writeType}
+        echo ${LAUNCHER} ${BIN}/alluxio runTest ${example} ${readType} ${writeType}
+        ${LAUNCHER} ${BIN}/alluxio runTest ${example} ${readType} ${writeType}
         st=$?
 
         # If test process received a signal abort early
@@ -321,15 +321,15 @@ case ${COMMAND} in
 "thriftGen")
   declare -a thriftSrcPaths=("${BIN}/../core/common/src" "${BIN}/../keyvalue/common/src")
   for thriftSrcPath in ${thriftSrcPaths[@]}; do
-    rm -rf "${thriftSrcPath}/main/java/tachyon/thrift"
+    rm -rf "${thriftSrcPath}/main/java/alluxio/thrift"
     for srcFile in $(ls "${thriftSrcPath}/thrift"); do
       thrift -I "${BIN}/../core/common/src/thrift" --gen java:private-members -out "${thriftSrcPath}/main/java/." "${thriftSrcPath}/thrift/${srcFile}"
     done
   done
   exit 0
 ;;
 "protoGen")
-  rm -rf ${BIN}/../core/server/src/main/java/tachyon/proto
+  rm -rf ${BIN}/../core/server/src/main/java/alluxio/proto
   for src_file in $(find ${BIN}/../core/server/src/proto -type f); do
     protoc --java_out=${BIN}/../core/server/src/main/java --proto_path=`dirname ${src_file}` ${src_file}
   done
@@ -340,15 +340,15 @@ case ${COMMAND} in
   exit 0
 ;;
 "version")
-  CLASS=tachyon.Version
+  CLASS=alluxio.Version
 ;;
 "validateConf")
-  CLASS=tachyon.ValidateConf
+  CLASS=alluxio.ValidateConf
 ;;
 *)
   printUsage
   exit 1
 ;;
 esac
 
-${JAVA} -cp ${CLASSPATH} -Dtachyon.home=${TACHYON_HOME} -Dtachyon.logs.dir=${TACHYON_LOGS_DIR} -Dtachyon.master.hostname=${TACHYON_MASTER_ADDRESS} -Dtachyon.logger.type=USER_LOGGER ${TACHYON_JAVA_OPTS} ${CLASS} ${PARAMETER} $@
+${JAVA} -cp ${CLASSPATH} -Dalluxio.home=${TACHYON_HOME} -Dalluxio.logs.dir=${TACHYON_LOGS_DIR} -Dalluxio.master.hostname=${TACHYON_MASTER_ADDRESS} -Dalluxio.logger.type=USER_LOGGER ${TACHYON_JAVA_OPTS} ${CLASS} ${PARAMETER} $@

bin/tachyon-fuse.sh → bin/alluxio-fuse.sh

@@ -12,7 +12,7 @@ fi
 get_env () {
   DEFAULT_LIBEXEC_DIR="${BIN}"/../libexec
   TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
-  . $TACHYON_LIBEXEC_DIR/tachyon-config.sh
+  . $TACHYON_LIBEXEC_DIR/alluxio-config.sh
 
   TACHYON_MASTER_PORT=${TACHYON_MASTER_PORT:-19998}
   TACHYON_FUSE_JAR=${BIN}/../integration/fuse/target/tachyon-integration-fuse-${VERSION}-jar-with-dependencies.jar
@@ -22,7 +22,7 @@ get_env () {
 check_java_version () {
   local java_mjr_vers=$(${JAVA} -version 2>&1 | awk -F '"' '/version/ {print $2}' | awk -F'.' '{print $1 $2}')
   if [[ ${java_mjr_vers} -lt 18 ]]; then
-    echo "It seems you are running a version of Java which is older then Java8. Please, use Java 8 to use tachyon-fuse" >&2
+    echo "It seems you are running a version of Java which is older then Java8. Please, use Java 8 to use alluxio-fuse" >&2
     return 1
   else
     return 0
@@ -31,7 +31,7 @@ check_java_version () {
 
 check_tfuse_jar () {
   if ! [[ -f ${TACHYON_FUSE_JAR} ]]; then
-    echo "Cannot find ${TACHYON_FUSE_JAR}. Was tachyon compiled with java8 or more recent?"
+    echo "Cannot find ${TACHYON_FUSE_JAR}. Was alluxio compiled with java8 or more recent?"
     return 1
   else
     return 0
@@ -46,44 +46,44 @@ set_java_opt () {
   "
 
   TACHYON_FUSE_OPTS+="
-    -Dtachyon.logger.type=tachyon.fuse
-    -Dtachyon.master.port=${TACHYON_MASTER_PORT}
-    -Dtachyon.master.hostname=${TACHYON_MASTER_ADDRESS}
-    -Dtachyon.logs.dir=$TACHYON_LOGS_DIR
-    -Dtachyon.logger.type="FUSE_LOGGER"
+    -Dalluxio.logger.type=alluxio.fuse
+    -Dalluxio.master.port=${TACHYON_MASTER_PORT}
+    -Dalluxio.master.hostname=${TACHYON_MASTER_ADDRESS}
+    -Dalluxio.logs.dir=$TACHYON_LOGS_DIR
+    -Dalluxio.logger.type="FUSE_LOGGER"
     -Dlog4j.configuration=file:$TACHYON_CONF_DIR/log4j.properties
   "
 }
 
 mount_fuse() {
   if fuse_stat > /dev/null ; then
-    echo "tachyon-fuse is already running on the local host. Please, stop it first." >&2
+    echo "alluxio-fuse is already running on the local host. Please, stop it first." >&2
     return 1
   fi
-  echo "Starting tachyon-fuse on local host."
+  echo "Starting alluxio-fuse on local host."
   local mount_point=$1
   (nohup $JAVA -cp ${TACHYON_FUSE_JAR} ${JAVA_OPTS} ${TACHYON_FUSE_OPTS}\
-    tachyon.fuse.TachyonFuse \
+    alluxio.fuse.TachyonFuse \
     -m ${mount_point} \
     -o big_writes > $TACHYON_LOGS_DIR/fuse.out 2>&1) &
   # sleep: workaround to let the bg java process exit on errors, if any
   sleep 2s
   if kill -0 $! > /dev/null 2>&1 ; then
     return 0
   else
-    echo "tachyon-fuse not started. See ${TACHYON_LOGS_DIR}/fuse.out for details" >&2
+    echo "alluxio-fuse not started. See ${TACHYON_LOGS_DIR}/fuse.out for details" >&2
     return 1
   fi
 }
 
 umount_fuse () {
   local fuse_pid=$(fuse_stat)
   if [[ $? -eq 0 ]]; then
-    echo "Stopping tachyon-fuse on local host (PID: ${fuse_pid})."
+    echo "Stopping alluxio-fuse on local host (PID: ${fuse_pid})."
     kill ${fuse_pid}
     return $?
   else
-    echo "tachyon-fuse is not running on local host." >&2
+    echo "alluxio-fuse is not running on local host." >&2
     return 1
   fi
 }

bin/tachyon-mount.sh → bin/alluxio-mount.sh

@@ -11,15 +11,15 @@ if [[ "$-" == *x* ]]; then
 fi
 BIN=$(cd "$( dirname "$0" )"; pwd)
 
-Usage="Usage: tachyon-mount.sh [Mount|SudoMount] [MACHINE]
+Usage="Usage: alluxio-mount.sh [Mount|SudoMount] [MACHINE]
 \nIf omitted, MACHINE is default to be 'local'. MACHINE is one of:\n
   local\t\t\tMount local machine\n
   workers\t\tMount all the workers on worker nodes"
 
 function init_env() {
   DEFAULT_LIBEXEC_DIR="${BIN}"/../libexec
   TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
-  . $TACHYON_LIBEXEC_DIR/tachyon-config.sh
+  . $TACHYON_LIBEXEC_DIR/alluxio-config.sh
 
   if [ -z $TACHYON_WORKER_MEMORY_SIZE ] ; then
     echo "TACHYON_WORKER_MEMORY_SIZE was not set. Using the default one: 128MB"
@@ -212,7 +212,7 @@ case "${1}" in
         mount_local $1
         ;;
       workers)
-        $LAUNCHER ${BIN}/tachyon-workers.sh ${BIN}/tachyon-mount.sh $1
+        $LAUNCHER ${BIN}/alluxio-workers.sh ${BIN}/alluxio-mount.sh $1
         ;;
     esac
     ;;