public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-10 01:26:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix error messages (#27)

Browse Source 
Use lowercase for kubernetes objects
Use %v instead of %s for errors
Start error messages with a lowercase letter.
This commit is contained in:
Oleksii Kliukin
2017-05-22 14:12:06 +02:00
committed by GitHub
parent 8beb5936b1
commit afce38f6f0
16 changed files with 187 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/pod.go
+19 -19
View File
@@ -18,7 +18,7 @@ func (c *Cluster) listPods() ([]v1.Pod, error) {
pods, err := c.KubeClient.Pods(ns).List(listOptions)
if err != nil {
return nil, fmt.Errorf("Can't get list of Pods: %s", err)
return nil, fmt.Errorf("could not get list of pods: %v", err)
}
return pods.Items, nil
@@ -32,13 +32,13 @@ func (c *Cluster) listPersistentVolumeClaims() ([]v1.PersistentVolumeClaim, erro
pvcs, err := c.KubeClient.PersistentVolumeClaims(ns).List(listOptions)
if err != nil {
return nil, fmt.Errorf("Can't get list of PersistentVolumeClaims: %s", err)
return nil, fmt.Errorf("could not get list of PersistentVolumeClaims: %v", err)
}
return pvcs.Items, nil
}
func (c *Cluster) deletePods() error {
c.logger.Debugln("Deleting Pods")
c.logger.Debugln("Deleting pods")
pods, err := c.listPods()
if err != nil {
return err
@@ -47,17 +47,17 @@ func (c *Cluster) deletePods() error {
for _, obj := range pods {
podName := util.NameFromMeta(obj.ObjectMeta)
c.logger.Debugf("Deleting Pod '%s'", podName)
c.logger.Debugf("Deleting pod '%s'", podName)
if err := c.deletePod(podName); err != nil {
c.logger.Errorf("Can't delete Pod '%s': %s", podName, err)
c.logger.Errorf("could not delete pod '%s': %s", podName, err)
} else {
c.logger.Infof("Pod '%s' has been deleted", podName)
c.logger.Infof("pod '%s' has been deleted", podName)
}
}
if len(pods) > 0 {
c.logger.Debugln("Pods have been deleted")
c.logger.Debugln("pods have been deleted")
} else {
c.logger.Debugln("No Pods to delete")
c.logger.Debugln("No pods to delete")
}
return nil
@@ -73,7 +73,7 @@ func (c *Cluster) deletePersistenVolumeClaims() error {
for _, pvc := range pvcs {
c.logger.Debugf("Deleting PVC '%s'", util.NameFromMeta(pvc.ObjectMeta))
if err := c.KubeClient.PersistentVolumeClaims(ns).Delete(pvc.Name, c.deleteOptions); err != nil {
c.logger.Warningf("Can't delete PersistentVolumeClaim: %s", err)
c.logger.Warningf("could not delete PersistentVolumeClaim: %v", err)
}
}
if len(pvcs) > 0 {
@@ -105,7 +105,7 @@ func (c *Cluster) unregisterPodSubscriber(podName spec.NamespacedName) {
defer c.podSubscribersMu.Unlock()
if _, ok := c.podSubscribers[podName]; !ok {
panic("Subscriber for Pod '" + podName.String() + "' is not found")
panic("Subscriber for pod '" + podName.String() + "' is not found")
}
close(c.podSubscribers[podName])
@@ -118,7 +118,7 @@ func (c *Cluster) registerPodSubscriber(podName spec.NamespacedName) chan spec.P
ch := make(chan spec.PodEvent)
if _, ok := c.podSubscribers[podName]; ok {
panic("Pod '" + podName.String() + "' is already subscribed")
panic("pod '" + podName.String() + "' is already subscribed")
}
c.podSubscribers[podName] = ch
@@ -132,7 +132,7 @@ func (c *Cluster) recreatePod(pod v1.Pod) error {
defer c.unregisterPodSubscriber(podName)
if err := c.KubeClient.Pods(pod.Namespace).Delete(pod.Name, c.deleteOptions); err != nil {
return fmt.Errorf("Can't delete Pod: %s", err)
return fmt.Errorf("could not delete pod: %v", err)
}
if err := c.waitForPodDeletion(ch); err != nil {
@@ -141,7 +141,7 @@ func (c *Cluster) recreatePod(pod v1.Pod) error {
if err := c.waitForPodLabel(ch); err != nil {
return err
}
c.logger.Infof("Pod '%s' is ready", podName)
c.logger.Infof("pod '%s' is ready", podName)
return nil
}
@@ -173,9 +173,9 @@ func (c *Cluster) recreatePods() error {
pods, err := c.KubeClient.Pods(namespace).List(listOptions)
if err != nil {
return fmt.Errorf("Can't get the list of Pods: %s", err)
return fmt.Errorf("could not get the list of pods: %v", err)
}
c.logger.Infof("There are %d Pods in the cluster to recreate", len(pods.Items))
c.logger.Infof("There are %d pods in the cluster to recreate", len(pods.Items))
var masterPod v1.Pod
for _, pod := range pods.Items {
@@ -187,19 +187,19 @@ func (c *Cluster) recreatePods() error {
}
if err := c.recreatePod(pod); err != nil {
return fmt.Errorf("Can't recreate replica Pod '%s': %s", util.NameFromMeta(pod.ObjectMeta), err)
return fmt.Errorf("could not recreate replica pod '%s': %v", util.NameFromMeta(pod.ObjectMeta), err)
}
}
if masterPod.Name == "" {
c.logger.Warningln("No master Pod in the cluster")
c.logger.Warningln("No master pod in the cluster")
}
//TODO: do manual failover
//TODO: specify master, leave new master empty
c.logger.Infof("Recreating master Pod '%s'", util.NameFromMeta(masterPod.ObjectMeta))
c.logger.Infof("Recreating master pod '%s'", util.NameFromMeta(masterPod.ObjectMeta))
if err := c.recreatePod(masterPod); err != nil {
return fmt.Errorf("Can't recreate master Pod '%s': %s", util.NameFromMeta(masterPod.ObjectMeta), err)
return fmt.Errorf("could not recreate master pod '%s': %v", util.NameFromMeta(masterPod.ObjectMeta), err)
}
return nil