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 <impala-public-jenkins@cloudera.com>
Tested-by: Impala Public Jenkins <impala-public-jenkins@cloudera.com>
This commit is contained in:
Radford Nguyen
2019-04-04 15:05:08 -07:00
committed by Impala Public Jenkins
parent 2950955b3e
commit f998d64767

View File

@@ -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):