combine methods

Signed-off-by: Mladjan Gadzic <[email protected]>

Author: mladjan-gadzic

pkg/daemon/daemon.go

@@ -154,8 +154,8 @@ func NewDaemon() (Daemon, error) {
 		guidPodNetworkMap: make(map[string]string),
 	}
 
-	// Reset guid pool with already allocated guids to avoid collisions
-	err = daemonInstance.syncGUIDPool()
+	// Initialize guid pool with existing pods and sync with subnet manager
+	err = daemonInstance.initGUIDPool()
 	if err != nil {
 		return nil, err
 	}
@@ -469,7 +469,7 @@ func (d *daemon) processNetworkGUID(
 			switch err {
 			// If the guid pool is exhausted, need to sync with SM in case there are unsynced changes
 			case guid.ErrGUIDPoolExhausted:
-				err = d.syncGUIDPool()
+				err = d.syncWithSubnetManager()
 				if err != nil {
 					return err
 				}
@@ -541,37 +541,6 @@ func (d *daemon) removeStaleGUID(allocatedGUID, existingPkey string) error {
 	return nil
 }
 
-func (d *daemon) syncGUIDPool() error {
-	usedGuids, err := d.smClient.ListGuidsInUse()
-	if err != nil {
-		return err
-	}
-
-	// Reset guid pool with already allocated guids to avoid collisions
-	err = d.guidPool.Reset(usedGuids)
-	if err != nil {
-		return err
-	}
-
-	// Remove stale GUIDs that are no longer in use by the subnet manager
-	// This handles cleanup of GUIDs from deleted/finished pods
-	for allocatedGUID, podNetworkID := range d.guidPodNetworkMap {
-		if _, found := usedGuids[allocatedGUID]; !found {
-			// If GUID is not found in the subnet manager's list of used GUIDs,
-			// it means the pod was deleted/finished and we should clean it up
-			log.Info().Msgf("removing stale GUID %s for pod network %s", allocatedGUID, podNetworkID)
-			if err = d.guidPool.ReleaseGUID(allocatedGUID); err != nil {
-				log.Warn().Msgf("failed to release stale guid \"%s\" with error: %v", allocatedGUID, err)
-			} else {
-				delete(d.guidPodNetworkMap, allocatedGUID)
-				log.Info().Msgf("successfully cleaned up stale GUID %s", allocatedGUID)
-			}
-		}
-	}
-
-	return nil
-}
-
 // Update and set Pod's network annotation.
 // If failed to update annotation, pod's GUID added into the list to be removed from Pkey.
 func (d *daemon) updatePodNetworkAnnotation(pi *podNetworkInfo, removedList *[]net.HardwareAddr, pkey string) error {
@@ -835,11 +804,12 @@ func (d *daemon) DeletePeriodicUpdate() {
 	log.Info().Msg("delete periodic update finished")
 }
 
-// initPool check the guids that are already allocated by the running pods
-func (d *daemon) initPool() error {
+// initGUIDPool initializes the GUID pool by first populating guidPodNetworkMap with existing pods,
+// then syncing with subnet manager and cleaning up stale GUIDs
+func (d *daemon) initGUIDPool() error {
 	log.Info().Msg("Initializing GUID pool.")
 
-	// Try to get pod list from k8s client in backoff loop
+	// First populate guidPodNetworkMap with existing pods
 	var pods *kapi.PodList
 	if err := wait.ExponentialBackoff(backoffValues, func() (bool, error) {
 		var err error
@@ -894,5 +864,67 @@ func (d *daemon) initPool() error {
 		}
 	}
 
+	// Now sync with subnet manager and clean up stale GUIDs
+	usedGuids, err := d.smClient.ListGuidsInUse()
+	if err != nil {
+		return err
+	}
+
+	// Reset guid pool with already allocated guids to avoid collisions
+	err = d.guidPool.Reset(usedGuids)
+	if err != nil {
+		return err
+	}
+
+	// Remove stale GUIDs that are no longer in use by the subnet manager
+	// This handles cleanup of GUIDs from deleted/finished pods
+	// Now guidPodNetworkMap is populated, so this cleanup will work correctly
+	for allocatedGUID, podNetworkID := range d.guidPodNetworkMap {
+		if _, found := usedGuids[allocatedGUID]; !found {
+			// If GUID is not found in the subnet manager's list of used GUIDs,
+			// it means the pod was deleted/finished and we should clean it up
+			log.Info().Msgf("removing stale GUID %s for pod network %s", allocatedGUID, podNetworkID)
+			if err = d.guidPool.ReleaseGUID(allocatedGUID); err != nil {
+				log.Warn().Msgf("failed to release stale guid \"%s\" with error: %v", allocatedGUID, err)
+			} else {
+				delete(d.guidPodNetworkMap, allocatedGUID)
+				log.Info().Msgf("successfully cleaned up stale GUID %s", allocatedGUID)
+			}
+		}
+	}
+
+	return nil
+}
+
+// syncWithSubnetManager syncs the GUID pool with the subnet manager during runtime
+// This is used when the pool is exhausted and we need to check for available GUIDs
+func (d *daemon) syncWithSubnetManager() error {
+	usedGuids, err := d.smClient.ListGuidsInUse()
+	if err != nil {
+		return err
+	}
+
+	// Reset guid pool with already allocated guids to avoid collisions
+	err = d.guidPool.Reset(usedGuids)
+	if err != nil {
+		return err
+	}
+
+	// Remove stale GUIDs that are no longer in use by the subnet manager
+	// This handles cleanup of GUIDs from deleted/finished pods during runtime
+	for allocatedGUID, podNetworkID := range d.guidPodNetworkMap {
+		if _, found := usedGuids[allocatedGUID]; !found {
+			// If GUID is not found in the subnet manager's list of used GUIDs,
+			// it means the pod was deleted/finished and we should clean it up
+			log.Info().Msgf("removing stale GUID %s for pod network %s", allocatedGUID, podNetworkID)
+			if err = d.guidPool.ReleaseGUID(allocatedGUID); err != nil {
+				log.Warn().Msgf("failed to release stale guid \"%s\" with error: %v", allocatedGUID, err)
+			} else {
+				delete(d.guidPodNetworkMap, allocatedGUID)
+				log.Info().Msgf("successfully cleaned up stale GUID %s", allocatedGUID)
+			}
+		}
+	}
+
 	return nil
 }