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

qa: fs/upgrade test fixes and cephfs feature bit updates for Octopus/Nautilus #27303

Merged
merged 6 commits into from Apr 4, 2019

Conversation

batrick
Copy link
Member

@batrick batrick commented Apr 2, 2019

No description provided.

@@ -27,6 +27,8 @@
#define CEPHFS_FEATURE_RECLAIM_CLIENT 10
#define CEPHFS_FEATURE_LAZY_CAP_WANTED 11
#define CEPHFS_FEATURE_MULTI_RECONNECT 12
/* N.B.: oops, we can't use CEPHFS_FEATURE_NAUTILUS because we didn't add a bit for it. */
#define CEPHFS_FEATURE_NAUTILUS Ooops
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops?

Copy link
Member Author

Choose a reason for hiding this comment

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

"Oops" is just a placeholder since it cannot be used.

src/mds/cephfs_features.h Outdated Show resolved Hide resolved
Direct upgrades from Luminous to Octopus are not supported. These snap format
upgrade tests are now only going to be run in the mimic/nautilus branches.

Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Fixes: http://tracker.ceph.com/issues/39078
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Fixes: http://tracker.ceph.com/issues/39077
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
@ukernel
Copy link
Contributor

ukernel commented Apr 4, 2019

LGTM

@batrick
Copy link
Member Author

batrick commented Apr 4, 2019

Please approve then @ukernel (github checks prevent merges without one).

@batrick
Copy link
Member Author

batrick commented Apr 4, 2019

Reviewed-by: Zheng Yan <zyan@redhat.com>

@batrick batrick merged commit 49930ad into ceph:master Apr 4, 2019
batrick added a commit that referenced this pull request Apr 4, 2019
* refs/pull/27303/head:
	mds: add Octopus cephfs feature bit
	mds: verify current release has a cephfs feature bit
	mds: add cephfs feature bit for Nautilus
	mon: generalize and refactor lambda use
	qa: test featureful client with mimic base
	qa: remove obsolete snap upgrade tests

Reviewed-by: Zheng Yan <zyan@redhat.com>
@batrick batrick deleted the i39020 branch April 4, 2019 19:47
@batrick
Copy link
Member Author

batrick commented Apr 4, 2019

(I forced the merge by editing GitHub protection rules.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants