Author: rvs
Date: Wed Oct 26 18:52:36 2011
New Revision: 1189379
URL: http://svn.apache.org/viewvc?rev=1189379&view=rev
Log:
BIGTOP-160. hadoop has deprecated HADOOP_HOME
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
(original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
Wed Oct 26 18:52:36 2011
@@ -1,3 +1,4 @@
+export HADOOP_HOME_WARN_SUPPRESS=true
export HADOOP_HOME=/usr/lib/hadoop
export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop.default Wed
Oct 26 18:52:36 2011
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+export HADOOP_HOME_WARN_SUPPRESS=true
export HADOOP_HOME=/usr/lib/hadoop
export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/install_hadoop.sh
Wed Oct 26 18:52:36 2011
@@ -145,7 +145,7 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
source /usr/lib/bigtop-utils/bigtop-detect-javahome
fi
-export HADOOP_HOME=$INSTALLED_LIB_DIR
+. /etc/default/hadoop
exec $INSTALLED_LIB_DIR/bin/$bin_wrapper "\$@"
EOF
chmod 755 $wrapper
@@ -240,7 +240,7 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
source /usr/lib/bigtop-utils/bigtop-detect-javahome
fi
-export HADOOP_HOME=$INSTALLED_LIB_DIR
+. /etc/default/hadoop
if [ -f /etc/default/hadoop-fuse ]
then . /etc/default/hadoop-fuse
Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/install_hive.sh Wed
Oct 26 18:52:36 2011
@@ -119,8 +119,7 @@ do
wrapper=$BIN_DIR/$file
cat >>$wrapper <<EOF
#!/bin/sh
-
-export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
+. /etc/default/hadoop
export HIVE_HOME=$INSTALLED_LIB_DIR
exec $INSTALLED_LIB_DIR/bin/$file "\$@"
EOF
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
Wed Oct 26 18:52:36 2011
@@ -120,10 +120,9 @@ ln -s /etc/mahout/conf $PREFIX/$LIB_DIR/
install -d -m 0755 $PREFIX/$BIN_DIR
cat > $PREFIX/$BIN_DIR/mahout <<EOF
#!/bin/sh
+. /etc/default/hadoop
export MAHOUT_HOME=\${MAHOUT_HOME:-$INSTALLED_LIB_DIR}
export MAHOUT_CONF_DIR=\${MAHOUT_CONF_DIR:-$CONF_DIR}
-export HADOOP_CONF_DIR=\${HADOOP_CONF_DIR:-/etc/hadoop/conf}
-export HADOOP_HOME=\${HADOOP_HOME:-/usr/lib/hadoop}
exec $INSTALLED_LIB_DIR/bin/mahout "\$@"
EOF
chmod 755 $PREFIX/$BIN_DIR/mahout
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh?rev=1189379&r1=1189378&r2=1189379&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/install_sqoop.sh
Wed Oct 26 18:52:36 2011
@@ -135,6 +135,7 @@ for i in sqoop sqoop-codegen sqoop-expor
mkdir -p `dirname $wrapper`
cat > $wrapper <<EOF
#!/bin/sh
+. /etc/default/hadoop
export SQOOP_HOME=$LIB_DIR
exec $BIN_DIR/$i "\$@"
EOF
