Clean up.

Author: lamai93

pkg/deployment/cluster_scaling_integration.go

@@ -65,7 +65,6 @@ func newClusterScalingIntegration(depl *Deployment) *clusterScalingIntegration {
 
 // SendUpdateToCluster records the given spec to be sended to the cluster.
 func (ci *clusterScalingIntegration) SendUpdateToCluster(spec api.DeploymentSpec) {
-	ci.log.Debug().Msg("SendUpdateToCluster called")
 	ci.pendingUpdate.mutex.Lock()
 	defer ci.pendingUpdate.mutex.Unlock()
 	ci.pendingUpdate.spec = &spec
@@ -76,7 +75,6 @@ func (ci *clusterScalingIntegration) ListenForClusterEvents(stopCh <-chan struct
 	start := time.Now()
 	goodInspections := 0
 	for {
-		ci.log.Debug().Msg("inspection loop for cluster int.")
 		delay := time.Second * 2
 
 		// Is deployment in running state
@@ -99,8 +97,6 @@ func (ci *clusterScalingIntegration) ListenForClusterEvents(stopCh <-chan struct
 					goodInspections++
 				}
 			}
-		} else {
-			ci.log.Debug().Msg("cluster Phase not Running")
 		}
 
 		select {
@@ -116,7 +112,6 @@ func (ci *clusterScalingIntegration) ListenForClusterEvents(stopCh <-chan struct
 // Perform a single inspection of the cluster
 func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectSuccess bool) error {
 	log := ci.log
-	log.Debug().Msg("inspect cluster for scaling integration")
 	c, err := ci.depl.clientCache.GetDatabase(ctx)
 	if err != nil {
 		return maskAny(err)
@@ -129,7 +124,6 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 		return maskAny(err)
 	}
 	if req.Coordinators == nil && req.DBServers == nil {
-		log.Debug().Msg("Nothing to check")
 		// Nothing to check
 		return nil
 	}
@@ -147,14 +141,11 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 		dbserversChanged = true
 	}
 	if !coordinatorsChanged && !dbserversChanged {
-		// if there is nothing to change, check if we naver have asked the cluster before
+		// if there is nothing to change, check if we never have asked the cluster before
 		// if so, fill in the values for the first time.
 		// This happens, when the operator is redeployed and there has not been any
 		// update events yet.
 		if desired.Coordinators == nil || desired.DBServers == nil {
-			//ci.lastNumberOfServers.mutex.Lock()
-			//defer ci.lastNumberOfServers.mutex.Unlock()
-			ci.log.Debug().Msg("Some of desired is nil")
 			if req.Coordinators != nil {
 				ci.lastNumberOfServers.NumberOfServers.Coordinators = req.Coordinators
 			}
@@ -163,15 +154,13 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 			}
 		}
 
-		ci.log.Debug().Msg("Nothing has changed")
 		// Nothing has changed
 		return nil
 	}
 	// Let's update the spec
 	apiObject := ci.depl.apiObject
 	current, err := ci.depl.deps.DatabaseCRCli.DatabaseV1alpha().ArangoDeployments(apiObject.Namespace).Get(apiObject.Name, metav1.GetOptions{})
 	if err != nil {
-		log.Debug().Err(err).Msg("Failed to get current deployment")
 		return maskAny(err)
 	}
 	newSpec := current.Spec.DeepCopy()
@@ -188,7 +177,6 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 		// Restore original spec in cluster
 		ci.SendUpdateToCluster(current.Spec)
 	} else {
-		log.Debug().Msg("UpdatedCRSpec via agency")
 		if err := ci.depl.updateCRSpec(*newSpec); err != nil {
 			log.Warn().Err(err).Msg("Failed to update current deployment")
 			return maskAny(err)
@@ -200,14 +188,12 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 // updateClusterServerCount updates the intended number of servers of the cluster.
 // Returns true when it is safe to ask the cluster for updates.
 func (ci *clusterScalingIntegration) updateClusterServerCount(ctx context.Context, expectSuccess bool) (bool, error) {
-	ci.log.Debug().Msg("updateClusterServerCount")
 	// Any update needed?
 	ci.pendingUpdate.mutex.Lock()
 	spec := ci.pendingUpdate.spec
 	ci.pendingUpdate.mutex.Unlock()
 	if spec == nil {
 		// Nothing pending
-		ci.log.Debug().Msg("Nothing pending")
 		return true, nil
 	}
 
@@ -225,15 +211,12 @@ func (ci *clusterScalingIntegration) updateClusterServerCount(ctx context.Contex
 
 	// This is to prevent unneseccary updates that may override some values written by the WebUI (in the case of a update loop)
 	if coordinatorCount != lastNumberOfServers.GetCoordinators() || dbserverCount != lastNumberOfServers.GetDBServers() {
-		ci.log.Debug().Msg("Set number of servers now")
 		if err := arangod.SetNumberOfServers(ctx, c.Connection(), coordinatorCount, dbserverCount); err != nil {
 			if expectSuccess {
 				log.Debug().Err(err).Msg("Failed to set number of servers")
 			}
 			return false, maskAny(err)
 		}
-	} else {
-		ci.log.Debug().Msg("Nothing has changed")
 	}
 
 	// Success, now update internal state