From 6b236c407e10cba13e2041f11459709852b66cc6 Mon Sep 17 00:00:00 2001 From: Kavinder Dhaliwal Date: Thu, 28 Sep 2017 15:21:19 -0700 Subject: [PATCH] Force Runaway Query test restarts The runaway query TINC tests occasionally encounter issues where a gpstop -ar is not successfull because of open connections. This commit ensures that at the least gpstop will always restart gpdb. Signed-off-by: Ekta Khanna --- .../runaway_query/runaway_detector/test_runaway_detector.py | 4 ++-- .../runaway_query/runaway_query_limits/test_runaway_query.py | 4 ++-- .../runaway_query_multisession/test_runaway_multisession.py | 4 ++-- .../runaway_query/runaway_query_scenario/__init__.py | 4 ++-- .../test_runaway_query_vmem_memoryaccounting.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_detector/test_runaway_detector.py b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_detector/test_runaway_detector.py index 36961f81f2..bb320b5465 100644 --- a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_detector/test_runaway_detector.py +++ b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_detector/test_runaway_detector.py @@ -18,7 +18,7 @@ def _set_VLIM_SLIM_REDZONEPERCENT(vlimMB, slimMB, activationPercent): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) def _reset_VLIM_SLIM_REDZONEPERCENT(): @@ -32,7 +32,7 @@ def _reset_VLIM_SLIM_REDZONEPERCENT(): 'source $GPHOME/greenplum_path.sh;gpconfig -r runaway_detector_activation_percent --skipvalidation').run(validateAfter=True) # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) class RunawayDetectorTestCase(SQLIsolationTestCase): """ diff --git a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_limits/test_runaway_query.py b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_limits/test_runaway_query.py index 913d9b4947..0f25a1e63c 100644 --- a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_limits/test_runaway_query.py +++ b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_limits/test_runaway_query.py @@ -18,7 +18,7 @@ def _set_VLIM_SLIM_REDZONEPERCENT(vlimMB, slimMB, activationPercent): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) def _reset_VLIM_SLIM_REDZONEPERCENT(): @@ -32,7 +32,7 @@ def _reset_VLIM_SLIM_REDZONEPERCENT(): 'source $GPHOME/greenplum_path.sh;gpconfig -r runaway_detector_activation_percent --skipvalidation').run(validateAfter=True) # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) class RunawayQueryTestCase(SQLTestCase): diff --git a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_multisession/test_runaway_multisession.py b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_multisession/test_runaway_multisession.py index e685ea83a1..3961ebbd64 100644 --- a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_multisession/test_runaway_multisession.py +++ b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_multisession/test_runaway_multisession.py @@ -18,7 +18,7 @@ def _set_VLIM_SLIM_REDZONEPERCENT(vlimMB, slimMB, activationPercent): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) def _reset_VLIM_SLIM_REDZONEPERCENT(): @@ -32,7 +32,7 @@ def _reset_VLIM_SLIM_REDZONEPERCENT(): 'source $GPHOME/greenplum_path.sh;gpconfig -r runaway_detector_activation_percent --skipvalidation').run(validateAfter=True) # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) class RunawayMultiSessionTestCase(SQLIsolationTestCase): diff --git a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_scenario/__init__.py b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_scenario/__init__.py index 8d7ccb64df..985b9f35b2 100644 --- a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_scenario/__init__.py +++ b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_scenario/__init__.py @@ -16,7 +16,7 @@ def _set_VLIM_SLIM_REDZONEPERCENT(vlimMB, slimMB, activationPercent): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) def _reset_VLIM_SLIM_REDZONEPERCENT(): @@ -30,7 +30,7 @@ def _reset_VLIM_SLIM_REDZONEPERCENT(): 'source $GPHOME/greenplum_path.sh;gpconfig -r runaway_detector_activation_percent --skipvalidation').run(validateAfter=True) # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) class RQTBaseScenarioTestCase(ScenarioTestCase): diff --git a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_vmem_memoryaccounting/test_runaway_query_vmem_memoryaccounting.py b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_vmem_memoryaccounting/test_runaway_query_vmem_memoryaccounting.py index 7e72c80341..1a81276c3d 100644 --- a/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_vmem_memoryaccounting/test_runaway_query_vmem_memoryaccounting.py +++ b/src/test/tinc/tincrepo/resource_management/runaway_query/runaway_query_vmem_memoryaccounting/test_runaway_query_vmem_memoryaccounting.py @@ -17,7 +17,7 @@ def _set_VLIM_SLIM(vlimMB, slimMB): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) def _reset_VLIM_SLIM(): @@ -30,7 +30,7 @@ def _reset_VLIM_SLIM(): # Restart DB Command('Restart database for GUCs to take effect', - 'source $GPHOME/greenplum_path.sh && gpstop -ar').run(validateAfter=True) + 'source $GPHOME/greenplum_path.sh && gpstop -air').run(validateAfter=True) class RQTMemoryAccountingTestCase(SQLIsolationTestCase): -- GitLab