judge manager if locked before parsing key

Signed-off-by: allencloud <allen.sun@daocloud.io> Upstream-commit: 89100c162b23791b4a64d142a11014257bf61fd0 Component: engine
2016-11-21 16:39:09 +08:00
parent 67a9711f50
commit 9fec0659ba
1 changed files with 5 additions and 5 deletions
@@ -592,6 +592,11 @@ func (c *Cluster) UnlockSwarm(req types.UnlockRequest) error {
 			return err
 		}
 	}
+
+	if c.node != nil || c.locked != true {
+		c.RUnlock()
+		return errors.New("swarm is not locked")
+	}
 	c.RUnlock()

 	key, err := encryption.ParseHumanReadableKey(req.UnlockKey)
@@ -600,11 +605,6 @@ func (c *Cluster) UnlockSwarm(req types.UnlockRequest) error {
 	}

 	c.Lock()
-	if c.node != nil || c.locked != true {
-		c.Unlock()
-		return errors.New("swarm is not locked")
-	}
-
 	config := *c.lastNodeConfig
 	config.lockKey = key
 	n, err := c.startNewNode(config)