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

Mention node name in error messages to ease log filtering

This commit is contained in:
Sergey Dudoladov 2018-09-18 15:12:17 +02:00
parent 2df8d522af
commit 85e8dea086
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/node.go
View File

@ -106,7 +106,7 @@ func (c *Controller) moveMasterPodsOffNode(node *v1.Node) {
role, ok := pod.Labels[c.opConfig.PodRoleLabel] role, ok := pod.Labels[c.opConfig.PodRoleLabel]
if !ok { if !ok {
unmovableMasterPods[podName] = fmt.Sprintf("could not move pod %q: pod has no role label %q", podName, c.opConfig.PodRoleLabel) unmovableMasterPods[podName] = fmt.Sprintf("could not move pod %q from node %q: pod has no role label %q", podName, nodeName, c.opConfig.PodRoleLabel)
continue continue
} }
@ -120,7 +120,7 @@ func (c *Controller) moveMasterPodsOffNode(node *v1.Node) {
cl, ok := c.clusters[clusterName] cl, ok := c.clusters[clusterName]
c.clustersMu.RUnlock() c.clustersMu.RUnlock()
if !ok { if !ok {
unmovableMasterPods[podName] = fmt.Sprintf("could not move pod %q: pod belongs to the unknown Postgres cluster %q", podName, clusterName) unmovableMasterPods[podName] = fmt.Sprintf("could not move pod %q from node %q: pod belongs to the unknown Postgres cluster %q", podName, nodeName, clusterName)
continue continue
} }
@ -139,7 +139,7 @@ func (c *Controller) moveMasterPodsOffNode(node *v1.Node) {
podName := util.NameFromMeta(pod.ObjectMeta) podName := util.NameFromMeta(pod.ObjectMeta)
if err := cl.MigrateMasterPod(podName); err != nil { if err := cl.MigrateMasterPod(podName); err != nil {
unmovableMasterPods[podName] = fmt.Sprintf("could not move master pod %q: %v", podName, err) unmovableMasterPods[podName] = fmt.Sprintf("could not move master pod %q from node %q: %v", podName, nodeName, err)
} else { } else {
movedPods++ movedPods++
} }