no need to remove lock files on reboot (#1041)

Author: tamilmani1989

cni/plugin.go

@@ -161,9 +161,6 @@ func (plugin *Plugin) InitializeKeyValueStore(config *common.PluginConfig) error
 			log.Printf("[cni] Failed to create store: %v.", err)
 			return err
 		}
-
-		// Force unlock the json store if the lock file is left on the node after reboot
-		removeLockFileAfterReboot(plugin)
 	}
 
 	// Acquire store lock.

cni/plugin_linux.go

@@ -176,16 +176,20 @@ func (kvs *jsonFileStore) flush() error {
 
 // Lock locks the store for exclusive access.
 func (kvs *jsonFileStore) Lock(block bool) error {
+	var (
+		lockFile *os.File
+		err      error
+	)
+
 	kvs.Mutex.Lock()
 	defer kvs.Mutex.Unlock()
 
 	if kvs.locked {
 		return ErrStoreLocked
 	}
 
-	var lockFile *os.File
-	var err error
-	lockPerm := os.FileMode(0o664) + os.FileMode(os.ModeExclusive)
+	//nolint:gomnd // 0o664 - read write mode constant
+	lockPerm := os.FileMode(0o644) + os.FileMode(os.ModeExclusive)
 
 	// Try to acquire the lock file.
 	var lockRetryCount uint
@@ -270,14 +274,6 @@ func (kvs *jsonFileStore) GetLockFileModificationTime() (time.Time, error) {
 	kvs.Mutex.Lock()
 	defer kvs.Mutex.Unlock()
 
-	// Check if the file exists.
-	file, err := os.Open(kvs.lockFileName)
-	if err != nil {
-		return time.Time{}.UTC(), err
-	}
-
-	defer file.Close()
-
 	info, err := os.Stat(kvs.lockFileName)
 	if err != nil {
 		log.Printf("os.stat() for file %v failed: %v", kvs.lockFileName, err)