add -disable_assertions param to build_cloud()

updates on some of the others
hansight · Sep 24, 2014 · ffdf3de · ffdf3de
1 parent 9d9caae
commit ffdf3de
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/py/h2o.py b/py/h2o.py
@@ -2748,7 +2748,11 @@ def get_args(self):
             print "You can attach debugger at port %s for jvm at %s:%s" % (debuggerPort, a, b)
             args += ['-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=%s' % debuggerPort]
 
-        args += ["-ea"]
+        if self.disable_assertions:
+            print "WARNING: h2o is running with assertions disabled"
+        else:
+            args += ["-ea"]
+
 
         if self.use_maprfs:
             args += ["-Djava.library.path=/opt/mapr/lib"]
@@ -2855,6 +2859,7 @@ def __init__(self,
                  h2o_remote_buckets_root=None,
                  delete_keys_at_teardown=False,
                  cloud_name=None,
+                 disable_assertions=None,
     ):
 
         if use_hdfs:
@@ -2937,6 +2942,7 @@ def __init__(self,
         self.enable_benchmark_log = enable_benchmark_log
         self.h2o_remote_buckets_root = h2o_remote_buckets_root
         self.delete_keys_at_teardown = delete_keys_at_teardown
+        self.disable_assertions = disable_assertions
 
         if cloud_name:
             self.cloud_name = cloud_name

diff --git a/py/testdir_0xdata_only/test_parse_airline_multi_hdfs.py b/py/testdir_0xdata_only/test_parse_airline_multi_hdfs.py
@@ -3,13 +3,15 @@
 import h2o, h2o_cmd, h2o_browse as h2b, h2o_import as h2i, h2o_hosts
 
 RANDOM_UDP_DROP = False
+DISABLE_ASSERTIONS = False
 if RANDOM_UDP_DROP:
     print "random_udp_drop!!"
 # NAME_NODE = 'mr-0x6'
 # VERSION = 'cdh4'
 NAME_NODE = 'mr-0xd6'
 VERSION = 'hdp2.1'
 
+
 print "Using", VERSION, "on", NAME_NODE
 
 class Basic(unittest.TestCase):
@@ -26,7 +28,7 @@ def tearDownClass(cls):
         # the node state is gone when we tear down the cloud, so pass the ignore here also.
         h2o.tear_down_cloud(sandboxIgnoreErrors=True)
 
-    def test_parse_nflx_loop_hdfs_fvec(self):
+    def test_parse_airline_multi_hdfs(self):
         h2o.beta_features = True
         print "Using the -.gz files from hdfs"
         # hdfs://<name node>/datasets/manyfiles-nflx-gz/file_1.dat.gz
@@ -38,16 +40,16 @@ def test_parse_nflx_loop_hdfs_fvec(self):
             print "\n", tryHeap,"GB heap, 1 jvm per host, import mr-0x6 hdfs, then parse"
             localhost = h2o.decide_if_localhost()
             if (localhost):
-                h2o.build_cloud(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55930,
+                h2o.build_cloud(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55930, disable_assertions=DISABLE_ASSERTIONS,
                     use_hdfs=True, hdfs_name_node=NAME_NODE, hdfs_version=VERSION)
             else:
-                h2o_hosts.build_cloud_with_hosts(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55600,
+                h2o_hosts.build_cloud_with_hosts(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55600, disable_assertions=DISABLE_ASSERTIONS,
                     use_hdfs=True, hdfs_name_node=NAME_NODE, hdfs_version=VERSION)
 
             # don't raise exception if we find something bad in h2o stdout/stderr?
             # h2o.nodes[0].sandboxIgnoreErrors = True
 
-            timeoutSecs = 500
+            timeoutSecs = 3600
             importFolderPath = "datasets/airlines_multi"
 
             for trial in range(trialMax):

diff --git a/py/testdir_0xdata_only/test_parse_airline_multi_hdfs_many.py b/py/testdir_0xdata_only/test_parse_airline_multi_hdfs_many.py
@@ -27,7 +27,8 @@ def tearDownClass(cls):
         # the node state is gone when we tear down the cloud, so pass the ignore here also.
         h2o.tear_down_cloud(sandboxIgnoreErrors=True)
 
-    def test_parse_nflx_loop_hdfs_fvec(self):
+    def test_parse_airline_multi_hdfs_many(self):
+
         h2o.beta_features = True
         print "Using the -.gz files from hdfs"
         # hdfs://<name node>/datasets/manyfiles-nflx-gz/file_1.dat.gz
@@ -43,7 +44,7 @@ def test_parse_nflx_loop_hdfs_fvec(self):
                 h2o.build_cloud(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55930,
                     use_hdfs=True, hdfs_name_node=NAME_NODE, hdfs_version=VERSION)
             else:
-                h2o_hosts.build_cloud_with_hosts(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55600,
+                h2o_hosts.build_cloud_with_hosts(java_heap_GB=tryHeap, random_udp_drop=RANDOM_UDP_DROP, base_port=55600, disable_assertion=True,
                     use_hdfs=True, hdfs_name_node=NAME_NODE, hdfs_version=VERSION)
 
             # don't raise exception if we find something bad in h2o stdout/stderr?

diff --git a/py/testdir_release/runner_cdh5.sh b/py/testdir_release/runner_cdh5.sh
@@ -54,6 +54,7 @@ echo "hdfs dfs -rm -r /user/0xcustomer/$HDFS_OUTPUT" >> /tmp/h2o_on_hadoop_$REMO
 set -e
 EA=" -ea"
 UDP_DROP=" -random_udp_drop"
+UDP_DROP=""
 echo "hadoop jar $CDH5_YARN_JAR water.hadoop.h2odriver -jt $CDH5_YARN_JOBTRACKER -libjars $H2O_JAR -mapperXmx $CDH5_YARN_HEAP -nodes $CDH5_YARN_NODES -output $HDFS_OUTPUT -notify h2o_one_node $EA $UDP_DROP" >> /tmp/h2o_on_hadoop_$REMOTE_IP.sh
 
 # copy the script, just so we have it there too

diff --git a/py/testdir_release/runner_mapr.sh b/py/testdir_release/runner_mapr.sh
@@ -24,8 +24,8 @@ SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-7-oracle; "
 # Now resource manager is at 8050?
 NAME_NODE=172.16.2.172
 MAPR_JOBTRACKER=172.16.2.172:9001
-MAPR_NODES=4
-MAPR_HEAP=16g
+MAPR_NODES=1
+MAPR_HEAP=1g
 # MAPR_JAR=h2odriver_mapr2.1.3.jar
 MAPR_JAR=h2odriver_mapr3.1.1.jar
 H2O_JAR=h2o.jar