You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2007/09/21 11:27:47 UTC
svn commit: r578032 - in /lucene/hadoop/trunk/src/contrib/hbase: CHANGES.txt
bin/hbase-config.sh bin/hbase-daemon.sh bin/hbase-daemons.sh
bin/regionservers.sh bin/start-hbase.sh bin/stop-hbase.sh
Author: stack
Date: Fri Sep 21 02:27:46 2007
New Revision: 578032
URL: http://svn.apache.org/viewvc?rev=578032&view=rev
Log:
HADOOP-1931 Hbase scripts take --ARG=ARG_VALUE when should be like
hadoop and do ---ARG ARG_VALUE
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-config.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh
lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Fri Sep 21 02:27:46 2007
@@ -4,6 +4,8 @@
Trunk (unreleased changes)
INCOMPATIBLE CHANGES
+ HADOOP-1931 Hbase scripts take --ARG=ARG_VALUE when should be like hadoop
+ and do ---ARG ARG_VALUE
NEW FEATURES
HADOOP-1768 FS command using Hadoop FsShell operations
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-config.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-config.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-config.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-config.sh Fri Sep 21 02:27:46 2007
@@ -49,29 +49,34 @@
#check to see if the conf dir or hadoop home are given as an optional arguments
while [ $# -gt 1 ]
do
- case $1 in
- --config=*)
- HADOOP_CONF_DIR=`echo $1|sed 's/[^=]*=\(.*\)/\1/'`
- shift
- ;;
- --hbaseconfig=*)
- HBASE_CONF_DIR=`echo $1|sed 's/[^=]*=\(.*\)/\1/'`
- shift
- ;;
-
- --hadoop=*)
- HADOOP_HOME=`echo $1|sed 's/[^=]*=\(.*\)/\1/'`
- shift
- ;;
- --hosts=*)
- HBASE_REGIONSERVERS=`echo $1|sed 's/[^=]*=\(.*\)/\1/'`
- shift
- ;;
-
- *)
- break
- ;;
- esac
+ if [ "--config" = "$1" ]
+ then
+ shift
+ confdir=$1
+ shift
+ HADOOP_CONF_DIR=$confdir
+ elif [ "--hbaseconfig" = "$1" ]
+ then
+ shift
+ confdir=$1
+ shift
+ HBASE_CONF_DIR=$confdir
+ elif [ "--hadoop" = "$1" ]
+ then
+ shift
+ home=$1
+ shift
+ HADOOP_HOME=$home
+ elif [ "--hosts" = "$1" ]
+ then
+ shift
+ hosts=$1
+ shift
+ HBASE_REGIONSERVERS=$hosts
+ else
+ # Presume we are at end of options and break
+ break
+ fi
done
# If no hadoop home specified, then we assume its above this directory.
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh Fri Sep 21 02:27:46 2007
@@ -33,8 +33,8 @@
#
# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
-usage="Usage: hbase-daemon.sh [--config=<hadoop-conf-dir>]\
- [--hbaseconfig=<hbase-conf-dir>] <hbase-command> (start|stop)\
+usage="Usage: hbase-daemon.sh [--config <hadoop-conf-dir>]\
+ [--hbaseconfig <hbase-conf-dir>] <hbase-command> (start|stop)\
<args...>"
# if no args specified, show usage
@@ -117,8 +117,8 @@
hbase_rotate_log $log
echo starting $command, logging to $log
nohup nice -n $HADOOP_NICENESS "$HBASE_HOME"/bin/hbase \
- --hadoop="${HADOOP_HOME}" \
- --config="${HADOOP_CONF_DIR}" --hbaseconfig="${HBASE_CONF_DIR}" \
+ --hadoop "${HADOOP_HOME}" \
+ --config "${HADOOP_CONF_DIR}" --hbaseconfig "${HBASE_CONF_DIR}" \
$command $startStop "$@" > "$log" 2>&1 < /dev/null &
echo $! > $pid
sleep 1; head "$log"
@@ -129,8 +129,8 @@
if kill -0 `cat $pid` > /dev/null 2>&1; then
echo -n stopping $command
nohup nice -n $HADOOP_NICENESS "$HBASE_HOME"/bin/hbase \
- --hadoop="${HADOOP_HOME}" \
- --config="${HADOOP_CONF_DIR}" --hbaseconfig="${HBASE_CONF_DIR}" \
+ --hadoop "${HADOOP_HOME}" \
+ --config "${HADOOP_CONF_DIR}" --hbaseconfig "${HBASE_CONF_DIR}" \
$command $startStop "$@" > "$log" 2>&1 < /dev/null &
while kill -0 `cat $pid` > /dev/null 2>&1; do
echo -n "."
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh Fri Sep 21 02:27:46 2007
@@ -23,9 +23,9 @@
# Run a Hadoop hbase command on all slave hosts.
# Modelled after $HADOOP_HOME/bin/hadoop-daemons.sh
-usage="Usage: hbase-daemons.sh [--hadoop=<hadoop-home>]
- [--config=<hadoop-confdir>] [--hbase=<hbase-home>]\
- [--hbaseconfig=<hbase-confdir>] [--hosts=regionserversfile]\
+usage="Usage: hbase-daemons.sh [--hadoop <hadoop-home>]
+ [--config <hadoop-confdir>] [--hbase <hbase-home>]\
+ [--hbaseconfig <hbase-confdir>] [--hosts regionserversfile]\
command [start|stop] args..."
# if no args specified, show usage
@@ -39,8 +39,8 @@
. $bin/hbase-config.sh
-exec "$bin/regionservers.sh" --config="${HADOOP_CONF_DIR}" \
- --hbaseconfig="${HBASE_CONF_DIR}" --hadoop="${HADOOP_HOME}" \
+exec "$bin/regionservers.sh" --config "${HADOOP_CONF_DIR}" \
+ --hbaseconfig "${HBASE_CONF_DIR}" --hadoop "${HADOOP_HOME}" \
cd "${HBASE_HOME}" \; \
- "$bin/hbase-daemon.sh" --config="${HADOOP_CONF_DIR}" \
- --hbaseconfig="${HBASE_CONF_DIR}" --hadoop="${HADOOP_HOME}" "$@"
+ "$bin/hbase-daemon.sh" --config "${HADOOP_CONF_DIR}" \
+ --hbaseconfig "${HBASE_CONF_DIR}" --hadoop "${HADOOP_HOME}" "$@"
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/regionservers.sh Fri Sep 21 02:27:46 2007
@@ -33,8 +33,8 @@
#
# Modelled after $HADOOP_HOME/bin/slaves.sh.
-usage="Usage: regionservers [--config=<hadoop-confdir>]\
- [--hbaseconfig=<hbase-confdir>] command..."
+usage="Usage: regionservers [--config <hadoop-confdir>]\
+ [--hbaseconfig <hbase-confdir>] command..."
# if no args specified, show usage
if [ $# -le 0 ]; then
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh Fri Sep 21 02:27:46 2007
@@ -38,8 +38,8 @@
then
exit $errCode
fi
-"$bin"/hbase-daemon.sh --config="${HADOOP_CONF_DIR}" \
- --hbaseconfig="${HBASE_CONF_DIR}" master start
-"$bin"/hbase-daemons.sh --config="${HADOOP_CONF_DIR}" \
- --hbaseconfig="${HBASE_CONF_DIR}" --hadoop="${HADOOP_HOME}" \
- --hosts="${HBASE_REGIONSERVERS}" regionserver start
+"$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \
+ --hbaseconfig "${HBASE_CONF_DIR}" master start
+"$bin"/hbase-daemons.sh --config "${HADOOP_CONF_DIR}" \
+ --hbaseconfig "${HBASE_CONF_DIR}" --hadoop "${HADOOP_HOME}" \
+ --hosts "${HBASE_REGIONSERVERS}" regionserver start
Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh?rev=578032&r1=578031&r2=578032&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh Fri Sep 21 02:27:46 2007
@@ -29,5 +29,5 @@
. "$bin"/hbase-config.sh
-"$bin"/hbase-daemon.sh --config="${HADOOP_CONF_DIR}" \
- --hbaseconfig="${HBASE_CONF_DIR}" master stop
+"$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \
+ --hbaseconfig "${HBASE_CONF_DIR}" master stop