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

nfs: only set the pool size when it exists and always run default pool creation #9224

Merged
merged 2 commits into from Nov 24, 2021
Merged

nfs: only set the pool size when it exists and always run default pool creation #9224

merged 2 commits into from Nov 24, 2021
+20 −44

Conversation

leseb
Copy link
Member

@leseb leseb commented Nov 23, 2021

Description of your changes:

For CRD not using the new nfs spec that includes the pool settings,
applying the "size" property won't work since it is set to 0. The pool
still gets created but returns an error. The loop is re-queued but on
the second run the pool is detected so no further configuration is done.

Previously, if the pool was present we would not run the pool creation
again. This is a problem if the pool spec changes, the new settings will
never be applied.

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

Which issue is resolved by this Pull Request:
Resolves #9205

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.

@leseb
nfs: only set the pool size when it exists
c3accdc 
For CRD not using the new nfs spec that includes the pool settings,
applying the "size" property won't work since it is set to 0. The pool
still gets created but returns an error. The loop is re-queued but on
the second run the pool is detected so no further configuration is done.

Closes: rook#9205
Signed-off-by: Sébastien Han <seb@redhat.com>
@leseb leseb force-pushed the fix-9205 branch 2 times, most recently from 0e93cc8 to 3999588 Compare November 23, 2021 13:29
@leseb leseb requested a review from travisn November 23, 2021 13:29
BlaineEXE
BlaineEXE reviewed Nov 23, 2021
View reviewed changes
pkg/operator/ceph/nfs/controller_test.go Outdated
"os"
"testing"

"github.com/pkg/errors"

Copy link
Member

Choose a reason for hiding this comment

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

Do we want this newline?

@BlaineEXE
Copy link
Member

There may also be an issue where we aren't setting the application on the Pool to nfs when creating the default pool. I have been meaning to look more closely at that after chatting with someone on slack. Have you observed this?

@leseb
Copy link
Member Author

leseb commented Nov 23, 2021

There may also be an issue where we aren't setting the application on the Pool to nfs when creating the default pool. I have been meaning to look more closely at that after chatting with someone on slack. Have you observed this?

This is actually a side effect of this bug.

@BlaineEXE
Copy link
Member

There may also be an issue where we aren't setting the application on the Pool to nfs when creating the default pool. I have been meaning to look more closely at that after chatting with someone on slack. Have you observed this?

This is actually a side effect of this bug.

Good to hear :)

BlaineEXE
BlaineEXE approved these changes Nov 23, 2021
View reviewed changes
Copy link
Member

@BlaineEXE BlaineEXE left a comment

Choose a reason for hiding this comment

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

Going to approve, maybe Seb will want to remove the newline and then merge. :)

@leseb
nfs: always run default pool creation
f314284 
Previously, if the pool was present we would not run the pool creation
again. This is a problem if the pool spec changes, the new settings will
never be applied.

Signed-off-by: Sébastien Han <seb@redhat.com>
@leseb
Copy link
Member Author

leseb commented Nov 24, 2021

Going to approve, maybe Seb will want to remove the newline and then merge. :)

Done.

@leseb leseb merged commit e008464 into rook:master Nov 24, 2021
@leseb leseb deleted the fix-9205 branch November 24, 2021 13:36
@mergify mergify bot mentioned this pull request Nov 24, 2021
Merged
leseb added a commit that referenced this pull request Nov 24, 2021
@leseb
Merge pull request #9239 from rook/mergify/bp/release-1.7/pr-9224
f1777e8 
nfs: only set the pool size when it exists and always run default pool creation (backport #9224)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@travisn travisn travisn approved these changes

@BlaineEXE BlaineEXE BlaineEXE approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nfs-ganesha pool does not have application type set
3 participants
@leseb @BlaineEXE @travisn