@@ -113,7 +113,7 @@ type Cluster struct {

 	mu           sync.RWMutex

 	controlMutex sync.RWMutex // protect init/join/leave user operations

 	nr           *nodeRunner

-	root         string

+	stateDir     string

 	runtimeRoot  string

 	config       Config

 	configEvent  chan lncluster.ConfigEventType // todo: make this array and goroutine safe

@@ -136,12 +136,12 @@ type attacher struct {

 // New creates a new Cluster instance using provided config.

 func New(config Config) (*Cluster, error) {

-	root := filepath.Join(config.Root, swarmDirName)

-	if err := os.MkdirAll(root, 0o700); err != nil {

+	stateDir := filepath.Join(config.Root, swarmDirName)

+	if err := os.MkdirAll(stateDir, 0o700); err != nil {

 		return nil, err

 	}

 	if config.RuntimeRoot == "" {

-		config.RuntimeRoot = root

+		config.RuntimeRoot = stateDir

 	}

 	if config.RaftHeartbeatTick == 0 {

 		config.RaftHeartbeatTick = 1

@@ -155,7 +155,7 @@ func New(config Config) (*Cluster, error) {

 		return nil, err

 	}

 	c := &Cluster{

-		root:        root,

+		stateDir:    stateDir,

 		config:      config,

 		configEvent: make(chan lncluster.ConfigEventType, 10),

 		runtimeRoot: config.RuntimeRoot,

@@ -172,9 +172,7 @@ func New(config Config) (*Cluster, error) {

 // TODO The split between New and Start can be join again when the SendClusterEvent

 // method is no longer required

 func (c *Cluster) Start() error {

-	root := filepath.Join(c.config.Root, swarmDirName)

-

-	nodeConfig, err := loadPersistentState(root)

+	nodeConfig, err := loadPersistentState(c.stateDir)

 	if err != nil {

 		if os.IsNotExist(err) {

 			return nil

@@ -131,7 +131,7 @@ func (n *nodeRunner) start(conf nodeStartConfig) error {

 			VXLANUDPPort:    conf.DataPathPort,

 		},

 		JoinAddr:  joinAddr,

-		StateDir:  n.cluster.root,

+		StateDir:  n.cluster.stateDir,

 		JoinToken: conf.joinToken,

 		Executor: container.NewExecutor(

 			n.cluster.config.Backend,

@@ -171,7 +171,7 @@ func (n *nodeRunner) start(conf nodeStartConfig) error {

 		conf.JoinInProgress = true

 	}

 	n.config = conf

-	savePersistentState(n.cluster.root, conf)

+	savePersistentState(n.cluster.stateDir, conf)

 	ctx, cancel := context.WithCancel(context.Background())

@@ -262,7 +262,7 @@ func (n *nodeRunner) handleReadyEvent(ctx context.Context, node *swarmnode.Node,

 		n.err = nil

 		if n.config.JoinInProgress {

 			n.config.JoinInProgress = false

-			savePersistentState(n.cluster.root, n.config)

+			savePersistentState(n.cluster.stateDir, n.config)

 		}

 		n.mu.Unlock()

 		close(ready)

@@ -128,7 +128,7 @@ func (c *Cluster) Init(req types.InitRequest) (string, error) {

 		c.nr = nil

 		c.mu.Unlock()

 		if !req.ForceNewCluster { // if failure on first attempt don't keep state

-			if err := clearPersistentState(c.root); err != nil {

+			if err := clearPersistentState(c.stateDir); err != nil {

 				return "", err

 			}

 		}

@@ -207,7 +207,7 @@ func (c *Cluster) Join(req types.JoinRequest) error {

 			c.mu.Lock()

 			c.nr = nil

 			c.mu.Unlock()

-			if err := clearPersistentState(c.root); err != nil {

+			if err := clearPersistentState(c.stateDir); err != nil {

 				return err

 			}

 		}

@@ -421,7 +421,7 @@ func (c *Cluster) Leave(ctx context.Context, force bool) error {

 	}

 	// todo: cleanup optional?

-	if err := clearPersistentState(c.root); err != nil {

+	if err := clearPersistentState(c.stateDir); err != nil {

 		return err

 	}

 	c.config.Backend.DaemonLeavesCluster()