close if statement

coverage.html

@@ -3389,8 +3389,8 @@
         <span class="cov0" title="0">return len(leavingNodes) &gt; 0, nil</span>
 }
 
-/*HasDataInDC checks partition ranges of all non local keyspaces and ensure no data is replicated to the chosen datacenter*/
-func (jolokiaClient *JolokiaClient) HasDataInDC(dc string) ([]string, error) <span class="cov8" title="1">{
+/*NonLocalKeyspacesInDC checks partition ranges of all non local keyspaces and ensure no data is replicated to the chosen datacenter*/
+func (jolokiaClient *JolokiaClient) NonLocalKeyspacesInDC(dc string) ([]string, error) <span class="cov8" title="1">{
         keyspaces, err := jolokiaClient.nonLocalKeyspaces()
         keyspacesWithDataInDC := []string{}
         if err != nil </span><span class="cov0" title="0">{
@@ -5083,11 +5083,11 @@
                                 cc.Spec.ImageJolokiaSecret, cc.Namespace)
                         var keyspacesWithData []string
                         if err == nil </span><span class="cov8" title="1">{
-                                keyspacesWithData, err = jolokiaClient.HasDataInDC(dcName)
+                                keyspacesWithData, err = jolokiaClient.NonLocalKeyspacesInDC(dcName)
                         }</span>
                         <span class="cov8" title="1">if err != nil </span><span class="cov0" title="0">{
                                 logrus.WithFields(logrus.Fields{"cluster": cc.Name}).Warningf(
-                                        "The Operator has refused the ScaleDown (HasDataInDC failed %s). ", err)
+                                        "The Operator has refused the ScaleDown (NonLocalKeyspacesInDC failed %s). ", err)
                                 cc.Spec.Topology = oldCRD.Spec.Topology
                                 return true, api.ActionCorrectCRDConfig
                         }</span>

pkg/controller/cassandracluster/node_operations.go

@@ -304,8 +304,8 @@ func (jolokiaClient *JolokiaClient) hasLeavingNodes() (bool, error) {
 	return len(leavingNodes) > 0, nil
 }
 
-/*HasDataInDC checks partition ranges of all non local keyspaces and ensure no data is replicated to the chosen datacenter*/
-func (jolokiaClient *JolokiaClient) HasDataInDC(dc string) ([]string, error) {
+/*NonLocalKeyspacesInDC checks partition ranges of all non local keyspaces and ensure no data is replicated to the chosen datacenter*/
+func (jolokiaClient *JolokiaClient) NonLocalKeyspacesInDC(dc string) ([]string, error) {
 	keyspaces, err := jolokiaClient.nonLocalKeyspaces()
 	keyspacesWithDataInDC := []string{}
 	if err != nil {

pkg/controller/cassandracluster/node_operations_test.go

@@ -393,7 +393,7 @@ func TestReplicateData(t *testing.T) {
 
 	jolokiaClient, _ := NewJolokiaClient(host, JolokiaPort, nil,
 		v1.LocalObjectReference{}, "ns")
-	keyspacesWithData, err := jolokiaClient.HasDataInDC("dc2")
+	keyspacesWithData, err := jolokiaClient.NonLocalKeyspacesInDC("dc2")
 
 	if err != nil {
 		t.Errorf("hasData failed with : %s", err)

pkg/controller/cassandracluster/pod_operation.go

@@ -689,10 +689,9 @@ func (rcc *ReconcileCassandraCluster) runRebuild(hostName string, cc *api.Cassan
 
 	if labelSet != true {
 		err = errors.New("operation-argument is needed to get the datacenter name to rebuild from")
-	} else if keyspaces, err = jolokiaClient.HasDataInDC(rebuildFrom); err == nil  && len(keyspaces) == 0 {
-		err = fmt.Errorf("%s is not has no nonLocalKeyspace defined", rebuildFrom)
-	}
-
+	} else if keyspaces, err = jolokiaClient.NonLocalKeyspacesInDC(rebuildFrom); err == nil  && len(keyspaces) == 0 {
+		err = fmt.Errorf("%s  has no keyspace to replicate data from", rebuildFrom)	}
+
 	// In case of an error set the status on the pod and skip it
 	if err != nil {
 		return err
@@ -701,7 +700,6 @@ func (rcc *ReconcileCassandraCluster) runRebuild(hostName string, cc *api.Cassan
 	logrus.WithFields(logrus.Fields{"cluster": cc.Name, "rack": dcRackName, "pod": pod.Name,
 		"datacenter": rebuildFrom, "operation": operation}).Info("Execute the Jolokia Operation")
 
-
 	if err == nil {
 		err = jolokiaClient.NodeRebuild(rebuildFrom)
 	}

pkg/controller/cassandracluster/reconcile.go

@@ -379,11 +379,11 @@ func (rcc *ReconcileCassandraCluster) CheckNonAllowedScaleDown(cc *api.Cassandra
 				cc.Spec.ImageJolokiaSecret, cc.Namespace)
 			var keyspacesWithData []string
 			if err == nil {
-				keyspacesWithData, err = jolokiaClient.HasDataInDC(dcName)
+				keyspacesWithData, err = jolokiaClient.NonLocalKeyspacesInDC(dcName)
 			}
 			if err != nil {
 				logrus.WithFields(logrus.Fields{"cluster": cc.Name}).Warningf(
-					"The Operator has refused the ScaleDown (HasDataInDC failed %s). ", err)
+					"The Operator has refused the ScaleDown (NonLocalKeyspacesInDC failed %s). ", err)
 				cc.Spec.Topology = oldCRD.Spec.Topology
 				return true, api.ActionCorrectCRDConfig
 			}

pkg/controller/cassandracluster/reconcile_test.go

@@ -595,7 +595,7 @@ func TestCheckNonAllowedChangesScaleDown(t *testing.T) {
 	hostName := fmt.Sprintf("%s.%s", pod.Spec.Hostname, pod.Spec.Subdomain)
 	rcc.CreatePod(pod)
 
-	//Mock Jolokia Call to HasDataInDC
+	//Mock Jolokia Call to NonLocalKeyspacesInDC
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
 	keyspacesDescribed := []string{}