Merge pull request #682 from lsc2001/fix-failover-config

Fix #681: Enable failover-policy option only in Fusedev mode

Author: imeoer

pkg/filesystem/fs.go

@@ -669,10 +669,13 @@ func (fs *Filesystem) createDaemon(fsManager *manager.Manager, daemonMode config
 		daemon.WithLogToStdout(config.GetLogToStdout()),
 		daemon.WithNydusdThreadNum(config.GetDaemonThreadsNumber()),
 		daemon.WithFsDriver(fsManager.FsDriver),
-		daemon.WithFailoverPolicy(config.GetDaemonFailoverPolicy()),
 		daemon.WithDaemonMode(daemonMode),
 	}
 
+	if fsManager.FsDriver == config.FsDriverFusedev {
+		opts = append(opts, daemon.WithFailoverPolicy(config.GetDaemonFailoverPolicy()))
+	}
+
 	// For fscache driver, no need to provide mountpoint to nydusd daemon.
 	if mountpoint != "" {
 		opts = append(opts, daemon.WithMountpoint(mountpoint))

pkg/manager/daemon_adaptor.go

@@ -200,7 +200,9 @@ func (m *Manager) BuildDaemonCommand(d *daemon.Daemon, bin string, upgrade bool)
 		cmdOpts = append(cmdOpts, command.WithLogFile(d.LogFile()))
 	}
 
-	cmdOpts = append(cmdOpts, command.WithFailoverPolicy(d.States.FailoverPolicy))
+	if d.States.FsDriver == config.FsDriverFusedev {
+		cmdOpts = append(cmdOpts, command.WithFailoverPolicy(d.States.FailoverPolicy))
+	}
 
 	args, err := command.BuildCommand(cmdOpts)
 	if err != nil {