CLOUD-67831 Avoid timeouts when IPV6 is disabled saltstack/salt#32719

Author: akanto

Makefile

@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.3.1
+VERSION=0.3.2
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/sequenceiq/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/sequenceiq/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 

saltboot/client.go

@@ -35,7 +35,7 @@ func (clients *Clients) DistributeHostnameRequest(user string, pass string) (res
 
 func ClientHostnameHandler(w http.ResponseWriter, req *http.Request) {
 	log.Printf("[ClientHostnameHandler] get FQDN")
-	fqdn, err := ExecCmd("hostname", "-f")
+	fqdn, err := getHostName()
 	if err != nil {
 		log.Printf("[ClientHostnameHandler] failed to retrieve FQDN")
 		model.Response{Status: err.Error(), StatusCode: http.StatusInternalServerError}.WriteHttp(w)

saltboot/hostname.go

@@ -0,0 +1,70 @@
+package saltboot
+
+import (
+	"io/ioutil"
+	"strings"
+	"log"
+)
+
+const DEFAULT_DOMAIN = ".example.com"
+const HOST_FILE_NAME = "/etc/hosts"
+
+func getIpv4Address() (string, error) {
+	return ExecCmd("hostname", "-i")
+}
+
+func getHostName() (string, error) {
+	return ExecCmd("hostname", "-f")
+}
+
+// This is required due to: https://github.com/saltstack/salt/issues/32719
+func ensureIpv6Resolvable(domain string) (error) {
+	fqdn, err := getHostName()
+	log.Printf("[ensureIpv6Resolvable] fqdn: %s", fqdn)
+	if err != nil {
+		return err
+	}
+	if !strings.Contains(fqdn, ".") {
+		// only fqdn does not contain domain
+		if domain != "" {
+			updateIpv6HostName(fqdn, domain)
+		} else {
+			//if there is no domain, we need to add one since ambari fails without domain, actually it does nothing just hangs..
+			updateIpv6HostName(fqdn, DEFAULT_DOMAIN)
+		}
+	} else {
+		if domain != "" {
+			hostName := strings.Split(fqdn, ".")[0]
+			updateIpv6HostName(hostName, domain)
+		}
+	}
+
+	return nil
+}
+
+func updateIpv6HostName(hostName string, domain string) (error) {
+	log.Printf("[updateIpv6HostName] hostName: %s, domain: %s", hostName, domain)
+	b, err := ioutil.ReadFile(HOST_FILE_NAME)
+	if err != nil {
+		return err
+	}
+	hostfile := string(b)
+	log.Printf("[updateIpv6HostName] original hostfile: %s", hostfile)
+	address, err := getIpv4Address()
+	if err != nil {
+		return err
+	}
+	ipv6hostString := address + " " + hostName + domain + " " + hostName
+	log.Printf("[updateIpv6HostName] ipv6hostString: %s", ipv6hostString)
+	if !strings.Contains(hostfile, address) {
+		hostfile = hostfile + "\n" + ipv6hostString
+		log.Printf("[updateIpv6HostName] updated hostfile: %s", hostfile)
+		err = ioutil.WriteFile(HOST_FILE_NAME, []byte(hostfile), 0644)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+

saltboot/salt.go

@@ -26,13 +26,15 @@ type SaltAuth struct {
 type SaltMaster struct {
 	Address string     `json:"address"`
 	Auth    SaltAuth   `json:"auth,omitempty"`
+	Domain  string     `json:"domain,omitempty"`
 }
 
 type SaltMinion struct {
 	Address   string   `json:"address"`
 	Roles     []string `json:"roles,omitempty"`
 	Server    string   `json:"server,omitempty"`
 	HostGroup string   `json:"hostGroup,omitempty"`
+	Domain    string   `json:"domain,omitempty"`
 }
 
 type SaltPillar struct {
@@ -70,12 +72,16 @@ func (r SaltActionRequest) distributeAction(user string, pass string) (result []
 		if minion.Server == "" {
 			minion.Server = r.Master.Address
 		}
+		if minion.Domain == "" {
+			minion.Domain = r.Master.Domain
+		}
 		minionPayload = append(minionPayload, minion)
 	}
 
 	for res := range DistributePayload(targets, minionPayload, SaltMinionEp + "/" + r.Action, user, pass) {
 		result = append(result, res)
 	}
+
 	if len(r.Master.Address) > 0 {
 		result = append(result, <-DistributePayload([]string{r.Master.Address}, []Payload{r.Master}, SaltServerEp + "/" + r.Action, user, pass))
 	}
@@ -95,6 +101,11 @@ func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 	}
 	log.Printf("[SaltMinionRunRequestHandler] received json: %s", saltMinion.AsByteArray())
 
+	err = ensureIpv6Resolvable(saltMinion.Domain)
+	if err != nil {
+		log.Printf("[ERROR] while hostfile update: %s", err)
+	}
+
 	grainConfig := GrainConfig{Roles: saltMinion.Roles, HostGroup: saltMinion.HostGroup}
 	grainYaml, err := yaml.Marshal(grainConfig)
 	var resp model.Response
@@ -170,6 +181,11 @@ func SaltServerRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	ensureIpv6Resolvable(saltMaster.Domain)
+	if err != nil {
+		log.Printf("[ERROR] while hostfile update: %s", err)
+	}
+
 	resp, err := CreateUser(saltMaster)
 	resp.WriteHttp(w)
 	if err != nil {