CLOUD-67234 Sysv scripts starts the salt minion twice

Author: akanto

Makefile

@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.9.2
+VERSION=0.10.0
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/hortonworks/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/hortonworks/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 GOFILES = $(shell find . -type f -name '*.go')

saltboot/salt.go

@@ -87,7 +87,7 @@ func distributeActionImpl(distributePayload func(clients []string, payloads []Pa
 }
 
 func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
-	log.Printf("[SaltMinionRunRequestHandler] execute salt run request")
+	log.Printf("[SaltMinionRunRequestHandler] execute salt-minion run request")
 
 	decoder := json.NewDecoder(req.Body)
 	var saltMinion SaltMinion
@@ -97,6 +97,7 @@ func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		model.Response{Status: err.Error()}.WriteBadRequestHttp(w)
 		return
 	}
+	log.Printf("[SaltMinionRunRequestHandler] received json: %s", saltMinion.AsByteArray())
 
 	grainConfig := GrainConfig{Roles: saltMinion.Roles, HostGroup: saltMinion.HostGroup}
 	grainYaml, err := yaml.Marshal(grainConfig)
@@ -130,12 +131,24 @@ func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		resp.WriteHttp(w)
 		return
 	}
+	psOutput, err := ExecCmd("ps", "aux")
+	alreadyRunning := strings.Contains(psOutput, "salt-minion")
+
+	if alreadyRunning {
+		log.Printf("[SaltMinionRunRequestHandler] salt-minion is already running %s", psOutput)
+		resp = model.Response{StatusCode: http.StatusOK, Status: "salt-minion already running"}
+		resp.WriteHttp(w)
+		return
+	} else {
+		log.Printf("[SaltMinionRunRequestHandler] salt-minion is not running and will be started")
+	}
 	resp, _ = LaunchService("salt-minion")
+	log.Printf("[SaltMinionRunRequestHandler] execute salt-minion run request")
 	resp.WriteHttp(w)
 }
 
 func SaltMinionStopRequestHandler(w http.ResponseWriter, req *http.Request) {
-	log.Printf("[SaltMinionStopRequestHandler] execute salt minion stop request")
+	log.Printf("[SaltMinionStopRequestHandler] execute salt-minion stop request")
 
 	decoder := json.NewDecoder(req.Body)
 	var saltMinion SaltMinion
@@ -145,6 +158,7 @@ func SaltMinionStopRequestHandler(w http.ResponseWriter, req *http.Request) {
 		model.Response{Status: err.Error()}.WriteBadRequestHttp(w)
 		return
 	}
+	log.Printf("[SaltMinionRunRequestHandler] received json: %s", saltMinion.AsByteArray())
 
 	resp, _ := StopService("salt-minion")
 	resp.WriteHttp(w)

saltboot/salt_test.go

@@ -102,7 +102,7 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {
 		t.Errorf("couldn't unmarshall grain yaml: %s", err)
 	}
 
-	if os.Getenv(EXECUTED_COMMANDS) != "/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {
+	if os.Getenv(EXECUTED_COMMANDS) != "ps aux:/sbin/service salt-minion start:/sbin/chkconfig salt-minion on:" {
 		t.Errorf("wrong commands were executed: %s", os.Getenv(EXECUTED_COMMANDS))
 	}
 }