public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

address review

This commit is contained in:
Sergey Dudoladov 2020-03-31 17:54:41 +02:00
parent 901901fb05
commit 617c2a2191
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
e2e/tests/test_e2e.py
View File

@ -221,24 +221,26 @@ class EndToEndTestCase(unittest.TestCase):
pod1 = "acid-minimal-cluster-1" pod1 = "acid-minimal-cluster-1"
# enable lazy update # enable lazy update
conf_image = "registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16"
patch_lazy_spilo_upgrade = { patch_lazy_spilo_upgrade = {
"data": { "data": {
"enable_lazy_spilo_upgrade": "true", "enable_lazy_spilo_upgrade": "true",
"docker_image": "registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16" "docker_image": conf_image
} }
} }
k8s.update_config(patch_lazy_spilo_upgrade) k8s.update_config(patch_lazy_spilo_upgrade)
# wait for sts update
time.sleep(60)
# restart the pod to get a container with the new image # restart the pod to get a container with the new image
k8s.api.core_v1.delete_namespaced_pod(pod0, "default") k8s.api.core_v1.delete_namespaced_pod(pod0, "default")
time.sleep(60) k8s.wait_for_pod_start('spilo-role=replica')
# sanity check: restarted pod runs the image specified in operator's conf
new_image = k8s.get_effective_pod_image(pod0)
self.assertEqual(conf_image, new_image,
"Lazy updated failed: restarted pod runs image {} different from the one in operator conf {}".format(new_image, conf_image))
# lazy update works if the restarted pod and older pods have different Spilo versions # lazy update works if the restarted pod and older pods have different Spilo versions
# i.e. the update did not immediately affect all pods # i.e. the update did not immediately affect all pods
new_image = k8s.get_effective_pod_image(pod0)
old_image = k8s.get_effective_pod_image(pod1) old_image = k8s.get_effective_pod_image(pod1)
self.assertNotEqual(old_image, new_image, "Lazy updated failed: pods have the same image {}".format(new_image)) self.assertNotEqual(old_image, new_image, "Lazy updated failed: pods have the same image {}".format(new_image))

6
pkg/cluster/sync.go
View File

@ -253,10 +253,6 @@ func (c *Cluster) syncPodDisruptionBudget(isUpdate bool) error {
func (c *Cluster) mustUpdatePodsAfterLazyUpdate(desiredSset *appsv1.StatefulSet) (bool, error) { func (c *Cluster) mustUpdatePodsAfterLazyUpdate(desiredSset *appsv1.StatefulSet) (bool, error) {
if c.OpConfig.EnableLazySpiloUpgrade {
return false, nil
}
pods, err := c.listPods() pods, err := c.listPods()
if err != nil { if err != nil {
return false, fmt.Errorf("could not list pods of the statefulset: %v", err) return false, fmt.Errorf("could not list pods of the statefulset: %v", err)
@ -356,7 +352,7 @@ func (c *Cluster) syncStatefulSet() error {
} }
} }
if !podsRollingUpdateRequired { if !podsRollingUpdateRequired && !c.OpConfig.EnableLazySpiloUpgrade {
// even if desired and actual statefulsets match // even if desired and actual statefulsets match
// there still may be not up-to-date pods on condition // there still may be not up-to-date pods on condition
// (a) the lazy update was just disabled // (a) the lazy update was just disabled