public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-01 00:26:10 +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/cluster.go
+35 -35
View File
@@ -104,7 +104,7 @@ func (c *Cluster) setStatus(status spec.PostgresStatus) {
c.Status = status
b, err := json.Marshal(status)
if err != nil {
c.logger.Fatalf("Can't marshal status: %s", err)
c.logger.Fatalf("could not marshal status: %v", err)
}
request := []byte(fmt.Sprintf(`{"status": %s}`, string(b))) //TODO: Look into/wait for k8s go client methods
@@ -114,12 +114,12 @@ func (c *Cluster) setStatus(status spec.PostgresStatus) {
DoRaw()
if k8sutil.ResourceNotFound(err) {
c.logger.Warningf("Can't set status for the non-existing cluster")
c.logger.Warningf("could not set status for the non-existing cluster")
return
}
if err != nil {
c.logger.Warningf("Can't set status for cluster '%s': %s", c.ClusterName(), err)
c.logger.Warningf("could not set status for cluster '%s': %s", c.ClusterName(), err)
}
}
@@ -127,15 +127,15 @@ func (c *Cluster) initUsers() error {
c.initSystemUsers()
if err := c.initInfrastructureRoles(); err != nil {
return fmt.Errorf("Can't init infrastructure roles: %s", err)
return fmt.Errorf("could not init infrastructure roles: %v", err)
}
if err := c.initRobotUsers(); err != nil {
return fmt.Errorf("Can't init robot users: %s", err)
return fmt.Errorf("could not init robot users: %v", err)
}
if err := c.initHumanUsers(); err != nil {
return fmt.Errorf("Can't init human users: %s", err)
return fmt.Errorf("could not init human users: %v", err)
}
c.logger.Debugf("Initialized users: %# v", util.Pretty(c.pgUsers))
@@ -166,15 +166,15 @@ func (c *Cluster) Create(stopCh <-chan struct{}) error {
//TODO: service will create endpoint implicitly
ep, err := c.createEndpoint()
if err != nil {
return fmt.Errorf("Can't create Endpoint: %s", err)
return fmt.Errorf("could not create endpoint: %v", err)
}
c.logger.Infof("Endpoint '%s' has been successfully created", util.NameFromMeta(ep.ObjectMeta))
c.logger.Infof("endpoint '%s' has been successfully created", util.NameFromMeta(ep.ObjectMeta))
service, err := c.createService()
if err != nil {
return fmt.Errorf("Can't create Service: %s", err)
return fmt.Errorf("could not create service: %v", err)
}
c.logger.Infof("Service '%s' has been successfully created", util.NameFromMeta(service.ObjectMeta))
c.logger.Infof("service '%s' has been successfully created", util.NameFromMeta(service.ObjectMeta))
if err = c.initUsers(); err != nil {
return err
@@ -182,15 +182,15 @@ func (c *Cluster) Create(stopCh <-chan struct{}) error {
c.logger.Infof("User secrets have been initialized")
if err = c.applySecrets(); err != nil {
return fmt.Errorf("Can't create Secrets: %s", err)
return fmt.Errorf("could not create secrets: %v", err)
}
c.logger.Infof("Secrets have been successfully created")
c.logger.Infof("secrets have been successfully created")
ss, err := c.createStatefulSet()
if err != nil {
return fmt.Errorf("Can't create StatefulSet: %s", err)
return fmt.Errorf("could not create statefulset: %v", err)
}
c.logger.Infof("StatefulSet '%s' has been successfully created", util.NameFromMeta(ss.ObjectMeta))
c.logger.Infof("statefulset '%s' has been successfully created", util.NameFromMeta(ss.ObjectMeta))
c.logger.Info("Waiting for cluster being ready")
@@ -198,14 +198,14 @@ func (c *Cluster) Create(stopCh <-chan struct{}) error {
c.logger.Errorf("Failed to create cluster: %s", err)
return err
}
c.logger.Infof("Pods are ready")
c.logger.Infof("pods are ready")
if !(c.masterLess || c.databaseAccessDisabled()) {
if err := c.initDbConn(); err != nil {
return fmt.Errorf("Can't init db connection: %s", err)
return fmt.Errorf("could not init db connection: %v", err)
}
if err = c.createUsers(); err != nil {
return fmt.Errorf("Can't create users: %s", err)
return fmt.Errorf("could not create users: %v", err)
}
c.logger.Infof("Users have been successfully created")
} else {
@@ -216,7 +216,7 @@ func (c *Cluster) Create(stopCh <-chan struct{}) error {
err = c.ListResources()
if err != nil {
c.logger.Errorf("Can't list resources: %s", err)
c.logger.Errorf("could not list resources: %s", err)
}
return nil
@@ -253,7 +253,7 @@ func (c *Cluster) compareStatefulSetWith(statefulSet *v1beta1.StatefulSet) (matc
reason = "new statefulset's container specification doesn't match the current one"
}
if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 {
c.logger.Warnf("StatefulSet '%s' has no container", util.NameFromMeta(c.Statefulset.ObjectMeta))
c.logger.Warnf("statefulset '%s' has no container", util.NameFromMeta(c.Statefulset.ObjectMeta))
return
}
// In the comparisons below, the needsReplace and needsRollUpdate flags are never reset, since checks fall through
@@ -379,9 +379,9 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
c.logServiceChanges(c.Service, newService, true, reason)
if err := c.updateService(newService); err != nil {
c.setStatus(spec.ClusterStatusUpdateFailed)
return fmt.Errorf("Can't update Service: %s", err)
return fmt.Errorf("could not update service: %v", err)
}
c.logger.Infof("Service '%s' has been updated", util.NameFromMeta(c.Service.ObjectMeta))
c.logger.Infof("service '%s' has been updated", util.NameFromMeta(c.Service.ObjectMeta))
}
if match, reason := c.sameVolumeWith(newSpec.Spec.Volume); !match {
@@ -391,7 +391,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
newStatefulSet, err := c.genStatefulSet(newSpec.Spec)
if err != nil {
return fmt.Errorf("Can't generate StatefulSet: %s", err)
return fmt.Errorf("could not generate statefulset: %v", err)
}
sameSS, needsReplace, rollingUpdate, reason := c.compareStatefulSetWith(newStatefulSet)
@@ -402,16 +402,16 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
if !needsReplace {
if err := c.updateStatefulSet(newStatefulSet); err != nil {
c.setStatus(spec.ClusterStatusUpdateFailed)
return fmt.Errorf("Can't upate StatefulSet: %s", err)
return fmt.Errorf("could not upate statefulset: %v", err)
}
} else {
if err := c.replaceStatefulSet(newStatefulSet); err != nil {
c.setStatus(spec.ClusterStatusUpdateFailed)
return fmt.Errorf("Can't replace StatefulSet: %s", err)
return fmt.Errorf("could not replace statefulset: %v", err)
}
}
//TODO: if there is a change in numberOfInstances, make sure Pods have been created/deleted
c.logger.Infof("StatefulSet '%s' has been updated", util.NameFromMeta(c.Statefulset.ObjectMeta))
c.logger.Infof("statefulset '%s' has been updated", util.NameFromMeta(c.Statefulset.ObjectMeta))
}
if c.Spec.PgVersion != newSpec.Spec.PgVersion { // PG versions comparison
@@ -425,7 +425,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
// TODO: wait for actual streaming to the replica
if err := c.recreatePods(); err != nil {
c.setStatus(spec.ClusterStatusUpdateFailed)
return fmt.Errorf("Can't recreate Pods: %s", err)
return fmt.Errorf("could not recreate pods: %v", err)
}
c.logger.Infof("Rolling update has been finished")
}
@@ -439,20 +439,20 @@ func (c *Cluster) Delete() error {
defer c.mu.Unlock()
if err := c.deleteEndpoint(); err != nil {
return fmt.Errorf("Can't delete Endpoint: %s", err)
return fmt.Errorf("could not delete endpoint: %v", err)
}
if err := c.deleteService(); err != nil {
return fmt.Errorf("Can't delete Service: %s", err)
return fmt.Errorf("could not delete service: %v", err)
}
if err := c.deleteStatefulSet(); err != nil {
return fmt.Errorf("Can't delete StatefulSet: %s", err)
return fmt.Errorf("could not delete statefulset: %v", err)
}
for _, obj := range c.Secrets {
if err := c.deleteSecret(obj); err != nil {
return fmt.Errorf("Can't delete Secret: %s", err)
return fmt.Errorf("could not delete secret: %v", err)
}
}
@@ -481,12 +481,12 @@ func (c *Cluster) initSystemUsers() {
func (c *Cluster) initRobotUsers() error {
for username, userFlags := range c.Spec.Users {
if !isValidUsername(username) {
return fmt.Errorf("Invalid username: '%s'", username)
return fmt.Errorf("invalid username: '%v'", username)
}
flags, err := normalizeUserFlags(userFlags)
if err != nil {
return fmt.Errorf("Invalid flags for user '%s': %s", username, err)
return fmt.Errorf("invalid flags for user '%v': %v", username, err)
}
c.pgUsers[username] = spec.PgUser{
@@ -502,7 +502,7 @@ func (c *Cluster) initRobotUsers() error {
func (c *Cluster) initHumanUsers() error {
teamMembers, err := c.getTeamMembers()
if err != nil {
return fmt.Errorf("Can't get list of team members: %s", err)
return fmt.Errorf("could not get list of team members: %v", err)
}
for _, username := range teamMembers {
flags := []string{constants.RoleFlagLogin, constants.RoleFlagSuperuser}
@@ -517,11 +517,11 @@ func (c *Cluster) initInfrastructureRoles() error {
// add infrastucture roles from the operator's definition
for username, data := range c.InfrastructureRoles {
if !isValidUsername(username) {
return fmt.Errorf("Invalid username: '%s'", username)
return fmt.Errorf("invalid username: '%v'", username)
}
flags, err := normalizeUserFlags(data.Flags)
if err != nil {
return fmt.Errorf("Invalid flags for user '%s': %s", username, err)
return fmt.Errorf("invalid flags for user '%v': %v", username, err)
}
data.Flags = flags
c.pgUsers[username] = data
pkg/cluster/k8sres.go
+7 -7
View File
@@ -59,12 +59,12 @@ func (c *Cluster) resourceRequirements(resources spec.Resources) (*v1.ResourceRe
result.Requests, err = fillResourceList(specRequests, defaultRequests)
if err != nil {
return nil, fmt.Errorf("Can't fill resource requests: %s", err)
return nil, fmt.Errorf("could not fill resource requests: %v", err)
}
result.Limits, err = fillResourceList(specLimits, defaultLimits)
if err != nil {
return nil, fmt.Errorf("Can't fill resource limits: %s", err)
return nil, fmt.Errorf("could not fill resource limits: %v", err)
}
return &result, nil
@@ -77,23 +77,23 @@ func fillResourceList(spec spec.ResourceDescription, defaults spec.ResourceDescr
if spec.CPU != "" {
requests[v1.ResourceCPU], err = resource.ParseQuantity(spec.CPU)
if err != nil {
return nil, fmt.Errorf("Can't parse CPU quantity: %s", err)
return nil, fmt.Errorf("could not parse CPU quantity: %v", err)
}
} else {
requests[v1.ResourceCPU], err = resource.ParseQuantity(defaults.CPU)
if err != nil {
return nil, fmt.Errorf("Can't parse default CPU quantity: %s", err)
return nil, fmt.Errorf("could not parse default CPU quantity: %v", err)
}
}
if spec.Memory != "" {
requests[v1.ResourceMemory], err = resource.ParseQuantity(spec.Memory)
if err != nil {
return nil, fmt.Errorf("Can't parse memory quantity: %s", err)
return nil, fmt.Errorf("could not parse memory quantity: %v", err)
}
} else {
requests[v1.ResourceMemory], err = resource.ParseQuantity(defaults.Memory)
if err != nil {
return nil, fmt.Errorf("Can't parse default memory quantity: %s", err)
return nil, fmt.Errorf("could not parse default memory quantity: %v", err)
}
}
@@ -365,7 +365,7 @@ func persistentVolumeClaimTemplate(volumeSize, volumeStorageClass string) (*v1.P
quantity, err := resource.ParseQuantity(volumeSize)
if err != nil {
return nil, fmt.Errorf("Can't parse volume size: %s", err)
return nil, fmt.Errorf("could not parse volume size: %v", err)
}
volumeClaim := &v1.PersistentVolumeClaim{
pkg/cluster/pg.go
+2 -2
View File
@@ -62,7 +62,7 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
var rows *sql.Rows
users = make(spec.PgUserMap)
if rows, err = c.pgDb.Query(getUserSQL, pq.Array(userNames)); err != nil {
return nil, fmt.Errorf("Error when querying users: %s", err)
return nil, fmt.Errorf("error when querying users: %v", err)
}
defer rows.Close()
for rows.Next() {
@@ -74,7 +74,7 @@ func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUser
err := rows.Scan(&rolname, &rolpassword, &rolsuper, &rolinherit,
&rolcreaterole, &rolcreatedb, &rolcanlogin, pq.Array(&memberof))
if err != nil {
return nil, fmt.Errorf("Error when processing user rows: %s", err)
return nil, fmt.Errorf("error when processing user rows: %v", err)
}
flags := makeUserFlags(rolsuper, rolinherit, rolcreaterole, rolcreatedb, rolcanlogin)
// XXX: the code assumes the password we get from pg_authid is always MD5
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
pkg/cluster/resources.go
+49 -58
View File
@@ -22,42 +22,42 @@ func (c *Cluster) loadResources() error {
services, err := c.KubeClient.Services(ns).List(listOptions)
if err != nil {
return fmt.Errorf("Can't get list of Services: %s", err)
return fmt.Errorf("could not get list of services: %v", err)
}
if len(services.Items) > 1 {
return fmt.Errorf("Too many(%d) Services for a cluster", len(services.Items))
return fmt.Errorf("too many(%d) services for a cluster", len(services.Items))
} else if len(services.Items) == 1 {
c.Service = &services.Items[0]
}
endpoints, err := c.KubeClient.Endpoints(ns).List(listOptions)
if err != nil {
return fmt.Errorf("Can't get list of Endpoints: %s", err)
return fmt.Errorf("could not get list of endpoints: %v", err)
}
if len(endpoints.Items) > 1 {
return fmt.Errorf("Too many(%d) Endpoints for a cluster", len(endpoints.Items))
return fmt.Errorf("too many(%d) endpoints for a cluster", len(endpoints.Items))
} else if len(endpoints.Items) == 1 {
c.Endpoint = &endpoints.Items[0]
}
secrets, err := c.KubeClient.Secrets(ns).List(listOptions)
if err != nil {
return fmt.Errorf("Can't get list of Secrets: %s", err)
return fmt.Errorf("could not get list of secrets: %v", err)
}
for i, secret := range secrets.Items {
if _, ok := c.Secrets[secret.UID]; ok {
continue
}
c.Secrets[secret.UID] = &secrets.Items[i]
c.logger.Debugf("Secret loaded, uid: %s", secret.UID)
c.logger.Debugf("secret loaded, uid: %s", secret.UID)
}
statefulSets, err := c.KubeClient.StatefulSets(ns).List(listOptions)
if err != nil {
return fmt.Errorf("Can't get list of StatefulSets: %s", err)
return fmt.Errorf("could not get list of statefulsets: %v", err)
}
if len(statefulSets.Items) > 1 {
return fmt.Errorf("Too many(%d) StatefulSets for a cluster", len(statefulSets.Items))
return fmt.Errorf("too many(%d) statefulsets for a cluster", len(statefulSets.Items))
} else if len(statefulSets.Items) == 1 {
c.Statefulset = &statefulSets.Items[0]
}
@@ -67,33 +67,33 @@ func (c *Cluster) loadResources() error {
func (c *Cluster) ListResources() error {
if c.Statefulset != nil {
c.logger.Infof("Found StatefulSet: %s (uid: %s)", util.NameFromMeta(c.Statefulset.ObjectMeta), c.Statefulset.UID)
c.logger.Infof("Found statefulset: %s (uid: %s)", util.NameFromMeta(c.Statefulset.ObjectMeta), c.Statefulset.UID)
}
for _, obj := range c.Secrets {
c.logger.Infof("Found Secret: %s (uid: %s)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
c.logger.Infof("Found secret: %s (uid: %s)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
}
if c.Endpoint != nil {
c.logger.Infof("Found Endpoint: %s (uid: %s)", util.NameFromMeta(c.Endpoint.ObjectMeta), c.Endpoint.UID)
c.logger.Infof("Found endpoint: %s (uid: %s)", util.NameFromMeta(c.Endpoint.ObjectMeta), c.Endpoint.UID)
}
if c.Service != nil {
c.logger.Infof("Found Service: %s (uid: %s)", util.NameFromMeta(c.Service.ObjectMeta), c.Service.UID)
c.logger.Infof("Found service: %s (uid: %s)", util.NameFromMeta(c.Service.ObjectMeta), c.Service.UID)
}
pods, err := c.listPods()
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)
}
for _, obj := range pods {
c.logger.Infof("Found Pod: %s (uid: %s)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
c.logger.Infof("Found pod: %s (uid: %s)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
}
pvcs, err := c.listPersistentVolumeClaims()
if err != nil {
return fmt.Errorf("Can't get the list of PVCs: %s", err)
return fmt.Errorf("could not get the list of PVCs: %v", err)
}
for _, obj := range pvcs {
@@ -105,36 +105,33 @@ func (c *Cluster) ListResources() error {
func (c *Cluster) createStatefulSet() (*v1beta1.StatefulSet, error) {
if c.Statefulset != nil {
return nil, fmt.Errorf("StatefulSet already exists in the cluster")
return nil, fmt.Errorf("statefulset already exists in the cluster")
}
statefulSetSpec, err := c.genStatefulSet(c.Spec)
if err != nil {
return nil, fmt.Errorf("Can't generate StatefulSet: %s", err)
return nil, fmt.Errorf("could not generate statefulset: %v", err)
}
statefulSet, err := c.KubeClient.StatefulSets(statefulSetSpec.Namespace).Create(statefulSetSpec)
if k8sutil.ResourceAlreadyExists(err) {
return nil, fmt.Errorf("StatefulSet '%s' already exists", util.NameFromMeta(statefulSetSpec.ObjectMeta))
}
if err != nil {
return nil, err
}
c.Statefulset = statefulSet
c.logger.Debugf("Created new StatefulSet '%s', uid: %s", util.NameFromMeta(statefulSet.ObjectMeta), statefulSet.UID)
c.logger.Debugf("Created new statefulset '%s', uid: %s", util.NameFromMeta(statefulSet.ObjectMeta), statefulSet.UID)
return statefulSet, nil
}
func (c *Cluster) updateStatefulSet(newStatefulSet *v1beta1.StatefulSet) error {
if c.Statefulset == nil {
return fmt.Errorf("There is no StatefulSet in the cluster")
return fmt.Errorf("there is no statefulset in the cluster")
}
statefulSetName := util.NameFromMeta(c.Statefulset.ObjectMeta)
c.logger.Debugf("Updating StatefulSet")
c.logger.Debugf("Updating statefulset")
patchData, err := specPatch(newStatefulSet.Spec)
if err != nil {
return fmt.Errorf("Can't form patch for the StatefulSet '%s': %s", statefulSetName, err)
return fmt.Errorf("could not form patch for the statefulset '%s': %v", statefulSetName, err)
}
statefulSet, err := c.KubeClient.StatefulSets(c.Statefulset.Namespace).Patch(
@@ -142,7 +139,7 @@ func (c *Cluster) updateStatefulSet(newStatefulSet *v1beta1.StatefulSet) error {
api.MergePatchType,
patchData, "")
if err != nil {
return fmt.Errorf("Can't patch StatefulSet '%s': %s", statefulSetName, err)
return fmt.Errorf("could not patch statefulset '%s': %v", statefulSetName, err)
}
c.Statefulset = statefulSet
@@ -152,11 +149,11 @@ func (c *Cluster) updateStatefulSet(newStatefulSet *v1beta1.StatefulSet) error {
// replaceStatefulSet deletes an old StatefulSet and creates the new using spec in the PostgreSQL TPR.
func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error {
if c.Statefulset == nil {
return fmt.Errorf("There is no StatefulSet in the cluster")
return fmt.Errorf("there is no statefulset in the cluster")
}
statefulSetName := util.NameFromMeta(c.Statefulset.ObjectMeta)
c.logger.Debugf("Replacing StatefulSet")
c.logger.Debugf("Replacing statefulset")
// Delete the current statefulset without deleting the pods
orphanDepencies := true
@@ -164,7 +161,7 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
options := v1.DeleteOptions{OrphanDependents: &orphanDepencies}
if err := c.KubeClient.StatefulSets(oldStatefulset.Namespace).Delete(oldStatefulset.Name, &options); err != nil {
return fmt.Errorf("Can't delete statefulset '%s': %s", statefulSetName, err)
return fmt.Errorf("could not delete statefulset '%s': %v", statefulSetName, err)
}
// make sure we clear the stored statefulset status if the subsequent create fails.
c.Statefulset = nil
@@ -178,13 +175,13 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
return err != nil, nil
})
if err != nil {
return fmt.Errorf("could not delete statefulset: %s", err)
return fmt.Errorf("could not delete statefulset: %v", err)
}
// create the new statefulset with the desired spec. It would take over the remaining pods.
createdStatefulset, err := c.KubeClient.StatefulSets(newStatefulSet.Namespace).Create(newStatefulSet)
if err != nil {
return fmt.Errorf("Can't create statefulset '%s': %s", statefulSetName, err)
return fmt.Errorf("could not create statefulset '%s': %v", statefulSetName, err)
}
// check that all the previous replicas were picked up.
if newStatefulSet.Spec.Replicas == oldStatefulset.Spec.Replicas &&
@@ -197,24 +194,24 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
}
func (c *Cluster) deleteStatefulSet() error {
c.logger.Debugln("Deleting StatefulSet")
c.logger.Debugln("Deleting statefulset")
if c.Statefulset == nil {
return fmt.Errorf("There is no StatefulSet in the cluster")
return fmt.Errorf("there is no statefulset in the cluster")
}
err := c.KubeClient.StatefulSets(c.Statefulset.Namespace).Delete(c.Statefulset.Name, c.deleteOptions)
if err != nil {
return err
}
c.logger.Infof("StatefulSet '%s' has been deleted", util.NameFromMeta(c.Statefulset.ObjectMeta))
c.logger.Infof("statefulset '%s' has been deleted", util.NameFromMeta(c.Statefulset.ObjectMeta))
c.Statefulset = nil
if err := c.deletePods(); err != nil {
return fmt.Errorf("Can't delete Pods: %s", err)
return fmt.Errorf("could not delete pods: %v", err)
}
if err := c.deletePersistenVolumeClaims(); err != nil {
return fmt.Errorf("Can't delete PersistentVolumeClaims: %s", err)
return fmt.Errorf("could not delete PersistentVolumeClaims: %v", err)
}
return nil
@@ -222,14 +219,11 @@ func (c *Cluster) deleteStatefulSet() error {
func (c *Cluster) createService() (*v1.Service, error) {
if c.Service != nil {
return nil, fmt.Errorf("Service already exists in the cluster")
return nil, fmt.Errorf("service already exists in the cluster")
}
serviceSpec := c.genService(c.Spec.AllowedSourceRanges)
service, err := c.KubeClient.Services(serviceSpec.Namespace).Create(serviceSpec)
if k8sutil.ResourceAlreadyExists(err) {
return nil, fmt.Errorf("Service '%s' already exists", util.NameFromMeta(serviceSpec.ObjectMeta))
}
if err != nil {
return nil, err
}
@@ -240,13 +234,13 @@ func (c *Cluster) createService() (*v1.Service, error) {
func (c *Cluster) updateService(newService *v1.Service) error {
if c.Service == nil {
return fmt.Errorf("There is no Service in the cluster")
return fmt.Errorf("there is no service in the cluster")
}
serviceName := util.NameFromMeta(c.Service.ObjectMeta)
patchData, err := specPatch(newService.Spec)
if err != nil {
return fmt.Errorf("Can't form patch for the Service '%s': %s", serviceName, err)
return fmt.Errorf("could not form patch for the service '%s': %v", serviceName, err)
}
svc, err := c.KubeClient.Services(c.Service.Namespace).Patch(
@@ -254,7 +248,7 @@ func (c *Cluster) updateService(newService *v1.Service) error {
api.MergePatchType,
patchData, "")
if err != nil {
return fmt.Errorf("Can't patch Service '%s': %s", serviceName, err)
return fmt.Errorf("could not patch service '%s': %v", serviceName, err)
}
c.Service = svc
@@ -262,16 +256,16 @@ func (c *Cluster) updateService(newService *v1.Service) error {
}
func (c *Cluster) deleteService() error {
c.logger.Debugln("Deleting Service")
c.logger.Debugln("Deleting service")
if c.Service == nil {
return fmt.Errorf("There is no Service in the cluster")
return fmt.Errorf("there is no service in the cluster")
}
err := c.KubeClient.Services(c.Service.Namespace).Delete(c.Service.Name, c.deleteOptions)
if err != nil {
return err
}
c.logger.Infof("Service '%s' has been deleted", util.NameFromMeta(c.Service.ObjectMeta))
c.logger.Infof("service '%s' has been deleted", util.NameFromMeta(c.Service.ObjectMeta))
c.Service = nil
return nil
@@ -279,14 +273,11 @@ func (c *Cluster) deleteService() error {
func (c *Cluster) createEndpoint() (*v1.Endpoints, error) {
if c.Endpoint != nil {
return nil, fmt.Errorf("Endpoint already exists in the cluster")
return nil, fmt.Errorf("endpoint already exists in the cluster")
}
endpointsSpec := c.genEndpoints()
endpoints, err := c.KubeClient.Endpoints(endpointsSpec.Namespace).Create(endpointsSpec)
if k8sutil.ResourceAlreadyExists(err) {
return nil, fmt.Errorf("Endpoint '%s' already exists", util.NameFromMeta(endpointsSpec.ObjectMeta))
}
if err != nil {
return nil, err
}
@@ -296,15 +287,15 @@ func (c *Cluster) createEndpoint() (*v1.Endpoints, error) {
}
func (c *Cluster) deleteEndpoint() error {
c.logger.Debugln("Deleting Endpoint")
c.logger.Debugln("Deleting endpoint")
if c.Endpoint == nil {
return fmt.Errorf("There is no Endpoint in the cluster")
return fmt.Errorf("there is no endpoint in the cluster")
}
err := c.KubeClient.Endpoints(c.Endpoint.Namespace).Delete(c.Endpoint.Name, c.deleteOptions)
if err != nil {
return err
}
c.logger.Infof("Endpoint '%s' has been deleted", util.NameFromMeta(c.Endpoint.ObjectMeta))
c.logger.Infof("endpoint '%s' has been deleted", util.NameFromMeta(c.Endpoint.ObjectMeta))
c.Endpoint = nil
return nil
@@ -319,9 +310,9 @@ func (c *Cluster) applySecrets() error {
var userMap map[string]spec.PgUser
curSecret, err := c.KubeClient.Secrets(secretSpec.Namespace).Get(secretSpec.Name)
if err != nil {
return fmt.Errorf("Can't get current Secret: %s", err)
return fmt.Errorf("could not get current secret: %v", err)
}
c.logger.Debugf("Secret '%s' already exists, fetching it's password", util.NameFromMeta(curSecret.ObjectMeta))
c.logger.Debugf("secret '%s' already exists, fetching it's password", util.NameFromMeta(curSecret.ObjectMeta))
if secretUsername == c.systemUsers[constants.SuperuserKeyName].Name {
secretUsername = constants.SuperuserKeyName
userMap = c.systemUsers
@@ -338,10 +329,10 @@ func (c *Cluster) applySecrets() error {
continue
} else {
if err != nil {
return fmt.Errorf("Can't create Secret for user '%s': %s", secretUsername, err)
return fmt.Errorf("could not create secret for user '%s': %v", secretUsername, err)
}
c.Secrets[secret.UID] = secret
c.logger.Debugf("Created new Secret '%s', uid: %s", util.NameFromMeta(secret.ObjectMeta), secret.UID)
c.logger.Debugf("Created new secret '%s', uid: %s", util.NameFromMeta(secret.ObjectMeta), secret.UID)
}
}
@@ -349,12 +340,12 @@ func (c *Cluster) applySecrets() error {
}
func (c *Cluster) deleteSecret(secret *v1.Secret) error {
c.logger.Debugf("Deleting Secret '%s'", util.NameFromMeta(secret.ObjectMeta))
c.logger.Debugf("Deleting secret '%s'", util.NameFromMeta(secret.ObjectMeta))
err := c.KubeClient.Secrets(secret.Namespace).Delete(secret.Name, c.deleteOptions)
if err != nil {
return err
}
c.logger.Infof("Secret '%s' has been deleted", util.NameFromMeta(secret.ObjectMeta))
c.logger.Infof("secret '%s' has been deleted", util.NameFromMeta(secret.ObjectMeta))
delete(c.Secrets, secret.UID)
return err
pkg/cluster/sync.go
+20 -20
View File
@@ -78,12 +78,12 @@ func (c *Cluster) syncSecrets() error {
func (c *Cluster) syncService() error {
cSpec := c.Spec
if c.Service == nil {
c.logger.Infof("Can't find the cluster's Service")
c.logger.Infof("could not find the cluster's service")
svc, err := c.createService()
if err != nil {
return fmt.Errorf("Can't create missing Service: %s", err)
return fmt.Errorf("could not create missing service: %v", err)
}
c.logger.Infof("Created missing Service '%s'", util.NameFromMeta(svc.ObjectMeta))
c.logger.Infof("Created missing service '%s'", util.NameFromMeta(svc.ObjectMeta))
return nil
}
@@ -96,21 +96,21 @@ func (c *Cluster) syncService() error {
c.logServiceChanges(c.Service, desiredSvc, false, reason)
if err := c.updateService(desiredSvc); err != nil {
return fmt.Errorf("Can't update Service to match desired state: %s", err)
return fmt.Errorf("could not update service to match desired state: %v", err)
}
c.logger.Infof("Service '%s' is in the desired state now", util.NameFromMeta(desiredSvc.ObjectMeta))
c.logger.Infof("service '%s' is in the desired state now", util.NameFromMeta(desiredSvc.ObjectMeta))
return nil
}
func (c *Cluster) syncEndpoint() error {
if c.Endpoint == nil {
c.logger.Infof("Can't find the cluster's Endpoint")
c.logger.Infof("could not find the cluster's endpoint")
ep, err := c.createEndpoint()
if err != nil {
return fmt.Errorf("Can't create missing Endpoint: %s", err)
return fmt.Errorf("could not create missing endpoint: %v", err)
}
c.logger.Infof("Created missing Endpoint '%s'", util.NameFromMeta(ep.ObjectMeta))
c.logger.Infof("Created missing endpoint '%s'", util.NameFromMeta(ep.ObjectMeta))
return nil
}
@@ -121,10 +121,10 @@ func (c *Cluster) syncStatefulSet() error {
cSpec := c.Spec
var rollUpdate, needsReplace bool
if c.Statefulset == nil {
c.logger.Infof("Can't find the cluster's StatefulSet")
c.logger.Infof("could not find the cluster's statefulset")
pods, err := c.listPods()
if err != nil {
return fmt.Errorf("Can't list pods of the StatefulSet: %s", err)
return fmt.Errorf("could not list pods of the statefulset: %v", err)
}
if len(pods) > 0 {
@@ -133,13 +133,13 @@ func (c *Cluster) syncStatefulSet() error {
}
ss, err := c.createStatefulSet()
if err != nil {
return fmt.Errorf("Can't create missing StatefulSet: %s", err)
return fmt.Errorf("could not create missing statefulset: %v", err)
}
err = c.waitStatefulsetPodsReady()
if err != nil {
return fmt.Errorf("Cluster is not ready: %s", err)
return fmt.Errorf("cluster is not ready: %v", err)
}
c.logger.Infof("Created missing StatefulSet '%s'", util.NameFromMeta(ss.ObjectMeta))
c.logger.Infof("Created missing statefulset '%s'", util.NameFromMeta(ss.ObjectMeta))
if !rollUpdate {
return nil
}
@@ -152,7 +152,7 @@ func (c *Cluster) syncStatefulSet() error {
desiredSS, err := c.genStatefulSet(cSpec)
if err != nil {
return fmt.Errorf("Can't generate StatefulSet: %s", err)
return fmt.Errorf("could not generate statefulset: %v", err)
}
match, needsReplace, rollUpdate, reason = c.compareStatefulSetWith(desiredSS)
@@ -163,11 +163,11 @@ func (c *Cluster) syncStatefulSet() error {
if !needsReplace {
if err := c.updateStatefulSet(desiredSS); err != nil {
return fmt.Errorf("Can't update StatefulSet: %s", err)
return fmt.Errorf("could not update statefulset: %v", err)
}
} else {
if err := c.replaceStatefulSet(desiredSS); err != nil {
return fmt.Errorf("Can't replace StatefulSet: %s", err)
return fmt.Errorf("could not replace statefulset: %v", err)
}
}
@@ -178,9 +178,9 @@ func (c *Cluster) syncStatefulSet() error {
}
c.logger.Debugln("Performing rolling update")
if err := c.recreatePods(); err != nil {
return fmt.Errorf("Can't recreate Pods: %s", err)
return fmt.Errorf("could not recreate pods: %v", err)
}
c.logger.Infof("Pods have been recreated")
c.logger.Infof("pods have been recreated")
return nil
}
@@ -196,11 +196,11 @@ func (c *Cluster) SyncRoles() error {
}
dbUsers, err := c.readPgUsersFromDatabase(userNames)
if err != nil {
return fmt.Errorf("Error getting users from the database: %s", err)
return fmt.Errorf("error getting users from the database: %v", err)
}
pgSyncRequests := c.userSyncStrategy.ProduceSyncRequests(dbUsers, c.pgUsers)
if err := c.userSyncStrategy.ExecuteSyncRequests(pgSyncRequests, c.pgDb); err != nil {
return fmt.Errorf("Error executing sync statements: %s", err)
return fmt.Errorf("error executing sync statements: %v", err)
}
return nil
}
pkg/cluster/util.go
+14 -14
View File
@@ -26,7 +26,7 @@ func normalizeUserFlags(userFlags []string) (flags []string, err error) {
for _, flag := range userFlags {
if !alphaNumericRegexp.MatchString(flag) {
err = fmt.Errorf("User flag '%s' is not alphanumeric", flag)
err = fmt.Errorf("user flag '%v' is not alphanumeric", flag)
return
}
flag = strings.ToUpper(flag)
@@ -35,7 +35,7 @@ func normalizeUserFlags(userFlags []string) (flags []string, err error) {
}
}
if uniqueFlags[constants.RoleFlagLogin] && uniqueFlags[constants.RoleFlagNoLogin] {
return nil, fmt.Errorf("Conflicting or redundant flags: LOGIN and NOLOGIN")
return nil, fmt.Errorf("conflicting or redundant flags: LOGIN and NOLOGIN")
}
flags = []string{}
@@ -65,11 +65,11 @@ func specPatch(spec interface{}) ([]byte, error) {
func (c *Cluster) logStatefulSetChanges(old, new *v1beta1.StatefulSet, isUpdate bool, reason string) {
if isUpdate {
c.logger.Infof("StatefulSet '%s' has been changed",
c.logger.Infof("statefulset '%s' has been changed",
util.NameFromMeta(old.ObjectMeta),
)
} else {
c.logger.Infof("StatefulSet '%s' is not in the desired state and needs to be updated",
c.logger.Infof("statefulset '%s' is not in the desired state and needs to be updated",
util.NameFromMeta(old.ObjectMeta),
)
}
@@ -82,11 +82,11 @@ func (c *Cluster) logStatefulSetChanges(old, new *v1beta1.StatefulSet, isUpdate
func (c *Cluster) logServiceChanges(old, new *v1.Service, isUpdate bool, reason string) {
if isUpdate {
c.logger.Infof("Service '%s' has been changed",
c.logger.Infof("service '%s' has been changed",
util.NameFromMeta(old.ObjectMeta),
)
} else {
c.logger.Infof("Service '%s is not in the desired state and needs to be updated",
c.logger.Infof("service '%s is not in the desired state and needs to be updated",
util.NameFromMeta(old.ObjectMeta),
)
}
@@ -107,11 +107,11 @@ func (c *Cluster) logVolumeChanges(old, new spec.Volume, reason string) {
func (c *Cluster) getTeamMembers() ([]string, error) {
if c.Spec.TeamID == "" {
return nil, fmt.Errorf("No teamId specified")
return nil, fmt.Errorf("no teamId specified")
}
teamInfo, err := c.TeamsAPIClient.TeamInfo(c.Spec.TeamID)
if err != nil {
return nil, fmt.Errorf("Can't get team info: %s", err)
return nil, fmt.Errorf("could not get team info: %v", err)
}
c.logger.Debugf("Got from the Team API: %+v", *teamInfo)
@@ -130,7 +130,7 @@ func (c *Cluster) waitForPodLabel(podEvents chan spec.PodEvent) error {
return nil
}
case <-time.After(c.OpConfig.PodLabelWaitTimeout):
return fmt.Errorf("Pod label wait timeout")
return fmt.Errorf("pod label wait timeout")
}
}
}
@@ -143,7 +143,7 @@ func (c *Cluster) waitForPodDeletion(podEvents chan spec.PodEvent) error {
return nil
}
case <-time.After(c.OpConfig.PodDeletionWaitTimeout):
return fmt.Errorf("Pod deletion wait timeout")
return fmt.Errorf("pod deletion wait timeout")
}
}
}
@@ -160,7 +160,7 @@ func (c *Cluster) waitStatefulsetReady() error {
}
if len(ss.Items) != 1 {
return false, fmt.Errorf("StatefulSet is not found")
return false, fmt.Errorf("statefulset is not found")
}
return *ss.Items[0].Spec.Replicas == ss.Items[0].Status.Replicas, nil
@@ -201,7 +201,7 @@ func (c *Cluster) waitPodLabelsReady() error {
return false, err
}
if len(masterPods.Items) > 1 {
return false, fmt.Errorf("Too many masters")
return false, fmt.Errorf("too many masters")
}
if len(replicaPods.Items) == podsNumber {
c.masterLess = true
@@ -219,12 +219,12 @@ func (c *Cluster) waitPodLabelsReady() error {
func (c *Cluster) waitStatefulsetPodsReady() error {
// TODO: wait for the first Pod only
if err := c.waitStatefulsetReady(); err != nil {
return fmt.Errorf("Statuful set error: %s", err)
return fmt.Errorf("statuful set error: %v", err)
}
// TODO: wait only for master
if err := c.waitPodLabelsReady(); err != nil {
return fmt.Errorf("Pod labels error: %s", err)
return fmt.Errorf("pod labels error: %v", err)
}
return nil