From da2021e9ceba6e342b2f69cbab10de8469c42ffd Mon Sep 17 00:00:00 2001
From: Jan Mussler <janm81@gmail.com>
Date: Mon, 7 Jan 2019 17:27:03 +0100
Subject: [PATCH] Failover to switchover.
---
pkg/cluster/cluster.go | 8 ++++----
pkg/cluster/pod.go | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 7eaa873f..93a67226 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -12,7 +12,7 @@ import (
"github.com/sirupsen/logrus"
"k8s.io/api/apps/v1beta1"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
policybeta1 "k8s.io/api/policy/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@@ -877,7 +877,7 @@ func (c *Cluster) GetStatus() *ClusterStatus {
func (c *Cluster) Switchover(curMaster *v1.Pod, candidate spec.NamespacedName) error {
var err error
- c.logger.Debugf("failing over from %q to %q", curMaster.Name, candidate)
+ c.logger.Debugf("switching over from %q to %q", curMaster.Name, candidate)
var wg sync.WaitGroup
@@ -903,12 +903,12 @@ func (c *Cluster) Switchover(curMaster *v1.Pod, candidate spec.NamespacedName) e
}()
if err = c.patroni.Switchover(curMaster, candidate.Name); err == nil {
- c.logger.Debugf("successfully failed over from %q to %q", curMaster.Name, candidate)
+ c.logger.Debugf("successfully switched over from %q to %q", curMaster.Name, candidate)
if err = <-podLabelErr; err != nil {
err = fmt.Errorf("could not get master pod label: %v", err)
}
} else {
- err = fmt.Errorf("could not failover: %v", err)
+ err = fmt.Errorf("could not switch over: %v", err)
}
// signal the role label waiting goroutine to close the shop and go home
diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go
index 21a7977c..f06d8230 100644
--- a/pkg/cluster/pod.go
+++ b/pkg/cluster/pod.go
@@ -219,10 +219,10 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
// We may not have a cached statefulset if the initial cluster sync has aborted, revert to the spec in that case.
if *c.Statefulset.Spec.Replicas > 1 {
if masterCandidatePod, err = c.masterCandidate(oldMaster.Spec.NodeName); err != nil {
- return fmt.Errorf("could not suitable replica candidate for failover: %v", err)
+ return fmt.Errorf("could not find suitable replica pod as candidate for failover: %v", err)
}
} else {
- c.logger.Warningf("migrating single pod cluster %q, migration will cause longer downtime of the postgres cluster until rescheduled", c.clusterName())
+ c.logger.Warningf("migrating single pod cluster %q, this will cause downtime of the Postgres cluster until pod is back", c.clusterName())
}
// there are two cases for each postgres cluster that has its master pod on the node to migrate from:
--
GitLab