public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 23:42:02 +02:00
Code Issues Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
Sergey Dudoladov
2020-04-01 13:48:06 +02:00
parent 63fbab20af b43b22dfcc
commit 1182c17963
35 changed files with 669 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/tests/test_e2e.py
+13 -13
View File
@@ -71,32 +71,32 @@ class EndToEndTestCase(unittest.TestCase):
raise
@timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_enable_disable_connection_pool(self):
def test_enable_disable_connection_pooler(self):
'''
For a database without connection pool, then turns it on, scale up,
For a database without connection pooler, then turns it on, scale up,
turn off and on again. Test with different ways of doing this (via
enableConnectionPool or connectionPool configuration section). At the
end turn the connection pool off to not interfere with other tests.
enableConnectionPooler or connectionPooler configuration section). At
the end turn connection pooler off to not interfere with other tests.
'''
k8s = self.k8s
service_labels = {
'cluster-name': 'acid-minimal-cluster',
}
pod_labels = dict({
'connection-pool': 'acid-minimal-cluster-pooler',
'connection-pooler': 'acid-minimal-cluster-pooler',
})
pod_selector = to_selector(pod_labels)
service_selector = to_selector(service_labels)
try:
# enable connection pool
# enable connection pooler
k8s.api.custom_objects_api.patch_namespaced_custom_object(
'acid.zalan.do', 'v1', 'default',
'postgresqls', 'acid-minimal-cluster',
{
'spec': {
'enableConnectionPool': True,
'enableConnectionPooler': True,
}
})
k8s.wait_for_pod_start(pod_selector)
@@ -105,7 +105,7 @@ class EndToEndTestCase(unittest.TestCase):
'default', label_selector=pod_selector
).items
self.assertTrue(pods, 'No connection pool pods')
self.assertTrue(pods, 'No connection pooler pods')
k8s.wait_for_service(service_selector)
services = k8s.api.core_v1.list_namespaced_service(
@@ -116,15 +116,15 @@ class EndToEndTestCase(unittest.TestCase):
if s.metadata.name.endswith('pooler')
]
self.assertTrue(services, 'No connection pool service')
self.assertTrue(services, 'No connection pooler service')
# scale up connection pool deployment
# scale up connection pooler deployment
k8s.api.custom_objects_api.patch_namespaced_custom_object(
'acid.zalan.do', 'v1', 'default',
'postgresqls', 'acid-minimal-cluster',
{
'spec': {
'connectionPool': {
'connectionPooler': {
'numberOfInstances': 2,
},
}
@@ -138,7 +138,7 @@ class EndToEndTestCase(unittest.TestCase):
'postgresqls', 'acid-minimal-cluster',
{
'spec': {
'enableConnectionPool': False,
'enableConnectionPooler': False,
}
})
k8s.wait_for_pods_to_stop(pod_selector)
@@ -148,7 +148,7 @@ class EndToEndTestCase(unittest.TestCase):
'postgresqls', 'acid-minimal-cluster',
{
'spec': {
'enableConnectionPool': True,
'enableConnectionPooler': True,
}
})
k8s.wait_for_pod_start(pod_selector)