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

start all the log messages with lowercase letters

Browse Source
This commit is contained in:
Murat Kabilov
2017-08-15 10:12:36 +02:00
parent 87a379f663
commit e26db66cb5
17 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+10 -10
View File
@@ -205,7 +205,7 @@ func (c *Cluster) Create() error {
if err = c.initUsers(); err != nil {
return err
}
c.logger.Infof("Users have been initialized")
c.logger.Infof("users have been initialized")
if err = c.applySecrets(); err != nil {
return fmt.Errorf("could not create secrets: %v", err)
@@ -218,10 +218,10 @@ func (c *Cluster) Create() error {
}
c.logger.Infof("statefulset %q has been successfully created", util.NameFromMeta(ss.ObjectMeta))
c.logger.Info("Waiting for cluster being ready")
c.logger.Info("waiting for cluster being ready")
if err = c.waitStatefulsetPodsReady(); err != nil {
c.logger.Errorf("Failed to create cluster: %v", err)
c.logger.Errorf("failed to create cluster: %v", err)
return err
}
c.logger.Infof("pods are ready")
@@ -231,10 +231,10 @@ func (c *Cluster) Create() error {
if err != nil {
return fmt.Errorf("could not create users: %v", err)
}
c.logger.Infof("Users have been successfully created")
c.logger.Infof("users have been successfully created")
} else {
if c.masterLess {
c.logger.Warnln("Cluster is masterless")
c.logger.Warnln("cluster is masterless")
}
}
@@ -411,7 +411,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
defer c.mu.Unlock()
c.setStatus(spec.ClusterStatusUpdating)
c.logger.Debugf("Cluster update from version %q to %q",
c.logger.Debugf("cluster update from version %q to %q",
c.ResourceVersion, newSpec.ResourceVersion)
/* Make sure we update when this function exists */
@@ -481,25 +481,25 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
}
if c.Spec.PgVersion != newSpec.Spec.PgVersion { // PG versions comparison
c.logger.Warnf("Postgresql version change(%q -> %q) is not allowed",
c.logger.Warnf("postgresql version change(%q -> %q) is not allowed",
c.Spec.PgVersion, newSpec.Spec.PgVersion)
//TODO: rewrite pg version in tpr spec
}
if cmp.rollingUpdate {
c.logger.Infof("Rolling update is needed")
c.logger.Infof("rolling update is needed")
// TODO: wait for actual streaming to the replica
if err := c.recreatePods(); err != nil {
c.setStatus(spec.ClusterStatusUpdateFailed)
return fmt.Errorf("could not recreate pods: %v", err)
}
c.logger.Infof("Rolling update has been finished")
c.logger.Infof("rolling update has been finished")
}
if match, reason := c.sameVolumeWith(newSpec.Spec.Volume); !match {
c.logVolumeChanges(c.Spec.Volume, newSpec.Spec.Volume, reason)
if err := c.resizeVolumes(newSpec.Spec.Volume, []volumes.VolumeResizer{&volumes.EBSVolumeResizer{}}); err != nil {
return fmt.Errorf("Could not update volumes: %v", err)
return fmt.Errorf("could not update volumes: %v", err)
}
c.logger.Infof("volumes have been updated successfully")
}
pkg/cluster/k8sres.go
+2 -2
View File
@@ -145,7 +145,7 @@ PATRONI_INITDB_PARAMS:
}
}
default:
c.logger.Warnf("Unsupported type for initdb configuration item %s: %T", defaultParam)
c.logger.Warnf("unsupported type for initdb configuration item %s: %T", defaultParam)
continue PATRONI_INITDB_PARAMS
}
}
@@ -199,7 +199,7 @@ PATRONI_INITDB_PARAMS:
}
result, err := json.Marshal(config)
if err != nil {
c.logger.Errorf("Cannot convert spilo configuration into JSON: %v", err)
c.logger.Errorf("cannot convert spilo configuration into JSON: %v", err)
return ""
}
return string(result)
pkg/cluster/pg.go
+1 -1
View File
@@ -34,7 +34,7 @@ func (c *Cluster) pgConnectionString() string {
func (c *Cluster) databaseAccessDisabled() bool {
if !c.OpConfig.EnableDBAccess {
c.logger.Debugf("Database access is disabled")
c.logger.Debugf("database access is disabled")
}
return !c.OpConfig.EnableDBAccess
pkg/cluster/pod.go
+7 -7
View File
@@ -26,7 +26,7 @@ func (c *Cluster) listPods() ([]v1.Pod, error) {
}
func (c *Cluster) deletePods() error {
c.logger.Debugln("Deleting pods")
c.logger.Debugln("deleting pods")
pods, err := c.listPods()
if err != nil {
return err
@@ -35,7 +35,7 @@ func (c *Cluster) deletePods() error {
for _, obj := range pods {
podName := util.NameFromMeta(obj.ObjectMeta)
c.logger.Debugf("Deleting pod %q", podName)
c.logger.Debugf("deleting pod %q", podName)
if err := c.deletePod(podName); err != nil {
c.logger.Errorf("could not delete pod %q: %v", podName, err)
} else {
@@ -45,7 +45,7 @@ func (c *Cluster) deletePods() error {
if len(pods) > 0 {
c.logger.Debugln("pods have been deleted")
} else {
c.logger.Debugln("No pods to delete")
c.logger.Debugln("no pods to delete")
}
return nil
@@ -71,7 +71,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])
@@ -124,7 +124,7 @@ func (c *Cluster) recreatePods() error {
if err != nil {
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 {
@@ -140,11 +140,11 @@ func (c *Cluster) recreatePods() error {
}
}
if masterPod.Name == "" {
c.logger.Warningln("No master pod in the cluster")
c.logger.Warningln("no master pod in the cluster")
} else {
//TODO: do manual failover
//TODO: specify master, leave new master empty
c.logger.Infof("Recreating master pod %q", util.NameFromMeta(masterPod.ObjectMeta))
c.logger.Infof("recreating master pod %q", util.NameFromMeta(masterPod.ObjectMeta))
if err := c.recreatePod(masterPod); err != nil {
return fmt.Errorf("could not recreate master pod %q: %v", util.NameFromMeta(masterPod.ObjectMeta), err)
pkg/cluster/resources.go
+17 -17
View File
@@ -80,19 +80,19 @@ func (c *Cluster) loadResources() error {
func (c *Cluster) listResources() error {
if c.Statefulset != nil {
c.logger.Infof("Found statefulset: %q (uid: %q)", util.NameFromMeta(c.Statefulset.ObjectMeta), c.Statefulset.UID)
c.logger.Infof("found statefulset: %q (uid: %q)", util.NameFromMeta(c.Statefulset.ObjectMeta), c.Statefulset.UID)
}
for _, obj := range c.Secrets {
c.logger.Infof("Found secret: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
c.logger.Infof("found secret: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
}
if c.Endpoint != nil {
c.logger.Infof("Found endpoint: %q (uid: %q)", util.NameFromMeta(c.Endpoint.ObjectMeta), c.Endpoint.UID)
c.logger.Infof("found endpoint: %q (uid: %q)", util.NameFromMeta(c.Endpoint.ObjectMeta), c.Endpoint.UID)
}
for role, service := range c.Service {
c.logger.Infof("Found %s service: %q (uid: %q)", role, util.NameFromMeta(service.ObjectMeta), service.UID)
c.logger.Infof("found %s service: %q (uid: %q)", role, util.NameFromMeta(service.ObjectMeta), service.UID)
}
pods, err := c.listPods()
@@ -101,7 +101,7 @@ func (c *Cluster) listResources() error {
}
for _, obj := range pods {
c.logger.Infof("Found pod: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
c.logger.Infof("found pod: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
}
pvcs, err := c.listPersistentVolumeClaims()
@@ -110,7 +110,7 @@ func (c *Cluster) listResources() error {
}
for _, obj := range pvcs {
c.logger.Infof("Found PVC: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
c.logger.Infof("found PVC: %q (uid: %q)", util.NameFromMeta(obj.ObjectMeta), obj.UID)
}
return nil
@@ -129,7 +129,7 @@ func (c *Cluster) createStatefulSet() (*v1beta1.StatefulSet, error) {
return nil, err
}
c.Statefulset = statefulSet
c.logger.Debugf("Created new statefulset %q, uid: %q", util.NameFromMeta(statefulSet.ObjectMeta), statefulSet.UID)
c.logger.Debugf("created new statefulset %q, uid: %q", util.NameFromMeta(statefulSet.ObjectMeta), statefulSet.UID)
return statefulSet, nil
}
@@ -140,7 +140,7 @@ func (c *Cluster) updateStatefulSet(newStatefulSet *v1beta1.StatefulSet) error {
}
statefulSetName := util.NameFromMeta(c.Statefulset.ObjectMeta)
c.logger.Debugf("Updating statefulset")
c.logger.Debugf("updating statefulset")
patchData, err := specPatch(newStatefulSet.Spec)
if err != nil {
@@ -166,7 +166,7 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
}
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
@@ -179,7 +179,7 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
// make sure we clear the stored statefulset status if the subsequent create fails.
c.Statefulset = nil
// wait until the statefulset is truly deleted
c.logger.Debugf("Waiting for the statefulset to be deleted")
c.logger.Debugf("waiting for the statefulset to be deleted")
err := retryutil.Retry(constants.StatefulsetDeletionInterval, constants.StatefulsetDeletionTimeout,
func() (bool, error) {
@@ -199,7 +199,7 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
// check that all the previous replicas were picked up.
if newStatefulSet.Spec.Replicas == oldStatefulset.Spec.Replicas &&
createdStatefulset.Status.Replicas != oldStatefulset.Status.Replicas {
c.logger.Warnf("Number of pods for the old and updated Statefulsets is not identical")
c.logger.Warnf("number of pods for the old and updated Statefulsets is not identical")
}
c.Statefulset = createdStatefulset
@@ -207,7 +207,7 @@ 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")
}
@@ -321,9 +321,9 @@ func (c *Cluster) updateService(role postgresRole, newService *v1.Service) error
}
func (c *Cluster) deleteService(role postgresRole) error {
c.logger.Debugf("Deleting service %s", role)
c.logger.Debugf("deleting service %s", role)
if c.Service[role] == nil {
return fmt.Errorf("There is no %s service in the cluster", role)
return fmt.Errorf("there is no %s service in the cluster", role)
}
service := c.Service[role]
err := c.KubeClient.Services(service.Namespace).Delete(service.Name, c.deleteOptions)
@@ -351,7 +351,7 @@ 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")
}
@@ -396,7 +396,7 @@ func (c *Cluster) applySecrets() error {
return fmt.Errorf("could not create secret for user %q: %v", secretUsername, err)
}
c.Secrets[secret.UID] = secret
c.logger.Debugf("Created new secret %q, uid: %q", util.NameFromMeta(secret.ObjectMeta), secret.UID)
c.logger.Debugf("created new secret %q, uid: %q", util.NameFromMeta(secret.ObjectMeta), secret.UID)
}
}
@@ -404,7 +404,7 @@ func (c *Cluster) applySecrets() error {
}
func (c *Cluster) deleteSecret(secret *v1.Secret) error {
c.logger.Debugf("Deleting secret %q", util.NameFromMeta(secret.ObjectMeta))
c.logger.Debugf("deleting secret %q", util.NameFromMeta(secret.ObjectMeta))
err := c.KubeClient.Secrets(secret.Namespace).Delete(secret.Name, c.deleteOptions)
if err != nil {
return err
pkg/cluster/sync.go
+13 -13
View File
@@ -24,7 +24,7 @@ func (c *Cluster) Sync() error {
return err
}
c.logger.Debugf("Syncing secrets")
c.logger.Debugf("syncing secrets")
//TODO: mind the secrets of the deleted/new users
if err := c.applySecrets(); err != nil {
@@ -33,14 +33,14 @@ func (c *Cluster) Sync() error {
}
}
c.logger.Debugf("Syncing endpoints")
c.logger.Debugf("syncing endpoints")
if err := c.syncEndpoint(); err != nil {
if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync endpoints: %v", err)
}
}
c.logger.Debugf("Syncing services")
c.logger.Debugf("syncing services")
for _, role := range []postgresRole{master, replica} {
if role == replica && !c.Spec.ReplicaLoadBalancer {
if c.Service[role] != nil {
@@ -58,7 +58,7 @@ func (c *Cluster) Sync() error {
}
}
c.logger.Debugf("Syncing statefulsets")
c.logger.Debugf("syncing statefulsets")
if err := c.syncStatefulSet(); err != nil {
if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync statefulsets: %v", err)
@@ -66,13 +66,13 @@ func (c *Cluster) Sync() error {
}
if !c.databaseAccessDisabled() {
c.logger.Debugf("Syncing roles")
c.logger.Debugf("syncing roles")
if err := c.syncRoles(true); err != nil {
return fmt.Errorf("could not sync roles: %v", err)
}
}
c.logger.Debugf("Syncing persistent volumes")
c.logger.Debugf("syncing persistent volumes")
if err := c.syncVolumes(); err != nil {
return fmt.Errorf("could not sync persistent volumes: %v", err)
}
@@ -88,7 +88,7 @@ func (c *Cluster) syncService(role postgresRole) error {
if err != nil {
return fmt.Errorf("could not create missing %s service: %v", role, err)
}
c.logger.Infof("Created missing %s service %q", role, util.NameFromMeta(svc.ObjectMeta))
c.logger.Infof("created missing %s service %q", role, util.NameFromMeta(svc.ObjectMeta))
return nil
}
@@ -115,7 +115,7 @@ func (c *Cluster) syncEndpoint() error {
if err != nil {
return fmt.Errorf("could not create missing endpoint: %v", err)
}
c.logger.Infof("Created missing endpoint %q", util.NameFromMeta(ep.ObjectMeta))
c.logger.Infof("created missing endpoint %q", util.NameFromMeta(ep.ObjectMeta))
return nil
}
@@ -133,7 +133,7 @@ func (c *Cluster) syncStatefulSet() error {
}
if len(pods) > 0 {
c.logger.Infof("Found pods without the statefulset: trigger rolling update")
c.logger.Infof("found pods without the statefulset: trigger rolling update")
rollUpdate = true
}
ss, err := c.createStatefulSet()
@@ -144,7 +144,7 @@ func (c *Cluster) syncStatefulSet() error {
if err != nil {
return fmt.Errorf("cluster is not ready: %v", err)
}
c.logger.Infof("Created missing statefulset %q", util.NameFromMeta(ss.ObjectMeta))
c.logger.Infof("created missing statefulset %q", util.NameFromMeta(ss.ObjectMeta))
if !rollUpdate {
return nil
}
@@ -173,11 +173,11 @@ func (c *Cluster) syncStatefulSet() error {
}
if !cmp.rollingUpdate {
c.logger.Debugln("No rolling update is needed")
c.logger.Debugln("no rolling update is needed")
return nil
}
}
c.logger.Debugln("Performing rolling update")
c.logger.Debugln("performing rolling update")
if err := c.recreatePods(); err != nil {
return fmt.Errorf("could not recreate pods: %v", err)
}
@@ -226,7 +226,7 @@ func (c *Cluster) syncVolumes() error {
return nil
}
if err := c.resizeVolumes(c.Spec.Volume, []volumes.VolumeResizer{&volumes.EBSVolumeResizer{}}); err != nil {
return fmt.Errorf("Could not sync volumes: %v", err)
return fmt.Errorf("could not sync volumes: %v", err)
}
c.logger.Infof("volumes have been synced successfully")
return nil
pkg/cluster/util.go
+6 -6
View File
@@ -89,7 +89,7 @@ func (c *Cluster) logStatefulSetChanges(old, new *v1beta1.StatefulSet, isUpdate
if len(reasons) > 0 {
for _, reason := range reasons {
c.logger.Infof("Reason: %q", reason)
c.logger.Infof("reason: %q", reason)
}
}
}
@@ -107,15 +107,15 @@ func (c *Cluster) logServiceChanges(role postgresRole, old, new *v1.Service, isU
c.logger.Debugf("diff\n%s\n", util.PrettyDiff(old.Spec, new.Spec))
if reason != "" {
c.logger.Infof("Reason: %s", reason)
c.logger.Infof("reason: %s", reason)
}
}
func (c *Cluster) logVolumeChanges(old, new spec.Volume, reason string) {
c.logger.Infof("Volume specification has been changed")
c.logger.Infof("volume specification has been changed")
c.logger.Debugf("diff\n%s\n", util.PrettyDiff(old, new))
if reason != "" {
c.logger.Infof("Reason: %s", reason)
c.logger.Infof("reason: %s", reason)
}
}
@@ -127,7 +127,7 @@ func (c *Cluster) getOAuthToken() (string, error) {
Get(c.OpConfig.OAuthTokenSecretName.Name, metav1.GetOptions{})
if err != nil {
c.logger.Debugf("Oauth token secret name: %q", c.OpConfig.OAuthTokenSecretName)
c.logger.Debugf("oauth token secret name: %q", c.OpConfig.OAuthTokenSecretName)
return "", fmt.Errorf("could not get credentials secret: %v", err)
}
data := credentialsSecret.Data
@@ -144,7 +144,7 @@ func (c *Cluster) getTeamMembers() ([]string, error) {
return nil, fmt.Errorf("no teamId specified")
}
if !c.OpConfig.EnableTeamsAPI {
c.logger.Debug("Team API is disabled, returning empty list of members")
c.logger.Debug("team API is disabled, returning empty list of members")
return []string{}, nil
}
pkg/cluster/volumes.go
+4 -4
View File
@@ -30,13 +30,13 @@ func (c *Cluster) listPersistentVolumeClaims() ([]v1.PersistentVolumeClaim, erro
}
func (c *Cluster) deletePersistenVolumeClaims() error {
c.logger.Debugln("Deleting PVCs")
c.logger.Debugln("deleting PVCs")
pvcs, err := c.listPersistentVolumeClaims()
if err != nil {
return err
}
for _, pvc := range pvcs {
c.logger.Debugf("Deleting PVC %q", util.NameFromMeta(pvc.ObjectMeta))
c.logger.Debugf("deleting PVC %q", util.NameFromMeta(pvc.ObjectMeta))
if err := c.KubeClient.PersistentVolumeClaims(pvc.Namespace).Delete(pvc.Name, c.deleteOptions); err != nil {
c.logger.Warningf("could not delete PersistentVolumeClaim: %v", err)
}
@@ -44,7 +44,7 @@ func (c *Cluster) deletePersistenVolumeClaims() error {
if len(pvcs) > 0 {
c.logger.Debugln("PVCs have been deleted")
} else {
c.logger.Debugln("No PVCs to delete")
c.logger.Debugln("no PVCs to delete")
}
return nil
@@ -66,7 +66,7 @@ func (c *Cluster) listPersistentVolumes() ([]*v1.PersistentVolume, error) {
return nil, fmt.Errorf("could not convert last part of the persistent volume claim name %q to a number", pvc.Name)
}
if int32(pvcNumber) > lastPodIndex {
c.logger.Debugf("Skipping persistent volume %q corresponding to a non-running pods", pvc.Name)
c.logger.Debugf("skipping persistent volume %q corresponding to a non-running pods", pvc.Name)
continue
}
}