csi_hook: valid if any driver supports csi (#13446)
* csi_hook: valid if any driver supports csi volumes
This commit is contained in:
parent
1ed857266a
commit
7d6a3df197
|
@ -0,0 +1,3 @@
|
|||
```release-note:bug
|
||||
csi: Fixed a bug where CSI hook validation would fail if all tasks didn't support CSI.
|
||||
``
|
|
@ -184,11 +184,7 @@ type volumeAndRequest struct {
|
|||
func (c *csiHook) claimVolumesFromAlloc() (map[string]*volumeAndRequest, error) {
|
||||
result := make(map[string]*volumeAndRequest)
|
||||
tg := c.alloc.Job.LookupTaskGroup(c.alloc.TaskGroup)
|
||||
|
||||
// Initially, populate the result map with all of the requests
|
||||
for alias, volumeRequest := range tg.Volumes {
|
||||
|
||||
if volumeRequest.Type == structs.VolumeTypeCSI {
|
||||
supportsVolumes := false
|
||||
|
||||
for _, task := range tg.Tasks {
|
||||
caps, err := c.taskCapabilityGetter.GetTaskDriverCapabilities(task.Name)
|
||||
|
@ -197,11 +193,20 @@ func (c *csiHook) claimVolumesFromAlloc() (map[string]*volumeAndRequest, error)
|
|||
}
|
||||
|
||||
if caps.MountConfigs == drivers.MountConfigSupportNone {
|
||||
return nil, fmt.Errorf(
|
||||
"task driver %q for %q does not support CSI", task.Driver, task.Name)
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
supportsVolumes = true
|
||||
break
|
||||
}
|
||||
|
||||
if !supportsVolumes {
|
||||
return nil, fmt.Errorf("no task supports CSI")
|
||||
}
|
||||
|
||||
// Initially, populate the result map with all of the requests
|
||||
for alias, volumeRequest := range tg.Volumes {
|
||||
if volumeRequest.Type == structs.VolumeTypeCSI {
|
||||
result[alias] = &volumeAndRequest{request: volumeRequest}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -232,6 +232,99 @@ func TestCSIHook(t *testing.T) {
|
|||
|
||||
}
|
||||
|
||||
// TestCSIHook_claimVolumesFromAlloc_Validation tests that the validation of task
|
||||
// capabilities in claimVolumesFromAlloc ensures at least one task supports CSI.
|
||||
func TestCSIHook_claimVolumesFromAlloc_Validation(t *testing.T) {
|
||||
ci.Parallel(t)
|
||||
|
||||
alloc := mock.Alloc()
|
||||
logger := testlog.HCLogger(t)
|
||||
volumeRequests := map[string]*structs.VolumeRequest{
|
||||
"vol0": {
|
||||
Name: "vol0",
|
||||
Type: structs.VolumeTypeCSI,
|
||||
Source: "testvolume0",
|
||||
ReadOnly: true,
|
||||
AccessMode: structs.CSIVolumeAccessModeSingleNodeReader,
|
||||
AttachmentMode: structs.CSIVolumeAttachmentModeFilesystem,
|
||||
MountOptions: &structs.CSIMountOptions{},
|
||||
PerAlloc: false,
|
||||
},
|
||||
}
|
||||
|
||||
type testCase struct {
|
||||
name string
|
||||
caps *drivers.Capabilities
|
||||
capFunc func() (*drivers.Capabilities, error)
|
||||
expectedClaimErr error
|
||||
}
|
||||
|
||||
testcases := []testCase{
|
||||
{
|
||||
name: "invalid - driver does not support CSI",
|
||||
caps: &drivers.Capabilities{
|
||||
MountConfigs: drivers.MountConfigSupportNone,
|
||||
},
|
||||
capFunc: nil,
|
||||
expectedClaimErr: errors.New("claim volumes: no task supports CSI"),
|
||||
},
|
||||
|
||||
{
|
||||
name: "invalid - driver error",
|
||||
caps: &drivers.Capabilities{},
|
||||
capFunc: func() (*drivers.Capabilities, error) {
|
||||
return nil, errors.New("error thrown by driver")
|
||||
},
|
||||
expectedClaimErr: errors.New("claim volumes: could not validate task driver capabilities: error thrown by driver"),
|
||||
},
|
||||
|
||||
{
|
||||
name: "valid - driver supports CSI",
|
||||
caps: &drivers.Capabilities{
|
||||
MountConfigs: drivers.MountConfigSupportAll,
|
||||
},
|
||||
capFunc: nil,
|
||||
expectedClaimErr: nil,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testcases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
alloc.Job.TaskGroups[0].Volumes = volumeRequests
|
||||
|
||||
callCounts := map[string]int{}
|
||||
mgr := mockPluginManager{mounter: mockVolumeMounter{callCounts: callCounts}}
|
||||
|
||||
rpcer := mockRPCer{
|
||||
alloc: alloc,
|
||||
callCounts: callCounts,
|
||||
hasExistingClaim: helper.BoolToPtr(false),
|
||||
schedulable: helper.BoolToPtr(true),
|
||||
}
|
||||
|
||||
ar := mockAllocRunner{
|
||||
res: &cstructs.AllocHookResources{},
|
||||
caps: tc.caps,
|
||||
capFunc: tc.capFunc,
|
||||
}
|
||||
|
||||
hook := newCSIHook(alloc, logger, mgr, rpcer, ar, ar, "secret")
|
||||
require.NotNil(t, hook)
|
||||
|
||||
if tc.expectedClaimErr != nil {
|
||||
require.EqualError(t, hook.Prerun(), tc.expectedClaimErr.Error())
|
||||
mounts := ar.GetAllocHookResources().GetCSIMounts()
|
||||
require.Nil(t, mounts)
|
||||
} else {
|
||||
require.NoError(t, hook.Prerun())
|
||||
mounts := ar.GetAllocHookResources().GetCSIMounts()
|
||||
require.NotNil(t, mounts)
|
||||
require.NoError(t, hook.Postrun())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// HELPERS AND MOCKS
|
||||
|
||||
type mockRPCer struct {
|
||||
|
@ -335,6 +428,7 @@ func (mgr mockPluginManager) Shutdown() {}
|
|||
type mockAllocRunner struct {
|
||||
res *cstructs.AllocHookResources
|
||||
caps *drivers.Capabilities
|
||||
capFunc func() (*drivers.Capabilities, error)
|
||||
}
|
||||
|
||||
func (ar mockAllocRunner) GetAllocHookResources() *cstructs.AllocHookResources {
|
||||
|
@ -346,5 +440,8 @@ func (ar mockAllocRunner) SetAllocHookResources(res *cstructs.AllocHookResources
|
|||
}
|
||||
|
||||
func (ar mockAllocRunner) GetTaskDriverCapabilities(taskName string) (*drivers.Capabilities, error) {
|
||||
if ar.capFunc != nil {
|
||||
return ar.capFunc()
|
||||
}
|
||||
return ar.caps, nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue