kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

CSI: handle per-alloc volumes in alloc status -verbose CLI (#12573)

Browse Source 
The Nomad client's `csi_hook` interpolates the alloc suffix with the
volume request's name for CSI volumes with `per_alloc = true`, turning
`example` into `example[1]`. We need to do this same behavior in the
`alloc status` output so that we show the correct volume.
This commit is contained in:
Tim Gross
2022-04-15 09:26:19 -04:00
committed by GitHub
parent 04f6b0aa43
commit fd21cebec7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/12573.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
csi: Fixed a bug where per-alloc volumes used the incorrect ID when querying for `alloc status -verbose`
```

7
command/alloc_status.go
View File

@@ -826,9 +826,14 @@ FOUND:
fmt.Sprintf("%s|%v", volReq.Name, *volMount.ReadOnly)) fmt.Sprintf("%s|%v", volReq.Name, *volMount.ReadOnly))
case structs.VolumeTypeCSI: case structs.VolumeTypeCSI:
if verbose { if verbose {
source := volReq.Source
if volReq.PerAlloc {
source = source + structs.AllocSuffix(alloc.Name)
}
// there's an extra API call per volume here so we toggle it // there's an extra API call per volume here so we toggle it
// off with the -verbose flag // off with the -verbose flag
vol, _, err := client.CSIVolumes().Info(volReq.Source, nil) vol, _, err := client.CSIVolumes().Info(source, nil)
if err != nil { if err != nil {
c.Ui.Error(fmt.Sprintf("Error retrieving volume info for %q: %s", c.Ui.Error(fmt.Sprintf("Error retrieving volume info for %q: %s",
volReq.Name, err)) volReq.Name, err))