Fixes from PR feedback.

Signed-off-by: James Munson <james.munson@suse.com>
longhorn · Jul 23, 2024 · 7ee089b · 7ee089b
1 parent c4ac54d
commit 7ee089b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/pkg/server/nfs/nfs_server.go b/pkg/server/nfs/nfs_server.go
@@ -84,7 +84,7 @@ type Server struct {
 	exporter   *Exporter
 }
 
-func NewServer(logger logrus.FieldLogger, configPath, exportPath, volume string, leaseLifetime int, gracePeriod int) (*Server, error) {
+func NewServer(logger logrus.FieldLogger, configPath, exportPath, volume string, leaseLifetime, gracePeriod int) (*Server, error) {
 	if err := setRlimitNOFILE(logger); err != nil {
 		logger.WithError(err).Warn("Error setting RLIMIT_NOFILE, there may be 'Too many open files' errors later")
 	}
@@ -145,7 +145,7 @@ func setRlimitNOFILE(logger logrus.FieldLogger) error {
 	return nil
 }
 
-func getUpdatedGaneshConfig(config []byte, leaseLifetime int, gracePeriod int) []byte {
+func getUpdatedGaneshConfig(config []byte, leaseLifetime, gracePeriod int) []byte {
 	var (
 		tmplBuf bytes.Buffer
 		logPath string

diff --git a/pkg/server/share_manager.go b/pkg/server/share_manager.go
@@ -69,15 +69,14 @@ func NewShareManager(logger logrus.FieldLogger, volume volume.Volume) (*ShareMan
 	}
 	m.context, m.shutdown = context.WithCancel(context.Background())
 
-	enableFastFailover := m.getEnvAsBool(EnvKeyFastFailover, false)
+	m.enableFastFailover = m.getEnvAsBool(EnvKeyFastFailover, false)
 	leaseLifetime := m.getEnvAsInt(EnvKeyLeaseLifetime, defaultLeaseLifetime)
 	gracePeriod := m.getEnvAsInt(EnvKeyGracePeriod, defaultGracePeriod)
 
-	m.enableFastFailover = enableFastFailover
 	if m.enableFastFailover {
 		kubeclientset, err := m.NewKubeClient()
 		if err != nil {
-			m.logger.WithError(err).Warn("Failed to make lease client for fast failover")
+			m.logger.WithError(err).Error("Failed to make lease client for fast failover")
 			return nil, err
 		}
 
@@ -155,7 +154,7 @@ func (m *ShareManager) Run() error {
 
 			if m.enableFastFailover {
 				if err = m.takeLease(); err != nil {
-					m.logger.WithError(err).Warn("Failed to take lease for fast failovr")
+					m.logger.WithError(err).Error("Failed to take lease for fast failovr")
 					return err
 				}
 				go m.runLeaseRenew()
@@ -321,9 +320,7 @@ func (m *ShareManager) takeLease() error {
 
 	now := time.Now()
 	currentHolder := *m.lease.Spec.HolderIdentity
-	if currentHolder != "" {
-		m.logger.Infof("Updating lease holderIdentity from %v to %v", currentHolder, m.leaseHolder)
-	}
+	m.logger.Infof("Updating lease holderIdentity from %v to %v", currentHolder, m.leaseHolder)
 
 	*m.lease.Spec.HolderIdentity = m.leaseHolder
 	*m.lease.Spec.LeaseTransitions = *m.lease.Spec.LeaseTransitions + 1