Remove pod infomer in engine controller and fix some NIT for Eric's

comments

longhorn-6205

Signed-off-by: Phan Le <phan.le@suse.com>

controller/engine_controller.go

@@ -187,18 +187,6 @@ func NewEngineController(
 	}
 	ec.cacheSyncs = append(ec.cacheSyncs, ds.InstanceManagerInformer.HasSynced)
 
-	if _, err = ds.PodInformer.AddEventHandlerWithResyncPeriod(cache.FilteringResourceEventHandler{
-		FilterFunc: isShareManagerPod,
-		Handler: cache.ResourceEventHandlerFuncs{
-			AddFunc:    ec.enqueueShareManagerPodChange,
-			UpdateFunc: func(old, cur interface{}) { ec.enqueueShareManagerPodChange(cur) },
-			DeleteFunc: ec.enqueueShareManagerPodChange,
-		},
-	}, 0); err != nil {
-		return nil, err
-	}
-	ec.cacheSyncs = append(ec.cacheSyncs, ds.PodInformer.HasSynced)
-
 	return ec, nil
 }
 

controller/share_manager_controller.go

@@ -371,7 +371,7 @@ func (c *ShareManagerController) syncShareManager(key string) (err error) {
 		return err
 	}
 	if isStale {
-		isDelinquent, _, err := c.ds.IsRWXVolumeInDelinquent(sm.Name)
+		isDelinquent, _, err := c.ds.IsRWXVolumeDelinquent(sm.Name)
 		if err != nil {
 			return err
 		}
@@ -1160,7 +1160,7 @@ func (c *ShareManagerController) createShareManagerPod(sm *longhorn.ShareManager
 		}
 	}
 
-	isDelinquent, delinquentNode, err := c.ds.IsRWXVolumeInDelinquent(sm.Name)
+	isDelinquent, delinquentNode, err := c.ds.IsRWXVolumeDelinquent(sm.Name)
 	if err != nil {
 		return nil, err
 	}

datastore/kubernetes.go

@@ -282,13 +282,13 @@ func (s *DataStore) UpdateLease(lease *coordinationv1.Lease) (*coordinationv1.Le
 	return s.kubeClient.CoordinationV1().Leases(s.namespace).Update(context.TODO(), lease, metav1.UpdateOptions{})
 }
 
-// IsRWXVolumeInDelinquent checks whether the volume has a lease by the same name, which an RWX volume should,
+// IsRWXVolumeDelinquent checks whether the volume has a lease by the same name, which an RWX volume should,
 // and whether that lease's spec shows that its holder is delinquent (its acquire time has been zeroed.)
 // If so, return the delinquent holder.
 // Any hiccup yields a return of "false".
-func (s *DataStore) IsRWXVolumeInDelinquent(name string) (isDelinquent bool, holder string, err error) {
+func (s *DataStore) IsRWXVolumeDelinquent(name string) (isDelinquent bool, holder string, err error) {
 	defer func() {
-		err = errors.Wrapf(err, "failed to check IsRWXVolumeInDelinquent")
+		err = errors.Wrapf(err, "failed to check IsRWXVolumeDelinquent")
 	}()
 
 	enabled, err := s.GetSettingAsBool(types.SettingNameEnableShareManagerFastFailover)

datastore/longhorn.go

@@ -2956,7 +2956,7 @@ func (s *DataStore) IsNodeDelinquent(nodeName string, volumeName string) (bool,
 		return false, nil
 	}
 
-	isDelinquent, delinquentNode, err := s.IsRWXVolumeInDelinquent(volumeName)
+	isDelinquent, delinquentNode, err := s.IsRWXVolumeDelinquent(volumeName)
 	if err != nil {
 		return false, err
 	}