Merge pull request #1156 from hashicorp/f-x-sys-unix

Use x/sys/unix vs syscall package where appropriate

client/allocdir/alloc_dir_posix.go → client/allocdir/alloc_dir_unix.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 // Functions shared between linux/darwin.
 package allocdir
@@ -8,7 +8,8 @@ import (
 	"os"
 	"os/user"
 	"strconv"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 func (d *AllocDir) linkOrCopy(src, dst string, perm os.FileMode) error {
@@ -22,7 +23,7 @@ func (d *AllocDir) linkOrCopy(src, dst string, perm os.FileMode) error {
 
 func (d *AllocDir) dropDirPermissions(path string) error {
 	// Can't do anything if not root.
-	if syscall.Geteuid() != 0 {
+	if unix.Geteuid() != 0 {
 		return nil
 	}
 

client/driver/docker_test.go

@@ -752,9 +752,20 @@ func TestDockerUser(t *testing.T) {
 		handle.Kill()
 		t.Fatalf("Should've failed")
 	}
-	msg := "System error: Unable to find user alice"
-	if !strings.Contains(err.Error(), msg) {
-		t.Fatalf("Expecting '%v' in '%v'", msg, err)
+
+	msgs := []string{
+		"System error: Unable to find user alice",
+		"linux spec user: Unable to find user alice",
+	}
+	var found bool
+	for _, msg := range msgs {
+		if strings.Contains(err.Error(), msg) {
+			found = true
+			break
+		}
+	}
+	if !found {
+		t.Fatalf("Expected failure string not found, found %q instead", err.Error())
 	}
 }
 

client/driver/exec.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/hashicorp/go-multierror"
@@ -81,33 +80,6 @@ func (d *ExecDriver) Validate(config map[string]interface{}) error {
 	return nil
 }
 
-func (d *ExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
-	// Get the current status so that we can log any debug messages only if the
-	// state changes
-	_, currentlyEnabled := node.Attributes[execDriverAttr]
-
-	// Only enable if cgroups are available and we are root
-	if _, ok := node.Attributes["unique.cgroup.mountpoint"]; !ok {
-		if currentlyEnabled {
-			d.logger.Printf("[DEBUG] driver.exec: cgroups unavailable, disabling")
-		}
-		delete(node.Attributes, execDriverAttr)
-		return false, nil
-	} else if syscall.Geteuid() != 0 {
-		if currentlyEnabled {
-			d.logger.Printf("[DEBUG] driver.exec: must run as root user, disabling")
-		}
-		delete(node.Attributes, execDriverAttr)
-		return false, nil
-	}
-
-	if !currentlyEnabled {
-		d.logger.Printf("[DEBUG] driver.exec: exec driver is enabled")
-	}
-	node.Attributes[execDriverAttr] = "1"
-	return true, nil
-}
-
 func (d *ExecDriver) Periodic() (bool, time.Duration) {
 	return true, 15 * time.Second
 }

client/driver/exec_default.go

@@ -0,0 +1,12 @@
+// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
+
+package driver
+
+import (
+	"github.com/hashicorp/nomad/client/config"
+	"github.com/hashicorp/nomad/nomad/structs"
+)
+
+func (d *ExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
+	return false, nil
+}

client/driver/exec_unix.go

@@ -0,0 +1,36 @@
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package driver
+
+import (
+	"github.com/hashicorp/nomad/client/config"
+	"github.com/hashicorp/nomad/nomad/structs"
+	"golang.org/x/sys/unix"
+)
+
+func (d *ExecDriver) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) {
+	// Get the current status so that we can log any debug messages only if the
+	// state changes
+	_, currentlyEnabled := node.Attributes[execDriverAttr]
+
+	// Only enable if cgroups are available and we are root
+	if _, ok := node.Attributes["unique.cgroup.mountpoint"]; !ok {
+		if currentlyEnabled {
+			d.logger.Printf("[DEBUG] driver.exec: cgroups unavailable, disabling")
+		}
+		delete(node.Attributes, execDriverAttr)
+		return false, nil
+	} else if unix.Geteuid() != 0 {
+		if currentlyEnabled {
+			d.logger.Printf("[DEBUG] driver.exec: must run as root user, disabling")
+		}
+		delete(node.Attributes, execDriverAttr)
+		return false, nil
+	}
+
+	if !currentlyEnabled {
+		d.logger.Printf("[DEBUG] driver.exec: exec driver is enabled")
+	}
+	node.Attributes[execDriverAttr] = "1"
+	return true, nil
+}

client/driver/executor/checks.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/armon/circbuf"
 	docker "github.com/fsouza/go-dockerclient"
-
 	cstructs "github.com/hashicorp/nomad/client/driver/structs"
 )
 

client/driver/executor/checks_linux.go → client/driver/executor/checks_unix.go

@@ -1,3 +1,5 @@
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
 package executor
 
 import (

client/driver/executor/checks_basic.go → client/driver/executor/checks_windows.go

@@ -1,10 +1,8 @@
-// +build !linux
+// +build windows
 
 package executor
 
-import (
-	"os/exec"
-)
+import "os/exec"
 
 func (e *ExecScriptCheck) setChroot(cmd *exec.Cmd) {
 }

client/driver/executor/executor.go

@@ -338,8 +338,16 @@ func (e *UniversalExecutor) wait() {
 		if status, ok := exitErr.Sys().(syscall.WaitStatus); ok {
 			exitCode = status.ExitStatus()
 			if status.Signaled() {
+				// bash(1) uses the lower 7 bits of a uint8
+				// to indicate normal program failure (see
+				// <sysexits.h>). If a process terminates due
+				// to a signal, encode the signal number to
+				// indicate which signal caused the process
+				// to terminate.  Mirror this exit code
+				// encoding scheme.
+				const exitSignalBase = 128
 				signal = int(status.Signal())
-				exitCode = 128 + signal
+				exitCode = exitSignalBase + signal
 			}
 		}
 	} else {

client/driver/executor/executor_posix.go → client/driver/executor/executor_unix.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package executor
 

client/driver/logging/syslog_parser.go → client/driver/logging/syslog_parser_unix.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 

client/driver/logging/syslog_parser_test.go → client/driver/logging/syslog_parser_unix_test.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 

client/driver/logging/universal_collector.go → client/driver/logging/universal_collector_unix.go

@@ -1,4 +1,4 @@
-// +build !windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package logging
 

client/driver/utils_posix.go → client/driver/utils_unix.go

@@ -1,4 +1,4 @@
-// +build !linux,!windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package driver
 

scripts/build.sh

@@ -17,7 +17,7 @@ GIT_DIRTY="$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)"
 
 # Determine the arch/os combos we're building for
 XC_ARCH=${XC_ARCH:-"386 amd64 arm"}
-XC_OS=${XC_OS:-linux darwin windows freebsd openbsd}
+XC_OS=${XC_OS:-darwin dragonfly freebsd linux netbsd openbsd solaris windows}
 
 # Delete the old dir
 echo "==> Removing old directory..."
@@ -35,8 +35,11 @@ fi
 echo "==> Building..."
 gox \
     -os="${XC_OS}" \
+    -os="!dragonfly" \
     -os="!freebsd" \
+    -os="!netbsd" \
     -os="!openbsd" \
+    -os="!solaris" \
     -arch="${XC_ARCH}" \
     -osarch="!linux/arm !darwin/386" \
     -ldflags "-X main.GitCommit='${GIT_COMMIT}${GIT_DIRTY}'" \