Add PendingRelease to CNS on start (#672)

* add pending release on start

Author: matmerr

cns/restserver/internalapi.go

@@ -191,6 +191,12 @@ func (service *HTTPRestService) ReconcileNCState(ncRequest *cns.CreateNetworkCon
 		}
 	}
 
+	err := service.MarkExistingIPsAsPending(spec.IPsNotInUse)
+	if err != nil {
+		logger.Errorf("[Azure CNS] Error. Failed to mark IP's as pending %v", spec.IPsNotInUse)
+		return UnexpectedError
+	}
+
 	return 0
 }
 
@@ -252,5 +258,4 @@ func (service *HTTPRestService) CreateOrUpdateNetworkContainerInternal(req cns.C
 	}
 
 	return returnCode
-
 }

cns/restserver/ipam.go

@@ -194,6 +194,26 @@ func (service *HTTPRestService) releaseIPConfig(podInfo cns.KubernetesPodInfo) e
 	return nil
 }
 
+// called when CNS is starting up and there are existing ipconfigs in the CRD that are marked as pending
+func (service *HTTPRestService) MarkExistingIPsAsPending(pendingIPIDs []string) error {
+	service.Lock()
+	defer service.Unlock()
+
+	for _, id := range pendingIPIDs {
+		if ipconfig, exists := service.PodIPConfigState[id]; exists {
+			if ipconfig.State == cns.Allocated {
+				return fmt.Errorf("Failed to mark IP [%v] as pending, currently allocated", id)
+			}
+
+			ipconfig.State = cns.PendingRelease
+			service.PodIPConfigState[id] = ipconfig
+		} else {
+			logger.Errorf("Inconsistent state, ipconfig with ID [%v] marked as pending release, but does not exist in state", id)
+		}
+	}
+	return nil
+}
+
 func (service *HTTPRestService) GetExistingIPConfig(podInfo cns.KubernetesPodInfo) (cns.PodIpInfo, bool, error) {
 	var (
 		podIpInfo cns.PodIpInfo

cns/restserver/ipam_test.go

@@ -534,7 +534,7 @@ func validateIpState(t *testing.T, actualIps []cns.IPConfigurationStatus, expect
 	}
 }
 
-func TestIPAMMarkIPConfigAsPending(t *testing.T) {
+func TestIPAMMarkIPCountAsPending(t *testing.T) {
 	svc := getTestService()
 	// set state as already allocated
 	state1, _ := NewPodStateWithOrchestratorContext(testIP1, 24, testPod1GUID, testNCID, cns.Available, testPod1Info)
@@ -574,3 +574,45 @@ func TestIPAMMarkIPConfigAsPending(t *testing.T) {
 		t.Fatalf("Unexpected failure releasing IP: %+v", err)
 	}
 }
+
+func TestIPAMMarkExistingIPConfigAsPending(t *testing.T) {
+	svc := getTestService()
+
+	// Add already allocated pod ip to state
+	svc.PodIPIDByOrchestratorContext[testPod1Info.GetOrchestratorContextKey()] = testPod1GUID
+	state1, _ := NewPodStateWithOrchestratorContext(testIP1, 24, testPod1GUID, testNCID, cns.Allocated, testPod1Info)
+	state2 := NewPodState(testIP2, 24, testPod2GUID, testNCID, cns.Available)
+
+	ipconfigs := map[string]cns.IPConfigurationStatus{
+		state1.ID: state1,
+		state2.ID: state2,
+	}
+	err := UpdatePodIpConfigState(t, svc, ipconfigs)
+	if err != nil {
+		t.Fatalf("Expected to not fail adding IP's to state: %+v", err)
+	}
+
+	// mark available ip as as pending
+	pendingIPIDs := []string{testPod2GUID}
+	err = svc.MarkExistingIPsAsPending(pendingIPIDs)
+	if err != nil {
+		t.Fatalf("Expected to successfully mark available ip as pending")
+	}
+
+	pendingIPConfigs := svc.GetPendingReleaseIPConfigs()
+	if pendingIPConfigs[0].ID != testPod2GUID {
+		t.Fatalf("Expected to see ID %v in pending release ipconfigs, actual %+v", testPod2GUID, pendingIPConfigs)
+	}
+
+	// attempt to mark allocated ipconfig as pending, expect fail
+	pendingIPIDs = []string{testPod1GUID}
+	err = svc.MarkExistingIPsAsPending(pendingIPIDs)
+	if err == nil {
+		t.Fatalf("Expected to fail when marking allocated ip as pending")
+	}
+
+	allocatedIPConfigs := svc.GetAllocatedIPConfigs()
+	if allocatedIPConfigs[0].ID != testPod1GUID {
+		t.Fatalf("Expected to see ID %v in pending release ipconfigs, actual %+v", testPod1GUID, allocatedIPConfigs)
+	}
+}

cns/service/main.go

@@ -477,8 +477,7 @@ func main() {
 			}
 		}()
 
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
+		ctx := context.Background()
 		go func() {
 			if err := httpRestServiceImplementation.IPAMPoolMonitor.Start(ctx, poolIPAMRefreshRateInMilliseconds); err != nil {
 				logger.Errorf("[Azure CNS] Failed to start pool monitor with err: %v", err)