Эх сурвалжийг харах

HUE-2946 [hadoop] test_seek_across_blocks OOM HDFS on live cluster

Also bump timeout of Hive queries
Romain Rigaux 10 жил өмнө
parent
commit
de616fe

+ 3 - 3
apps/beeswax/src/beeswax/tests.py

@@ -983,7 +983,7 @@ for x in sys.stdin:
       if content['status'] == 0:
         success_url = content['success_url']
         resp = self.client.get(content['watch_url'], follow=True)
-        resp = wait_for_query_to_finish(self.client, resp, max=60)
+        resp = wait_for_query_to_finish(self.client, resp, max=120)
         resp.success_url = success_url # Hack until better API
 
       # Check that data is right
@@ -1702,11 +1702,11 @@ for x in sys.stdin:
 
       # Compute stats
       response = self.client.post(reverse("beeswax:analyze_table", kwargs={'database': self.db_name, 'table': 'test'}), follow=True)
-      response = wait_for_query_to_finish(self.client, response, max=60.0)
+      response = wait_for_query_to_finish(self.client, response, max=120.0)
       assert_true(response, response)
 
       response = self.client.post(reverse("beeswax:analyze_table", kwargs={'database': self.db_name, 'table': 'test', 'columns': True}), follow=True)
-      response = wait_for_query_to_finish(self.client, response, max=60.0)
+      response = wait_for_query_to_finish(self.client, response, max=120.0)
       assert_true(response, response)
 
       # Retrieve stats

+ 6 - 0
desktop/libs/hadoop/src/hadoop/fs/test_webhdfs.py

@@ -23,11 +23,14 @@ import sys
 import threading
 import unittest
 
+from nose.plugins.skip import SkipTest
 from nose.tools import assert_false, assert_true, assert_equals, assert_raises, assert_not_equals
 
 from hadoop import pseudo_hdfs4
 from hadoop.fs.exceptions import WebHdfsException
 from hadoop.fs.hadoopfs import Hdfs
+from hadoop.pseudo_hdfs4 import is_live_cluster
+
 
 LOG = logging.getLogger(__name__)
 
@@ -101,6 +104,9 @@ class WebhdfsTests(unittest.TestCase):
 
   def test_seek_across_blocks(self):
     """Makes a file with a lot of blocks, seeks around"""
+    if is_live_cluster():
+      raise SkipTest('HUE-2946: Skipping because requires more memory')
+
     fs = self.cluster.fs
     test_file = self.prefix + "/fortest-blocks.txt"
     fs.create(test_file, replication=1, blocksize=1024**2)