date:20160613

[2/2] accumulo git commit: Merge branch '1.8'

2016-06-13 Thread dlmarion

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 4e9e01f4ced856eac61cfdaf8d68304af509ea4e
Parents: 64547ab a98dbec
Author: Dave Marion 
Authored: Mon Jun 13 11:44:38 2016 -0400
Committer: Dave Marion 
Committed: Mon Jun 13 11:44:38 2016 -0400

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

[1/2] accumulo git commit: ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, provide a better error message, fail if directory can't be created, handle slf4j jars

2016-06-13 Thread dlmarion

Repository: accumulo
Updated Branches:
  refs/heads/master 64547abe8 -> 4e9e01f4c


ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, 
provide a better error message, fail if directory can't be created, handle 
slf4j jars


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

Branch: refs/heads/master
Commit: a98dbecd1a46c73dc3c14b537a03d0ab9a342110
Parents: cb25e77
Author: Dave Marion 
Authored: Mon Jun 13 11:42:59 2016 -0400
Committer: Dave Marion 
Committed: Mon Jun 13 11:42:59 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a98dbecd/assemble/bin/bootstrap_hdfs.sh
--
diff --git a/assemble/bin/bootstrap_hdfs.sh b/assemble/bin/bootstrap_hdfs.sh
index 881b875..6378587 100755
--- a/assemble/bin/bootstrap_hdfs.sh
+++ b/assemble/bin/bootstrap_hdfs.sh
@@ -30,15 +30,18 @@ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 #
 # Find the system context directory in HDFS
 #
-SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" 
"$ACCUMULO_CONF_DIR/accumulo-site.xml" | tail -1 | perl -pe 's/\s+//; 
s/<\/value>//; s|[^/]+$||; print $ARGV[1]')
+SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" 
"$ACCUMULO_CONF_DIR/accumulo-site.xml" | tail -1 | perl -pe 's/\s+//; 
s/<\/value>//; s/,.+$//; s|[^/]+$||; print $ARGV[1]')
 
 if [ -z "$SYSTEM_CONTEXT_HDFS_DIR" ]
 then
-   echo "Your accumulo-site.xml file is not set up for the HDFS Classloader. 
Please add the following to your accumulo-site.xml file:"
+   echo "Your accumulo-site.xml file is not set up for the HDFS Classloader. 
Please add the following to your accumulo-site.xml file where ##CLASSPATH## is 
one of the following formats:"
+   echo "A single directory: hdfs://host:port/directory/"
+   echo "A single directory with a regex: hdfs://host:port/directory/.*.jar"
+   echo "Multiple directories: 
hdfs://host:port/directory/.*.jar,hdfs://host:port/directory2/"
echo ""
echo ""
echo "   general.vfs.classpaths"
-   echo "   hdfs://host:port/dir"
+   echo "   ##CLASSPATH##"
echo "   location of the jars for the default (system) 
context"
echo ""
exit 1
@@ -50,6 +53,10 @@ fi
 "$HADOOP_PREFIX/bin/hadoop" fs -ls "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 if [[ $? != 0 ]]; then
"$HADOOP_PREFIX/bin/hadoop" fs -mkdir "$SYSTEM_CONTEXT_HDFS_DIR"  > 
/dev/null
+   if [[ $? != 0 ]]; then
+  echo "Unable to create classpath directory at $SYSTEM_CONTEXT_HDFS_DIR"
+  exit 1
+   fi
 fi
 
 #
@@ -69,12 +76,14 @@ REP=$(( NUM_SLAVES / 50 ))
 "$HADOOP_PREFIX/bin/hadoop" fs -setrep -R $REP "$SYSTEM_CONTEXT_HDFS_DIR"  > 
/dev/null
 
 #
-# We need two of the jars in lib, copy them back out and remove them from the 
system context dir
+# We need some of the jars in lib, copy them back out and remove them from the 
system context dir
 #
 "$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal 
"$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -rmr 
"$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rm "$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
+"$HADOOP_PREFIX/bin/hadoop" fs -rm 
"$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal 
"$SYSTEM_CONTEXT_HDFS_DIR/slf4j*.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rm "$SYSTEM_CONTEXT_HDFS_DIR/slf4j*.jar"  > 
/dev/null
 for f in $(grep -v '^#' "$ACCUMULO_CONF_DIR/slaves")
 do
   rsync -ra --delete "$ACCUMULO_HOME" $(dirname "$ACCUMULO_HOME")

accumulo git commit: ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, provide a better error message, fail if directory can't be created, handle slf4j jars

