From de287e3efb961112ab359de63eea650ff3b4e8e2 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Thu, 15 Oct 2015 14:21:35 -0700
Subject: [PATCH] agent: consolidates data dir checker

---
 command/agent/command.go | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/command/agent/command.go b/command/agent/command.go
index f7b5dbf3d9..2d642b20e3 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -168,8 +168,9 @@ func (c *Command) readConfig() *Config {
 	// server. Consul refuses to start if this is present to protect a server
 	// with existing data from starting on a fresh data set.
 	if config.Server {
-		if err := checkDataFormat(config.DataDir); err != nil {
-			c.Ui.Error(fmt.Sprintf("CRITICAL: %v", err))
+		mdbPath := filepath.Join(config.DataDir, "mdb")
+		if _, err := os.Stat(mdbPath); !os.IsNotExist(err) {
+			c.Ui.Error(fmt.Sprintf("CRITICAL: Deprecated data folder found at %q!", mdbPath))
 			c.Ui.Error("Consul will refuse to boot with this directory present.")
 			c.Ui.Error("See https://consul.io/docs/upgrade-specific.html for more information.")
 			return nil
@@ -866,17 +867,6 @@ func (c *Command) handleReload(config *Config) *Config {
 	return newConf
 }
 
-// checkDataFormat checks the Consul data directory for the deprecated "mdb"
-// folder. If it exists, Consul will fail to boot, avoiding situations where
-// non-migrated servers start with a fresh data set.
-func checkDataFormat(dataDir string) error {
-	mdbPath := filepath.Join(dataDir, "mdb")
-	if _, err := os.Stat(mdbPath); !os.IsNotExist(err) {
-		return fmt.Errorf("Deprecated data folder found at %q!", mdbPath)
-	}
-	return nil
-}
-
 // startScadaClient is used to start a new SCADA provider and listener,
 // replacing any existing listeners.
 func (c *Command) setupScadaConn(config *Config) error {