Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postgres-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
zalando
postgres-operator
Commits
89163e70
Commit
89163e70
authored
Jun 5, 2019
by
Felix Kunde
Browse files
Options
Downloads
Patches
Plain Diff
update signature for getting nodes of pg cluster
parent
27276bd9
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
e2e/tests/test_e2e.py
+5
-5
5 additions, 5 deletions
e2e/tests/test_e2e.py
with
5 additions
and
5 deletions
e2e/tests/test_e2e.py
+
5
−
5
View file @
89163e70
...
...
@@ -97,10 +97,10 @@ class EndToEndTestCase(unittest.TestCase):
Add taint
"
postgres=:NoExecute
"
to node with master. This must cause a failover.
"""
k8s
=
self
.
k8s
label
s
=
'
version=acid-minimal-cluster
'
cluster_
label
=
'
version=acid-minimal-cluster
'
# get nodes of master and replica(s) (expected target of new master)
current_master_node
,
failover_targets
=
k8s
.
get_
spilo
_nodes
(
label
s
)
current_master_node
,
failover_targets
=
k8s
.
get_
pg
_nodes
(
cluster_
label
)
num_replicas
=
len
(
failover_targets
)
# if all pods live on the same node, failover will happen to other worker(s)
...
...
@@ -128,7 +128,7 @@ class EndToEndTestCase(unittest.TestCase):
k8s
.
wait_for_master_failover
(
failover_targets
)
k8s
.
wait_for_pod_start
(
'
spilo-role=replica
'
)
new_master_node
,
new_replica_nodes
=
k8s
.
get_
spilo
_nodes
(
label
s
)
new_master_node
,
new_replica_nodes
=
k8s
.
get_
pg
_nodes
(
cluster_
label
)
self
.
assertNotEqual
(
current_master_node
,
new_master_node
,
"
Master on {} did not fail over to one of {}
"
.
format
(
current_master_node
,
failover_targets
))
self
.
assertEqual
(
num_replicas
,
len
(
new_replica_nodes
),
...
...
@@ -251,10 +251,10 @@ class K8s:
def
__init__
(
self
):
self
.
api
=
K8sApi
()
def
get_
spilo
_nodes
(
self
,
p
od_labels
,
namespace
=
'
default
'
):
def
get_
pg
_nodes
(
self
,
p
g_cluster_name
,
namespace
=
'
default
'
):
master_pod_node
=
''
replica_pod_nodes
=
[]
podsList
=
self
.
api
.
core_v1
.
list_namespaced_pod
(
namespace
,
label_selector
=
p
od_labels
)
podsList
=
self
.
api
.
core_v1
.
list_namespaced_pod
(
namespace
,
label_selector
=
p
g_cluster_name
)
for
pod
in
podsList
.
items
:
if
pod
.
metadata
.
labels
.
get
(
'
spilo-role
'
)
==
'
master
'
:
master_pod_node
=
pod
.
spec
.
node_name
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment