浏览代码

[test] Work around a webhdfs redirect bug in test

bc Wong 13 年之前
父节点
当前提交
d807f9232d
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 3 2
      desktop/libs/hadoop/src/hadoop/pseudo_hdfs4.py
  2. 2 2
      tools/jenkins/build-functions

+ 3 - 2
desktop/libs/hadoop/src/hadoop/pseudo_hdfs4.py

@@ -162,7 +162,7 @@ class PseudoHdfs4(object):
       LOG.info('Skipping cleanup of temp directory "%s"' % (self._tmpdir,))
       LOG.info('Skipping cleanup of temp directory "%s"' % (self._tmpdir,))
     else:
     else:
       LOG.info('Cleaning up temp directory "%s". '
       LOG.info('Cleaning up temp directory "%s". '
-               'Use $MINI_CLUSTER_CLEANUP to avoid.' % (self._tmpdir,))
+               'Use "export MINI_CLUSTER_CLEANUP=false" to avoid.' % (self._tmpdir,))
       shutil.rmtree(self._tmpdir)
       shutil.rmtree(self._tmpdir)
 
 
     if self.shutdown_hook is not None:
     if self.shutdown_hook is not None:
@@ -389,7 +389,8 @@ class PseudoHdfs4(object):
       'dfs.namenode.safemode.extension': 1,
       'dfs.namenode.safemode.extension': 1,
       'dfs.namenode.safemode.threshold-pct': 0,
       'dfs.namenode.safemode.threshold-pct': 0,
       'dfs.datanode.address': 'localhost:0',
       'dfs.datanode.address': 'localhost:0',
-      'dfs.datanode.http.address': 'localhost:0',
+      # Work around webhdfs redirect bug -- bind to all interfaces
+      'dfs.datanode.http.address': '0.0.0.0:0',
       'dfs.datanode.ipc.address': 'localhost:0',
       'dfs.datanode.ipc.address': 'localhost:0',
       'dfs.replication': 1,
       'dfs.replication': 1,
       'dfs.safemode.min.datanodes': 1,
       'dfs.safemode.min.datanodes': 1,

+ 2 - 2
tools/jenkins/build-functions

@@ -21,7 +21,7 @@
 # If not specified, it uses the $CDH variable to select an archive location.
 # If not specified, it uses the $CDH variable to select an archive location.
 #
 #
 
 
-CDH_URL=${CDH_URL:-http://nightly.cloudera.com/cdh4/cdh/4/hadoop-0.23.3-cdh4b2-SNAPSHOT.tar.gz}
+CDH_URL=${CDH_URL:-http://nightly.cloudera.com/cdh4/cdh/4/hadoop-0.23.1-cdh4b2-SNAPSHOT.tar.gz}
 
 
 CDH_TGZ=$(basename $CDH_URL)
 CDH_TGZ=$(basename $CDH_URL)
 CDH_VERSION=${CDH_TGZ/.tar.gz/}
 CDH_VERSION=${CDH_TGZ/.tar.gz/}
@@ -45,7 +45,7 @@ build_hadoop() {
 
 
 ##########
 ##########
 
 
-MR1_URL=${MR1_URL:-http://nightly.cloudera.com/cdh4/cdh/4/mr1-0.23.3-mr1-cdh4b2-SNAPSHOT.tar.gz}
+MR1_URL=${MR1_URL:-http://nightly.cloudera.com/cdh4/cdh/4/mr1-0.23.1-mr1-cdh4b2-SNAPSHOT.tar.gz}
 
 
 MR1_TGZ=$(basename $MR1_URL)
 MR1_TGZ=$(basename $MR1_URL)
 MR1_VERSION=${MR1_TGZ/.tar.gz/}
 MR1_VERSION=${MR1_TGZ/.tar.gz/}