mirror of
https://github.com/apache/impala.git
synced 2025-12-25 02:03:09 -05:00
IMPALA-13396: Unify tmp dir management in CustomClusterTestSuite
There are many custom cluster tests that require creating temporary directory. The temporary directory typically live within a scope of test method and cleaned afterwards. However, some test do create temporary directory directly and forgot to clean them afterwards, leaving junk dirs under /tmp/ or $LOG_DIR. This patch unify the temporary directory management inside CustomClusterTestSuite. It introduce new 'tmp_dir_placeholders' arg in CustomClusterTestSuite.with_args() that list tmp dirs to create. 'impalad_args', 'catalogd_args', and 'impala_log_dir' now accept formatting pattern that is replaceable by a temporary dir path, defined through 'tmp_dir_placeholders'. There are few occurrences where mkdtemp is called and not replaceable by this work, such as tests/comparison/cluster.py. In that case, this patch change them to supply prefix arg so that developer knows that it comes from Impala test script. This patch also addressed several flake8 errors in modified files. Testing: - Pass custom cluster tests in exhaustive mode. - Manually run few modified tests and observe that the temporary dirs are created and removed under logs/custom_cluster_tests/ as the tests go. Change-Id: I8dd665e8028b3f03e5e33d572c5e188f85c3bdf5 Reviewed-on: http://gerrit.cloudera.org:8080/21836 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:
committed by
Impala Public Jenkins
parent
6642b75efc
commit
9c87cf41bf
@@ -33,7 +33,11 @@ from time import sleep, time
|
||||
from beeswaxd.BeeswaxService import QueryState
|
||||
|
||||
from tests.beeswax.impala_beeswax import ImpalaBeeswaxException
|
||||
from tests.common.custom_cluster_test_suite import CustomClusterTestSuite
|
||||
from tests.common.custom_cluster_test_suite import (
|
||||
ADMISSIOND_ARGS,
|
||||
IMPALAD_ARGS,
|
||||
START_ARGS,
|
||||
CustomClusterTestSuite)
|
||||
from tests.common.environ import build_flavor_timeout, ImpalaTestClusterProperties
|
||||
from tests.common.impala_test_suite import ImpalaTestSuite
|
||||
from tests.common.resource_pool_config import ResourcePoolConfig
|
||||
@@ -1632,11 +1636,12 @@ class TestAdmissionControllerWithACService(TestAdmissionController):
|
||||
if self.exploration_strategy() != 'exhaustive':
|
||||
pytest.skip('runs only in exhaustive')
|
||||
|
||||
if 'start_args' not in method.__dict__:
|
||||
method.__dict__['start_args'] = list()
|
||||
method.__dict__["start_args"].append("--enable_admission_service")
|
||||
if "impalad_args" in method.__dict__:
|
||||
method.__dict__["admissiond_args"] = method.__dict__["impalad_args"]
|
||||
start_args = "--enable_admission_service"
|
||||
if START_ARGS in method.__dict__:
|
||||
start_args = method.__dict__[START_ARGS] + " " + start_args
|
||||
method.__dict__[START_ARGS] = start_args
|
||||
if IMPALAD_ARGS in method.__dict__:
|
||||
method.__dict__[ADMISSIOND_ARGS] = method.__dict__[IMPALAD_ARGS]
|
||||
super(TestAdmissionController, self).setup_method(method)
|
||||
|
||||
@SkipIfNotHdfsMinicluster.tuned_for_minicluster
|
||||
@@ -2396,9 +2401,11 @@ class TestAdmissionControllerStressWithACService(TestAdmissionControllerStress):
|
||||
def setup_method(self, method):
|
||||
if self.exploration_strategy() != 'exhaustive':
|
||||
pytest.skip('runs only in exhaustive')
|
||||
if 'start_args' not in method.__dict__:
|
||||
method.__dict__['start_args'] = list()
|
||||
method.__dict__["start_args"].append("--enable_admission_service")
|
||||
if "impalad_args" in method.__dict__:
|
||||
method.__dict__["admissiond_args"] = method.__dict__["impalad_args"]
|
||||
|
||||
start_args = "--enable_admission_service"
|
||||
if START_ARGS in method.__dict__:
|
||||
start_args = method.__dict__[START_ARGS] + " " + start_args
|
||||
method.__dict__[START_ARGS] = start_args
|
||||
if IMPALAD_ARGS in method.__dict__:
|
||||
method.__dict__[ADMISSIOND_ARGS] = method.__dict__[IMPALAD_ARGS]
|
||||
super(TestAdmissionControllerStress, self).setup_method(method)
|
||||
|
||||
Reference in New Issue
Block a user