Repository: incubator-impala Updated Branches: refs/heads/master a46b73191 -> 723724108
IMPALA-3790: Fix admission control flaky stress test In addition to a previous change which extended the admission control test timeouts for code coverage jobs, the tests with high concurrency are still experiencing timeouts in the admission control queues (which is different from the timeouts that were set on the test cases). Rather than extend the timeouts on the queues as well (which would increase the already ridiculously long test time ~2hrs), this limits the number of concurrent queries that are submitted with code coverage. Change-Id: Id62f7603f1174aa02469c6ca57513c3f1fa1e221 Reviewed-on: http://gerrit.cloudera.org:8080/3861 Reviewed-by: Tim Armstrong <[email protected]> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/72372410 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/72372410 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/72372410 Branch: refs/heads/master Commit: 7237241087dcee4ff2367d56c166257be859dea9 Parents: a46b731 Author: Matthew Jacobs <[email protected]> Authored: Mon Aug 8 11:12:17 2016 -0700 Committer: Internal Jenkins <[email protected]> Committed: Tue Aug 9 02:58:02 2016 +0000 ---------------------------------------------------------------------- tests/custom_cluster/test_admission_controller.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/72372410/tests/custom_cluster/test_admission_controller.py ---------------------------------------------------------------------- diff --git a/tests/custom_cluster/test_admission_controller.py b/tests/custom_cluster/test_admission_controller.py index 0983b20..60dec93 100644 --- a/tests/custom_cluster/test_admission_controller.py +++ b/tests/custom_cluster/test_admission_controller.py @@ -11,7 +11,7 @@ from time import sleep, time from tests.beeswax.impala_beeswax import ImpalaBeeswaxException from tests.common.custom_cluster_test_suite import CustomClusterTestSuite -from tests.common.environ import specific_build_type_timeout +from tests.common.environ import specific_build_type_timeout, IMPALAD_BUILD from tests.common.impala_test_suite import ImpalaTestSuite from tests.common.test_dimensions import ( create_single_exec_option_dimension, @@ -329,15 +329,23 @@ class TestAdmissionControllerStress(TestAdmissionControllerBase): cls.TestMatrix.add_dimension(TestDimension('num_queries', *NUM_QUERIES)) cls.TestMatrix.add_dimension( TestDimension('round_robin_submission', *ROUND_ROBIN_SUBMISSION)) - cls.TestMatrix.add_dimension( TestDimension('submission_delay_ms', *SUBMISSION_DELAY_MS)) - if cls.exploration_strategy() == 'core': + + # Additional constraints for code coverage jobs and core. + num_queries = None + if IMPALAD_BUILD.has_code_coverage(): + # Code coverage builds can't handle the increased concurrency. + num_queries = 15 + elif cls.exploration_strategy() == 'core': + num_queries = 30 cls.TestMatrix.add_constraint(lambda v: v.get_value('submission_delay_ms') == 0) - cls.TestMatrix.add_constraint(lambda v: v.get_value('num_queries') == 30) cls.TestMatrix.add_constraint(\ lambda v: v.get_value('round_robin_submission') == True) + if num_queries is not None: + cls.TestMatrix.add_constraint(lambda v: v.get_value('num_queries') == num_queries) + def setup(self): # All threads are stored in this list and it's used just to make sure we clean up # properly in teardown.
