Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add stage_publish_dir field to csi_plugin stanza of a job #13919

Merged
merged 7 commits into from
Aug 2, 2022
Merged

Add stage_publish_dir field to csi_plugin stanza of a job #13919

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca3c585
Allow specification of CSI staging and publishing directory path
ejweber Jun 16, 2022
c8010c4
Add website documentation for stage_publish_dir
ejweber Jun 16, 2022
1eab7f5
Replace erroneous reference to csi_plugin.mount_config with csi_plugi…
ejweber Jun 16, 2022
3448143
Avoid requiring CSI plugins to be redeployed after introducing StageP…
ejweber Jun 16, 2022
27e95c1
Fix gofmt -s failure
ejweber Jul 25, 2022
b5d29a3
Respond to PR feedback
ejweber Aug 1, 2022
64d48fc
changelog entry
tgross Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/allocrunner/taskrunner/plugin_supervisor_hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ func newCSIPluginSupervisorHook(config *csiPluginSupervisorHookConfig) *csiPlugi
socketMountPoint := filepath.Join(config.clientStateDirPath, "csi",
"plugins", config.runner.Alloc().ID)

// In v1.3.0, Nomad started instructing CSI plugins to stage and publish
// within /csi/local. Plugins deployed after the introduction of
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code is right but this comment has swapped the path ordering. It's /local/csi.

// StagePublishDir default to StagePublishDir = /csi/local. However,
// plugins deployed between v1.3.0 and the introduction of
// StagePublishDir have StagePublishDir = "". Default to /csi/local here
// to avoid breaking plugins that aren't redeployed.
if task.CSIPluginConfig.StagePublishDir == "" {
task.CSIPluginConfig.StagePublishDir = filepath.Join("/local", "csi")
}
tgross marked this conversation as resolved.
Show resolved Hide resolved

if task.CSIPluginConfig.HealthTimeout == 0 {
task.CSIPluginConfig.HealthTimeout = 30 * time.Second
}
Expand Down