Explorar o código

[core] Use MR in hadoop tarball

Abraham Elmahrek %!s(int64=12) %!d(string=hai) anos
pai
achega
88b0eb5
Modificáronse 4 ficheiros con 5 adicións e 49 borrados
  1. 0 20
      apps/pig/hueversion.py
  2. 1 0
      apps/pig/hueversion.py
  3. 4 28
      tools/jenkins/build-functions
  4. 0 1
      tools/jenkins/jenkins.sh

+ 0 - 20
apps/pig/hueversion.py

@@ -1,20 +0,0 @@
-# Licensed to Cloudera, Inc. under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  Cloudera, Inc. licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-# This file should be the one source of truth for for versions within HUE.
-# It is at least included by each of the default hue app's setup.py.
-
-VERSION="2.1.0"

+ 1 - 0
apps/pig/hueversion.py

@@ -0,0 +1 @@
+../../VERSION

+ 4 - 28
tools/jenkins/build-functions

@@ -52,8 +52,10 @@ build_hadoop() {
   fi
 
   HADOOP_DIR=$HUE_ROOT/ext/hadoop
-  export HADOOP_HDFS_HOME="$HADOOP_DIR/${CDH_VERSION}"
-  export HADOOP_BIN=$HADOOP_HDFS_HOME/bin/hadoop
+  export HADOOP_HDFS_HOME="$HADOOP_DIR/${CDH_VERSION}/share/hadoop/hdfs"
+  export HADOOP_BIN="$HADOOP_DIR/${CDH_VERSION}/bin/hadoop"
+  export HADOOP_MR1_HOME="$HADOOP_DIR/${CDH_VERSION}/share/hadoop/mapreduce1"
+  export HADOOP_MR1_BIN="$HADOOP_DIR/${CDH_VERSION}/bin-mapreduce1/hadoop"
 
   mkdir -p $HADOOP_DIR
   rm -rf $HADOOP_HDFS_HOME
@@ -63,32 +65,6 @@ build_hadoop() {
 
 ##########
 
-MR1_URL=${MR1_URL:-http://nightly.cloudera.com/cdh4/cdh/4/mr1-2.0.0-mr1-cdh4.3.0-SNAPSHOT.tar.gz}
-
-MR1_TGZ=$(basename $MR1_URL)
-MR1_VERSION=${MR1_TGZ/.tar.gz/}
-MR1_VERSION=${MR1_VERSION/mr1/hadoop}
-MR1_CACHE="$HOME/.hue_cache/${MR1_TGZ}"
-MR1_MTIME_FILE="$HOME/.hue_cache/.mr1_mtime"
-
-build_mr1() {
-  if ! check_mtime ${MR1_MTIME_FILE} ${MR1_URL} || [ ! -f $MR1_CACHE ]; then
-    echo "Downloading $MR1_URL..."
-    wget $MR1_URL -O $MR1_CACHE
-  fi
-
-  MR1_DIR=$HUE_ROOT/ext/mr1
-  export HADOOP_MR1_HOME="$MR1_DIR/${MR1_VERSION}"
-  export HADOOP_MR1_BIN="$HADOOP_MR1_HOME/bin/hadoop"
-
-  mkdir -p $MR1_DIR
-  rm -rf $HADOOP_MR1_HOME
-  echo "Unpacking $MR1_CACHE to $MR1_DIR"
-  tar -C $MR1_DIR -xzf $MR1_CACHE
-}
-
-##########
-
 HIVE_URL=${HIVE_URL:-http://nightly.cloudera.com/cdh4/cdh/4/hive-0.10.0-cdh4.3.0-SNAPSHOT.tar.gz}
 
 HIVE_TGZ=$(basename $HIVE_URL)

+ 0 - 1
tools/jenkins/jenkins.sh

@@ -39,7 +39,6 @@ else
 fi
 
 build_hadoop
-build_mr1
 build_hive
 build_oozie