Merge branch 'master' into b-5345-prometheus-metric-label-conflict

CHANGELOG.md

@@ -7,6 +7,9 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
+* drivers: Fixed an issue preventing external driver plugins from launching executor process [[GH-5726](https://github.com/hashicorp/nomad/issues/5726)]
+* drivers/docker: Fixed a bug mounting relative paths on Windows [[GH-5811](https://github.com/hashicorp/nomad/issues/5811)]
+* drivers/exec: Upgraded libcontainer dependency to avoid zombie `runc:[1:CHILD]]` processes [[GH-5851](https://github.com/hashicorp/nomad/issues/5851)]
 * metrics: upgrade prometheus client to avoid label conflicts [[GH-5850](https://github.com/hashicorp/nomad/issues/5850)]
 * ui: Fixed ability to click sort arrow to change sort direction [[GH-5833](https://github.com/hashicorp/nomad/pull/5833)]
 

client/logmon/plugin.go

@@ -2,12 +2,12 @@ package logmon
 
 import (
 	"context"
+	"os"
 	"os/exec"
 
 	hclog "github.com/hashicorp/go-hclog"
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/nomad/client/logmon/proto"
-	"github.com/hashicorp/nomad/helper/discover"
 	"github.com/hashicorp/nomad/plugins/base"
 	"google.golang.org/grpc"
 )
@@ -16,7 +16,7 @@ import (
 // TODO: Integrate with base plugin loader
 func LaunchLogMon(logger hclog.Logger, reattachConfig *plugin.ReattachConfig) (LogMon, *plugin.Client, error) {
 	logger = logger.Named("logmon")
-	bin, err := discover.NomadExecutable()
+	bin, err := os.Executable()
 	if err != nil {
 		return nil, nil, err
 	}

client/logmon/z_logmon_cmd.go

@@ -0,0 +1,33 @@
+package logmon
+
+import (
+	"os"
+
+	hclog "github.com/hashicorp/go-hclog"
+	plugin "github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/nomad/plugins/base"
+)
+
+// Install a plugin cli handler to ease working with tests
+// and external plugins.
+// This init() must be initialized last in package required by the child plugin
+// process. It's recommended to avoid any other `init()` or inline any necessary calls
+// here. See eeaa95d commit message for more details.
+func init() {
+	if len(os.Args) > 1 && os.Args[1] == "logmon" {
+		logger := hclog.New(&hclog.LoggerOptions{
+			Level:      hclog.Trace,
+			JSONFormat: true,
+			Name:       "logmon",
+		})
+		plugin.Serve(&plugin.ServeConfig{
+			HandshakeConfig: base.Handshake,
+			Plugins: map[string]plugin.Plugin{
+				"logmon": NewPlugin(NewLogMon(logger)),
+			},
+			GRPCServer: plugin.DefaultGRPCServer,
+			Logger:     logger,
+		})
+		os.Exit(0)
+	}
+}

command/commands.go

@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/hashicorp/nomad/command/agent"
-	"github.com/hashicorp/nomad/drivers/docker/docklog"
 	"github.com/hashicorp/nomad/version"
 	colorable "github.com/mattn/go-colorable"
 	"github.com/mitchellh/cli"
@@ -237,11 +236,6 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
 				Meta: meta,
 			}, nil
 		},
-		docklog.PluginName: func() (cli.Command, error) {
-			return &DockerLoggerPluginCommand{
-				Meta: meta,
-			}, nil
-		},
 		"eval": func() (cli.Command, error) {
 			return &EvalCommand{
 				Meta: meta,
@@ -262,11 +256,6 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
 				Meta: meta,
 			}, nil
 		},
-		"executor": func() (cli.Command, error) {
-			return &ExecutorPluginCommand{
-				Meta: meta,
-			}, nil
-		},
 		"fs": func() (cli.Command, error) {
 			return &AllocFSCommand{
 				Meta: meta,
@@ -372,11 +361,6 @@ func Commands(metaPtr *Meta, agentUi cli.Ui) map[string]cli.CommandFactory {
 				Meta: meta,
 			}, nil
 		},
-		"logmon": func() (cli.Command, error) {
-			return &LogMonPluginCommand{
-				Meta: meta,
-			}, nil
-		},
 		"logs": func() (cli.Command, error) {
 			return &AllocLogsCommand{
 				Meta: meta,

drivers/docker/docklog/plugin.go

@@ -2,12 +2,12 @@ package docklog
 
 import (
 	"context"
+	"os"
 	"os/exec"
 
 	hclog "github.com/hashicorp/go-hclog"
 	plugin "github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/nomad/drivers/docker/docklog/proto"
-	"github.com/hashicorp/nomad/helper/discover"
 	"github.com/hashicorp/nomad/plugins/base"
 	"google.golang.org/grpc"
 )
@@ -17,7 +17,7 @@ const PluginName = "docker_logger"
 // LaunchDockerLogger launches an instance of DockerLogger
 func LaunchDockerLogger(logger hclog.Logger) (DockerLogger, *plugin.Client, error) {
 	logger = logger.Named(PluginName)
-	bin, err := discover.NomadExecutable()
+	bin, err := os.Executable()
 	if err != nil {
 		return nil, nil, err
 	}

drivers/docker/docklog/z_docker_logger_cmd.go

@@ -0,0 +1,34 @@
+package docklog
+
+import (
+	"os"
+
+	log "github.com/hashicorp/go-hclog"
+	plugin "github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/nomad/plugins/base"
+)
+
+// Install a plugin cli handler to ease working with tests
+// and external plugins.
+// This init() must be initialized last in package required by the child plugin
+// process. It's recommended to avoid any other `init()` or inline any necessary calls
+// here. See eeaa95d commit message for more details.
+func init() {
+	if len(os.Args) > 1 && os.Args[1] == PluginName {
+		logger := log.New(&log.LoggerOptions{
+			Level:      log.Trace,
+			JSONFormat: true,
+			Name:       PluginName,
+		})
+
+		plugin.Serve(&plugin.ServeConfig{
+			HandshakeConfig: base.Handshake,
+			Plugins: map[string]plugin.Plugin{
+				PluginName: NewPlugin(NewDockerLogger(logger)),
+			},
+			GRPCServer: plugin.DefaultGRPCServer,
+			Logger:     logger,
+		})
+		os.Exit(0)
+	}
+}

drivers/docker/utils.go

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -12,7 +11,6 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/registry"
-	"github.com/docker/docker/volume/mounts"
 	docker "github.com/fsouza/go-dockerclient"
 )
 
@@ -230,26 +228,23 @@ func parseVolumeSpec(volBind, os string) (hostPath string, containerPath string,
 }
 
 func parseVolumeSpecWindows(volBind string) (hostPath string, containerPath string, mode string, err error) {
-	parser := mounts.NewParser("windows")
-	m, err := parser.ParseMountRaw(volBind, "")
+	parts, err := windowsSplitRawSpec(volBind, rxDestination)
 	if err != nil {
-		return "", "", "", err
+		return "", "", "", fmt.Errorf("not <src>:<destination> format")
 	}
 
-	src := m.Source
-	if src == "" && strings.Contains(volBind, m.Name) {
-		src = m.Name
+	if len(parts) < 2 {
+		return "", "", "", fmt.Errorf("not <src>:<destination> format")
 	}
 
-	if src == "" {
-		return "", "", "", errors.New("missing host path")
-	}
+	hostPath = parts[0]
+	containerPath = parts[1]
 
-	if m.Destination == "" {
-		return "", "", "", errors.New("container path is empty")
+	if len(parts) > 2 {
+		mode = parts[2]
 	}
 
-	return src, m.Destination, m.Mode, nil
+	return
 }
 
 func parseVolumeSpecLinux(volBind string) (hostPath string, containerPath string, mode string, err error) {