[impala] 02/03: IMPALA-8363: Fix E2E start with impala_log_dir

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit f998d64767c074216e75a552b36ecf44ff295d07
Author: Radford Nguyen <ra...@cloudera.com>
AuthorDate: Thu Apr 4 15:05:08 2019 -0700

    IMPALA-8363: Fix E2E start with impala_log_dir
    
    This commit fixes the `CustomClusterTestSuite` to wait for the
    correct number of executors when `impala_log_dir` is specified
    in the test decorator.  Previously, the default value of 3
    was always used, regardless of `cluster_size`.
    
    Testing:
    
    - Manual verification using tests/authorization/test_ranger.py
    with custom `impala_log_dir` and `cluster_size` arguments.
    Failed before changes, passed after changes
    
    - Ran all original E2E tests
    
    Change-Id: I4f46f40474b4b380abe88647a37e8e4d2231d745
    Reviewed-on: http://gerrit.cloudera.org:8080/12935
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 tests/common/custom_cluster_test_suite.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/common/custom_cluster_test_suite.py b/tests/common/custom_cluster_test_suite.py
index f6c7997..841f61b 100644
--- a/tests/common/custom_cluster_test_suite.py
+++ b/tests/common/custom_cluster_test_suite.py
@@ -144,15 +144,15 @@ class CustomClusterTestSuite(ImpalaTestSuite):
       cluster_size = method.func_dict[CLUSTER_SIZE]
 
     # Start a clean new cluster before each test
+    kwargs = {
+      "cluster_size": cluster_size,
+      "num_coordinators": cluster_size,
+      "expected_num_executors": cluster_size,
+      "default_query_options": method.func_dict.get(DEFAULT_QUERY_OPTIONS)
+    }
     if IMPALA_LOG_DIR in method.func_dict:
-      self._start_impala_cluster(cluster_args,
-          default_query_options=method.func_dict.get(DEFAULT_QUERY_OPTIONS),
-          impala_log_dir=method.func_dict[IMPALA_LOG_DIR], cluster_size=cluster_size)
-    else:
-      self._start_impala_cluster(cluster_args,
-          default_query_options=method.func_dict.get(DEFAULT_QUERY_OPTIONS),
-          cluster_size=cluster_size, num_coordinators=cluster_size,
-          expected_num_executors=cluster_size)
+      kwargs["impala_log_dir"] = method.func_dict[IMPALA_LOG_DIR]
+    self._start_impala_cluster(cluster_args, **kwargs)
     super(CustomClusterTestSuite, self).setup_class()
 
   def teardown_method(self, method):