nfs: fix nfs grace period when multus is enabled #11110
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BlaineEXE
force-pushed
the
fix-nfs-multus
branch
from
6b422db
to
af13194
Compare
|
This pull request has merge conflicts that must be resolved before it can be merged. @BlaineEXE please rebase it. https://rook.io/docs/rook/latest/Contributing/development-flow/#updating-your-fork |
BlaineEXE
force-pushed
the
fix-nfs-multus
branch
from
af13194
to
5575b76
Compare
Run the ganesha-rados-grace command in a remote pod when multus networking is enabled. Signed-off-by: parth-gr <paarora@redhat.com> Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
BlaineEXE
force-pushed
the
fix-nfs-multus
branch
from
5575b76
to
51fac0a
Compare
parth-gr
approved these changes
Oct 6, 2022
| @@ -179,7 +205,7 @@ func (c *CephToolCommand) run() ([]byte, error) { | |||
|
|
|||
| // NewRBDCommand does not use the --out-file option so we only check for remote execution here | |||
| // Still forcing the check for the command if the behavior changes in the future | |||
| if command == RBDTool || command == RadosTool { | |||
| if command == RBDTool || command == RadosTool || command == GaneshaRadosGraceTool { | |||
| if c.RemoteExecution { | |||
| output, stderr, err = c.context.RemoteExecutor.ExecCommandInContainerWithFullOutputWithTimeout(c.clusterInfo.Context, ProxyAppLabel, CommandProxyInitContainerName, c.clusterInfo.Namespace, append([]string{command}, args...)...) | |||
There was a problem hiding this comment.
The problem was because the cmd was not called by the remote executor?
|
|
||
| return r.context.Executor.ExecuteCommandWithEnv(env, cmd, args...) | ||
| cmd := cephclient.NewGaneshaRadosGraceCommand(r.context, r.clusterInfo, args) | ||
| _, err := cmd.RunWithTimeout(exec.CephCommandsTimeout) |
There was a problem hiding this comment.
I see a lot of cmds running by context.Executor why this needs special attention??
| @@ -167,7 +193,7 @@ func (c *CephToolCommand) run() ([]byte, error) { | |||
| } else { | |||
| // the `rbd` tool doesn't use special flag for plain format | |||
| switch c.tool { | |||
| case RBDTool, RadosTool: | |||
| case RBDTool, RadosTool, GaneshaRadosGraceTool: | |||
There was a problem hiding this comment.
Is run called by GaneshaRadosGraceTool cmd??
There was a problem hiding this comment.
In the new design, NewGaneshaRadosGrace() creates a command that, when run, goes through this path. The old command didn't.
mergify bot
added a commit
that referenced
this pull request
Oct 6, 2022
nfs: fix nfs grace period when multus is enabled (backport #11110)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Run the ganesha-rados-grace command in a remote pod when multus networking is enabled.
Signed-off-by: parth-gr paarora@redhat.com
Signed-off-by: Blaine Gardner blaine.gardner@redhat.com
Description of your changes:
Which issue is resolved by this Pull Request:
Resolves #11039
Checklist:
skip-cion the PR.