瀏覽代碼

[beeswax] Run beeswax server using the specified HADOOP_BIN

The `hadoop' script in /usr/bin/hadoop does java detection, and
is different from the $HADOOP_HOME/bin/hadoop script.
bc Wong 13 年之前
父節點
當前提交
c6749f8877
共有 2 個文件被更改,包括 9 次插入3 次删除
  1. 8 3
      apps/beeswax/beeswax_server.sh
  2. 1 0
      apps/beeswax/src/beeswax/management/commands/beeswax_server.py

+ 8 - 3
apps/beeswax/beeswax_server.sh

@@ -23,9 +23,14 @@ if [ -z "$HADOOP_HOME" ]; then
   echo "\$HADOOP_HOME must be specified" 1>&2
   exit 1
 fi
-
 echo \$HADOOP_HOME=$HADOOP_HOME
 
+if [ -z "$HADOOP_BIN" ]; then
+  echo "\$HADOOP_BIN must be specified" 1>&2
+  exit 1
+fi
+echo \$HADOOP_BIN=$HADOOP_BIN
+
 if [ -z "$HIVE_CONF_DIR" ]; then
   echo "\$HIVE_CONF_DIR must be specified" 1>&2
   exit 1
@@ -73,5 +78,5 @@ echo \$HADOOP_CONF_DIR=$HADOOP_CONF_DIR
 # Note: I've had trouble running this with just "java -jar" with the classpath
 # determined with a seemingly appropriate find command.
 echo CWD=$(pwd)
-echo Executing $HADOOP_HOME/bin/hadoop jar $BEESWAX_JAR "$@"
-exec $HADOOP_HOME/bin/hadoop jar $BEESWAX_JAR "$@"
+echo Executing $HADOOP_BIN jar $BEESWAX_JAR "$@"
+exec $HADOOP_BIN jar $BEESWAX_JAR "$@"

+ 1 - 0
apps/beeswax/src/beeswax/management/commands/beeswax_server.py

@@ -33,6 +33,7 @@ class Command(NoArgsCommand):
   def handle_noargs(self, **options):
     env = os.environ.copy()
     env['HADOOP_HOME'] = hadoop.conf.HADOOP_HOME.get()
+    env['HADOOP_BIN'] = hadoop.conf.HADOOP_BIN.get()
     if hadoop.conf.HADOOP_CONF_DIR.get():
       env['HADOOP_CONF_DIR'] = hadoop.conf.HADOOP_CONF_DIR.get()
     if beeswax.conf.BEESWAX_HIVE_HOME_DIR.get():