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

wait after restart outside of function

This commit is contained in:
Felix Kunde 2021-08-09 15:21:14 +02:00
parent d1edb11041
commit d13b02d6ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cluster/k8sres_test.go
View File

@ -505,6 +505,7 @@ func TestCloneEnv(t *testing.T) {
var cluster = New( var cluster = New(
Config{ Config{
OpConfig: config.Config{ OpConfig: config.Config{
AWSRegion: "test-region",
WALES3Bucket: "wale-bucket", WALES3Bucket: "wale-bucket",
ProtectedRoles: []string{"admin"}, ProtectedRoles: []string{"admin"},
Auth: config.Auth{ Auth: config.Auth{

8
pkg/cluster/sync.go
View File

@ -422,11 +422,12 @@ func (c *Cluster) syncStatefulSet() error {
masterPod = &pods[i] masterPod = &pods[i]
continue continue
} }
c.restartInstance(&pod, ttl) c.restartInstance(&pod)
time.Sleep(time.Duration(ttl) * time.Second)
} }
if masterPod != nil { if masterPod != nil {
c.restartInstance(masterPod, ttl) c.restartInstance(masterPod)
} }
} }
@ -443,7 +444,7 @@ func (c *Cluster) syncStatefulSet() error {
return nil return nil
} }
func (c *Cluster) restartInstance(pod *v1.Pod, ttl int32) { func (c *Cluster) restartInstance(pod *v1.Pod) {
podName := util.NameFromMeta(pod.ObjectMeta) podName := util.NameFromMeta(pod.ObjectMeta)
role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel]) role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel])
@ -454,7 +455,6 @@ func (c *Cluster) restartInstance(pod *v1.Pod, ttl int32) {
return return
} }
time.Sleep(time.Duration(ttl) * time.Second)
c.logger.Debugf("Postgres server successfuly restarted in %s pod %s", role, podName) c.logger.Debugf("Postgres server successfuly restarted in %s pod %s", role, podName)
c.eventRecorder.Event(c.GetReference(), v1.EventTypeNormal, "Update", fmt.Sprintf("Postgres server restart done for %s pod %s", role, pod.Name)) c.eventRecorder.Event(c.GetReference(), v1.EventTypeNormal, "Update", fmt.Sprintf("Postgres server restart done for %s pod %s", role, pod.Name))
} }