drivers: include volume within mount config (#27710)

Add an optional `RequestName` attribute to the mount config. If the mount
config entry originated from a volume, the request name of the volume used
within the jobspec will be included within the entry.

Author: chrisroberts

.changelog/27710.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+drivers: include volume RequestName within mount config information if available
+```

.changelog/27711.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+drivers: kill plugin instance on dispense failure
+```

client/allocrunner/taskrunner/volume_hook.go

@@ -91,6 +91,7 @@ func (h *volumeHook) hostVolumeMountConfigurations(taskMounts []*structs.VolumeM
 		}
 
 		mcfg := &drivers.MountConfig{
+			RequestName:     hostVolume.Name,
 			HostPath:        hostVolume.Path,
 			TaskPath:        m.Destination,
 			Readonly:        hostVolume.ReadOnly || req.ReadOnly || m.ReadOnly,
@@ -185,6 +186,7 @@ func (h *volumeHook) prepareCSIVolumes(req *interfaces.TaskPrestartRequest, volu
 
 		for _, m := range mountsForAlias {
 			mcfg := &drivers.MountConfig{
+				RequestName:     request.Name,
 				HostPath:        csiMountPoint.Source,
 				TaskPath:        m.Destination,
 				Readonly:        request.ReadOnly || m.ReadOnly,

client/allocrunner/taskrunner/volume_hook_test.go

@@ -91,6 +91,7 @@ func TestVolumeHook_prepareCSIVolumes(t *testing.T) {
 
 	volumes := map[string]*structs.VolumeRequest{
 		"foo": {
+			Name:   "foo",
 			Type:   "csi",
 			Source: "my-test-volume",
 		},
@@ -113,8 +114,9 @@ func TestVolumeHook_prepareCSIVolumes(t *testing.T) {
 			},
 			Expected: []*drivers.MountConfig{
 				{
-					HostPath: "/mnt/my-test-volume",
-					TaskPath: "/bar",
+					RequestName: "foo",
+					HostPath:    "/mnt/my-test-volume",
+					TaskPath:    "/bar",
 				},
 			},
 		},

plugins/drivers/driver.go

@@ -444,6 +444,7 @@ func (d *DeviceConfig) Copy() *DeviceConfig {
 }
 
 type MountConfig struct {
+	RequestName     string
 	TaskPath        string
 	HostPath        string
 	Readonly        bool
@@ -456,7 +457,8 @@ func (m *MountConfig) IsEqual(o *MountConfig) bool {
 		m.HostPath == o.HostPath &&
 		m.Readonly == o.Readonly &&
 		m.PropagationMode == o.PropagationMode &&
-		m.SELinuxLabel == o.SELinuxLabel
+		m.SELinuxLabel == o.SELinuxLabel &&
+		m.RequestName == o.RequestName
 }
 
 func (m *MountConfig) Copy() *MountConfig {

plugins/drivers/proto/driver.pb.go

@@ -600,6 +600,10 @@ message Mount {
     string propagation_mode = 4;
 
     string selinux_label = 5;
+
+    // RequestName is the optional name of the volume request in the job spec
+    // from which this mount originated.
+    string request_name = 6;
 }
 
 message Device {

plugins/drivers/proto/driver.proto

@@ -290,6 +290,7 @@ func MountFromProto(mount *proto.Mount) *MountConfig {
 	}
 
 	return &MountConfig{
+		RequestName:     mount.RequestName,
 		TaskPath:        mount.TaskPath,
 		HostPath:        mount.HostPath,
 		Readonly:        mount.Readonly,
@@ -342,6 +343,7 @@ func MountToProto(mount *MountConfig) *proto.Mount {
 	}
 
 	return &proto.Mount{
+		RequestName:     mount.RequestName,
 		TaskPath:        mount.TaskPath,
 		HostPath:        mount.HostPath,
 		Readonly:        mount.Readonly,

plugins/drivers/utils.go

@@ -83,6 +83,7 @@ func TestTaskConfigRoundTrip(t *testing.T) {
 		},
 		Mounts: []*MountConfig{
 			{
+				RequestName:     "volume",
 				TaskPath:        "task",
 				HostPath:        "host",
 				Readonly:        true,