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.

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

ceph: proxy rbd commands when multus is enabled #8339

Merged
merged 1 commit into from Jul 20, 2021

Conversation

leseb
Copy link
Member

@leseb leseb commented Jul 20, 2021

Description of your changes:

We now pass the networking spec to the clusterInfo so that the executor
can make the right decision on how to execute a command.
This is a small change that allows us to remove the CephBlockPool CR
since it's checking for rbd images. On a Multus deployment, the operator
does not have the network annotations, thus has no access to the OSD
network then rbd commands are hanging forever.

Signed-off-by: Sébastien Han seb@redhat.com

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
  • Skip Tests for Docs: Add the flag for skipping the build if this is only a documentation change. See here for the flag.
  • Skip Unrelated Tests: Add a flag to run tests for a specific storage provider. See test options.
  • Reviewed the developer guide on Submitting a Pull Request
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.
  • Pending release notes updated with breaking and/or notable changes, if necessary.
  • Upgrade from previous release is tested and upgrade user guide is updated, if necessary.
  • Code generation (make codegen) has been run to update object specifications, if necessary.

@mergify mergify bot added the ceph main ceph tag label Jul 20, 2021
@leseb leseb force-pushed the multus-rbd-commands branch 4 times, most recently from f67c3ea to 591c587 Compare July 20, 2021 10:19
We now pass the networking spec to the clusterInfo so that the executor
can make the right decision on how to execute a command.
This is a small change that allows us to remove the CephBlockPool CR
since it's checking for rbd images. On a Multus deployment, the operator
does not have the network annotations, thus has no access to the OSD
network then rbd commands are hanging forever.

Signed-off-by: Sébastien Han <seb@redhat.com>
@@ -45,6 +45,7 @@ type ClusterInfo struct {
// If the CR name is needed, access it through the NamespacedName() method.
name string
OsdUpgradeTimeout time.Duration
NetworkSpec cephv1.NetworkSpec
Copy link
Member

Choose a reason for hiding this comment

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

I'm going back and forth considering if this should just be a setting like:

ExecuteRBDRemotely bool

But I can see how the network spec may be useful in the future if there are other places we need the network settings, so let's go with the the network spec as you have it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Also ExecuteRBDRemotely would be too restrictive and won't reflect well with the type's name.

@leseb leseb merged commit 5e3ce93 into rook:master Jul 20, 2021
@leseb leseb deleted the multus-rbd-commands branch July 20, 2021 14:14
mergify bot added a commit that referenced this pull request Jul 20, 2021
ceph: proxy rbd commands when multus is enabled (backport #8339)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ceph main ceph tag
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants