diff --git data/conf/hive-site.xml data/conf/hive-site.xml index 4e6ff16..e7022e4 100644 --- data/conf/hive-site.xml +++ data/conf/hive-site.xml @@ -156,6 +156,12 @@ + hive.metastore.client.socket.timeout + 80 + MetaStore Client socket timeout in seconds + + + fs.pfile.impl org.apache.hadoop.fs.ProxyLocalFileSystem A proxy for local file system used for cross file system testing diff --git testutils/ptest/hivetest.py testutils/ptest/hivetest.py index ccc4537..4142010 100755 --- testutils/ptest/hivetest.py +++ testutils/ptest/hivetest.py @@ -135,7 +135,7 @@ def get_ant(): abandon_output = False) is None: local.run('mkdir -p "{0}"'.format(master_base_path)) local.cd(master_base_path) - local.run('curl "http://apache.osuosl.org//ant/binaries/apache-ant-1.8.4-bin.tar.gz" | tar xz') + local.run('curl "http://archive.apache.org/dist/ant/binaries/apache-ant-1.8.4-bin.tar.gz" | tar xz') else: print('\n Ant 1.8.4 already installed\n') @@ -156,9 +156,9 @@ def get_arc(): .format(phutil_path)) local.cd(arc_path) - local.run('git pull https://github.com/facebook/arcanist.git') + local.run('git pull https://github.com/facebook/arcanist.git master') local.cd(phutil_path) - local.run('git pull https://github.com/facebook/libphutil.git') + local.run('git pull https://github.com/facebook/libphutil.git master') def get_clean_hive(): # Gets latest Hive from Apache Git repository and cleans the repository @@ -166,17 +166,18 @@ def get_clean_hive(): # `arc-setup` so the repo is ready to be used. print('\n-- Updating Hive repo\n') - local.cd(code_path) if local.run('test -d "{0}"'.format(code_path), warn_only = True, abandon_output = False) is None: local.run('mkdir -p "{0}"'.format(os.path.dirname(code_path))) local.run('git clone http://git.apache.org/hive.git "{0}"'.format(code_path)) else: # Clean repo and checkout to t he last revision + local.cd(code_path) local.run('git reset --hard HEAD') local.run('git clean -dffx') local.run('git pull') + local.cd(code_path) local.run('ant arc-setup') def copy_local_hive(): @@ -530,7 +531,7 @@ def cmd_test(patches = [], revision = None, one_file_report = False): tests = ['TestRemoteHiveMetaStore','TestEmbeddedHiveMetaStore','TestSetUGIOnBothClientServer','TestSetUGIOnOnlyClient','TestSetUGIOnOnlyServer'] for test in tests: - local.run('sudo -u root ant -Divy.default.ivy.user.dir={0} '.format(ivy_path) + ' -Dtestcase=' + test + ' test') + local.run('ant -Divy.default.ivy.user.dir={0} '.format(ivy_path) + ' -Dtestcase=' + test + ' test') local.run('cp "`find . -name "TEST-*.xml"`" "' + master_base_path + '/templogs/"') cmd_run_tests(one_file_report)