You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by bo...@apache.org on 2019/08/27 12:19:19 UTC
[impala] 03/04: IMPALA-8760: Disable TestAdmissionControllerStress
tests for CentOS 6
This is an automated email from the ASF dual-hosted git repository.
boroknagyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 0018b710f46f6f8551bf356225add8a12817a82f
Author: Bikramjeet Vig <bi...@cloudera.com>
AuthorDate: Thu Aug 22 11:43:09 2019 -0700
IMPALA-8760: Disable TestAdmissionControllerStress tests for CentOS 6
This test is tuned for certain timing which makes it flaky when run on
CentOS 6 where that timing is a bit off. Since this is not providing any
additional coverage by running on a different OS, it'll be disabled for
CentOS 6.
Change-Id: If63799f880f0883532467a00e362105a78878f17
Reviewed-on: http://gerrit.cloudera.org:8080/14124
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
tests/common/environ.py | 12 ++++++++----
tests/common/skip.py | 8 +++++++-
tests/custom_cluster/test_admission_controller.py | 6 +++++-
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/tests/common/environ.py b/tests/common/environ.py
index 36b4a8a..cbdadff 100644
--- a/tests/common/environ.py
+++ b/tests/common/environ.py
@@ -46,11 +46,15 @@ if os.path.isfile(IMPALA_LOCAL_VERSION_INFO):
raise Exception("Could not find VERSION in {0}".format(IMPALA_LOCAL_VERSION_INFO))
# Check if it is Red Hat/CentOS Linux
-dist = platform.linux_distribution()[0].lower()
-if dist.find('centos') or dist.find('red hat'):
+distribution = platform.linux_distribution()
+distname = distribution[0].lower()
+version = distribution[1]
+IS_REDHAT_6_DERIVATIVE = False
+IS_REDHAT_DERIVATIVE = False
+if distname.find('centos') or distname.find('red hat'):
IS_REDHAT_DERIVATIVE = True
-else:
- IS_REDHAT_DERIVATIVE = False
+ if len(re.findall('^6\.*', version)) > 0:
+ IS_REDHAT_6_DERIVATIVE = True
# Find the likely BuildType of the running Impala. Assume it's found through the path
# $IMPALA_HOME/be/build/latest as a fallback.
diff --git a/tests/common/skip.py b/tests/common/skip.py
index afad729..4d9911a 100644
--- a/tests/common/skip.py
+++ b/tests/common/skip.py
@@ -25,7 +25,8 @@ import pytest
from functools import partial
from tests.common.environ import (ImpalaTestClusterProperties,
- IS_DOCKERIZED_TEST_CLUSTER, IS_BUGGY_EL6_KERNEL, HIVE_MAJOR_VERSION)
+ IS_DOCKERIZED_TEST_CLUSTER, IS_BUGGY_EL6_KERNEL,
+ HIVE_MAJOR_VERSION, IS_REDHAT_6_DERIVATIVE)
from tests.common.kudu_test_suite import get_kudu_master_flag
from tests.util.filesystem_utils import (
IS_ABFS,
@@ -274,3 +275,8 @@ class SkipIfCatalogV2:
return pytest.mark.skipif(
IMPALA_TEST_CLUSTER_PROPERTIES.is_catalog_v2_cluster(),
reason="Table isn't invalidated with Local catalog and enabled hms_event_polling.")
+
+
+class SkipIfOS:
+ redhat6 = pytest.mark.skipif(IS_REDHAT_6_DERIVATIVE,
+ reason="Flaky on redhat or centos 6")
diff --git a/tests/custom_cluster/test_admission_controller.py b/tests/custom_cluster/test_admission_controller.py
index f0fd4ac..11a2316 100644
--- a/tests/custom_cluster/test_admission_controller.py
+++ b/tests/custom_cluster/test_admission_controller.py
@@ -41,7 +41,8 @@ from tests.common.skip import (
SkipIfABFS,
SkipIfADLS,
SkipIfEC,
- SkipIfNotHdfsMinicluster)
+ SkipIfNotHdfsMinicluster,
+ SkipIfOS)
from tests.common.test_dimensions import (
create_single_exec_option_dimension,
create_uncompressed_text_dimension)
@@ -1797,6 +1798,7 @@ class TestAdmissionControllerStress(TestAdmissionControllerBase):
raise thread.error
@pytest.mark.execute_serially
+ @SkipIfOS.redhat6
@CustomClusterTestSuite.with_args(
impalad_args=impalad_admission_ctrl_flags(max_requests=MAX_NUM_CONCURRENT_QUERIES,
max_queued=MAX_NUM_QUEUED_QUERIES, pool_max_mem=-1, queue_wait_timeout_ms=600000),
@@ -1812,6 +1814,7 @@ class TestAdmissionControllerStress(TestAdmissionControllerBase):
'mem_limit': sys.maxint})
@pytest.mark.execute_serially
+ @SkipIfOS.redhat6
@CustomClusterTestSuite.with_args(
impalad_args=impalad_admission_ctrl_config_args(
fs_allocation_file="fair-scheduler-test2.xml",
@@ -1833,6 +1836,7 @@ class TestAdmissionControllerStress(TestAdmissionControllerBase):
return limit_metrics[0]
@pytest.mark.execute_serially
+ @SkipIfOS.redhat6
@CustomClusterTestSuite.with_args(
impalad_args=impalad_admission_ctrl_flags(
max_requests=MAX_NUM_CONCURRENT_QUERIES * 30, max_queued=MAX_NUM_QUEUED_QUERIES,