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

Skip deleting PVCs on Update

This commit is contained in:
Sergey Dudoladov 2020-04-08 07:17:41 +02:00
parent 38417b589b
commit ff48ba94ff
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
e2e/tests/test_e2e.py
View File

@ -516,20 +516,11 @@ class EndToEndTestCase(unittest.TestCase):
self.assert_running_pods_have_volumes() self.assert_running_pods_have_volumes()
# Update() deletes pvc on scale down
# we do not use wait_for_pg_to_scale here because it waits until a pod is completely gone
# we want to capture a potential situation where a pod is in Terminating state
# but its pvc is already being deleted
# TODO that needs a more thourough test at the DB level
k8s.change_number_of_instances(1)
k8s.wait_for_pvc_deletion("pgdata-acid-minimal-cluster-1")
self.assert_running_pods_have_volumes()
# pvc with index 0 must stay around when cluster has 0 pods # pvc with index 0 must stay around when cluster has 0 pods
last_pvc_name = "pgdata-acid-minimal-cluster-0" last_pvc_name = "pgdata-acid-minimal-cluster-0"
volume_before_scaledown = k8s.get_volume_name(last_pvc_name) volume_before_scaledown = k8s.get_volume_name(last_pvc_name)
k8s.wait_for_pg_to_scale(0) k8s.wait_for_pg_to_scale(0)
k8s.update_config(patch) # force a Sync to delete unused PVCs
self.assertTrue(k8s.pvc_exist(last_pvc_name), "The last pvc was deleted") self.assertTrue(k8s.pvc_exist(last_pvc_name), "The last pvc was deleted")
# sanity check # sanity check
@ -539,6 +530,8 @@ class EndToEndTestCase(unittest.TestCase):
volume_after_scaleup, volume_after_scaleup,
"the surviving pvc must have the same volume before scale down to 0 and after scale up") "the surviving pvc must have the same volume before scale down to 0 and after scale up")
self.assert_running_pods_have_volumes()
# clean up # clean up
patch = { patch = {
"data": { "data": {

4
pkg/cluster/cluster.go
View File

@ -678,10 +678,6 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
} }
}() }()
if c.OpConfig.EnableUnusedPVCDeletion && oldSpec.Spec.NumberOfInstances > newSpec.Spec.NumberOfInstances {
c.deleteUnusedPersistentVolumeClaims()
}
// pod disruption budget // pod disruption budget
if oldSpec.Spec.NumberOfInstances != newSpec.Spec.NumberOfInstances { if oldSpec.Spec.NumberOfInstances != newSpec.Spec.NumberOfInstances {
c.logger.Debug("syncing pod disruption budgets") c.logger.Debug("syncing pod disruption budgets")