2016-06-13 Thread dlmarion

Repository: accumulo
Updated Branches:
  refs/heads/1.8 cb25e77a2 -> a98dbecd1


ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, 
provide a better error message, fail if directory can't be created, handle 
slf4j jars


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

Branch: refs/heads/1.8
Commit: a98dbecd1a46c73dc3c14b537a03d0ab9a342110
Parents: cb25e77
Author: Dave Marion 
Authored: Mon Jun 13 11:42:59 2016 -0400
Committer: Dave Marion 
Committed: Mon Jun 13 11:42:59 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a98dbecd/assemble/bin/bootstrap_hdfs.sh
--
diff --git a/assemble/bin/bootstrap_hdfs.sh b/assemble/bin/bootstrap_hdfs.sh
index 881b875..6378587 100755
--- a/assemble/bin/bootstrap_hdfs.sh
+++ b/assemble/bin/bootstrap_hdfs.sh
@@ -30,15 +30,18 @@ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 #
 # Find the system context directory in HDFS
 #
-SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" 
"$ACCUMULO_CONF_DIR/accumulo-site.xml" | tail -1 | perl -pe 's/\s+//; 
s/<\/value>//; s|[^/]+$||; print $ARGV[1]')
+SYSTEM_CONTEXT_HDFS_DIR=$(grep -A1 "general.vfs.classpaths" 
"$ACCUMULO_CONF_DIR/accumulo-site.xml" | tail -1 | perl -pe 's/\s+//; 
s/<\/value>//; s/,.+$//; s|[^/]+$||; print $ARGV[1]')
 
 if [ -z "$SYSTEM_CONTEXT_HDFS_DIR" ]
 then
-   echo "Your accumulo-site.xml file is not set up for the HDFS Classloader. 
Please add the following to your accumulo-site.xml file:"
+   echo "Your accumulo-site.xml file is not set up for the HDFS Classloader. 
Please add the following to your accumulo-site.xml file where ##CLASSPATH## is 
one of the following formats:"
+   echo "A single directory: hdfs://host:port/directory/"
+   echo "A single directory with a regex: hdfs://host:port/directory/.*.jar"
+   echo "Multiple directories: 
hdfs://host:port/directory/.*.jar,hdfs://host:port/directory2/"
echo ""
echo ""
echo "   general.vfs.classpaths"
-   echo "   hdfs://host:port/dir"
+   echo "   ##CLASSPATH##"
echo "   location of the jars for the default (system) 
context"
echo ""
exit 1
@@ -50,6 +53,10 @@ fi
 "$HADOOP_PREFIX/bin/hadoop" fs -ls "$SYSTEM_CONTEXT_HDFS_DIR"  > /dev/null
 if [[ $? != 0 ]]; then
"$HADOOP_PREFIX/bin/hadoop" fs -mkdir "$SYSTEM_CONTEXT_HDFS_DIR"  > 
/dev/null
+   if [[ $? != 0 ]]; then
+  echo "Unable to create classpath directory at $SYSTEM_CONTEXT_HDFS_DIR"
+  exit 1
+   fi
 fi
 
 #
@@ -69,12 +76,14 @@ REP=$(( NUM_SLAVES / 50 ))
 "$HADOOP_PREFIX/bin/hadoop" fs -setrep -R $REP "$SYSTEM_CONTEXT_HDFS_DIR"  > 
/dev/null
 
 #
-# We need two of the jars in lib, copy them back out and remove them from the 
system context dir
+# We need some of the jars in lib, copy them back out and remove them from the 
system context dir
 #
 "$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal 
"$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -rmr 
"$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rm "$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
+"$HADOOP_PREFIX/bin/hadoop" fs -rm 
"$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal 
"$SYSTEM_CONTEXT_HDFS_DIR/slf4j*.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rm "$SYSTEM_CONTEXT_HDFS_DIR/slf4j*.jar"  > 
/dev/null
 for f in $(grep -v '^#' "$ACCUMULO_CONF_DIR/slaves")
 do
   rsync -ra --delete "$ACCUMULO_HOME" $(dirname "$ACCUMULO_HOME")

[2/2] accumulo git commit: Merge branch '1.8'

[1/2] accumulo git commit: ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, provide a better error message, fail if directory can't be created, handle slf4j jars

accumulo git commit: ACCUMULO-3923: Modify parsing of the HDFS directory to be less restrictive, provide a better error message, fail if directory can't be created, handle slf4j jars

3 matches

Site Navigation

Mail list logo

Footer information