accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-2387 Use ACCUMULO_CONF_DIR to find config files in bootstrap_hdfs.sh
Date Thu, 20 Feb 2014 14:14:14 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT db367679d -> 1a796777c


ACCUMULO-2387 Use ACCUMULO_CONF_DIR to find config files in bootstrap_hdfs.sh

Signed-off-by: Eric Newton <eric.newton@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1a796777
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a796777
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a796777

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1a796777c2523923db806e6f692d69d9ddec698c
Parents: db36767
Author: Vikram Srivastava <vikrams@cloudera.com>
Authored: Wed Feb 19 23:26:52 2014 -0800
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Feb 20 09:13:43 2014 -0500

----------------------------------------------------------------------
 bin/bootstrap_hdfs.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1a796777/bin/bootstrap_hdfs.sh
----------------------------------------------------------------------
diff --git a/bin/bootstrap_hdfs.sh b/bin/bootstrap_hdfs.sh
index cef7eb8..0a3f866 100755
--- a/bin/bootstrap_hdfs.sh
+++ b/bin/bootstrap_hdfs.sh
@@ -30,7 +30,7 @@ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 #
 # Find the system context directory in HDFS
 #
-SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" "$ACCUMULO_HOME/conf/accumulo-site.xml"
| tail -1 | perl -pe 's/\s+<value>//; s/<\/value>//; print $ARGV[1]')
+SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" "$ACCUMULO_CONF_DIR/accumulo-site.xml"
| tail -1 | perl -pe 's/\s+<value>//; s/<\/value>//; print $ARGV[1]')
 
 if [ -z "$SYSTEM_CONTEXT_HDFS_DIR" ]
 then
@@ -55,7 +55,7 @@ fi
 #
 # Replicate to all slaves to avoid network contention on startup
 #
-SLAVES="$ACCUMULO_HOME/conf/slaves"
+SLAVES="$ACCUMULO_CONF_DIR/slaves"
 NUM_SLAVES=$(egrep -v '(^#|^\s*$)' "$SLAVES" | wc -l)
 
 #let each datanode service around 50 clients
@@ -78,7 +78,7 @@ fi
 "$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar"  > /dev/null
 "$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar"
"$ACCUMULO_HOME/lib/."  > /dev/null
 "$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar"  > /dev/null
-for f in `cat $ACCUMULO_HOME/conf/slaves`
+for f in `cat $ACCUMULO_CONF_DIR/slaves`
 do
   rsync -ra --delete $ACCUMULO_HOME `dirname $ACCUMULO_HOME`
 done


Mime
View raw message