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

test: rbd master/slave notify test should test active features #14638

Merged
merged 2 commits into from Apr 20, 2017

Conversation

Projects
None yet
3 participants
@dillaman
Contributor

dillaman commented Apr 19, 2017

dillaman added some commits Apr 19, 2017

qa/suites: client-upgrade/jewel-client-x should test multiple features
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
test: rbd master/slave notify test should test active features
Fixes: http://tracker.ceph.com/issues/19692
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
features = image.features() & (
RBD_FEATURE_OBJECT_MAP | RBD_FEATURE_FAST_DIFF)
if features:
image.update_features(features, False)
image.update_features(RBD_FEATURE_OBJECT_MAP, True)

This comment has been minimized.

@smithfarm

smithfarm Apr 19, 2017

Contributor

It's only disabling the feature that causes the exception, eh? Enabling it (as in this line) is not a problem?

This comment has been minimized.

@dillaman

dillaman Apr 19, 2017

Contributor

Jewel throws an "InvalidArgument" exception if you try to disable a feature that wasn't enabled (or try to enable a feature that was already enabled).

@trociny

lgtm

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 20, 2017

I prematurely cherry-picked this to kraken at #14641 and am running tests on it.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 20, 2017

@dillaman Oddly enough this does not fix the issue in kraken: http://pulpito.ceph.com/smithfarm-2017-04-20_08:23:44-upgrade:client-upgrade-wip-kraken-backports-distro-basic-vps/

The sha1 being tested is 0277bbc (wip-kraken-backports) and I double-checked that it does include #14641.

@dillaman

This comment has been minimized.

Contributor

dillaman commented Apr 20, 2017

@smithfarm That one test pulls the test specifically from the "jewel" branch -- so I wouldn't expect it to work until it's fully backported (or we could have a temporary tweaked version of the suite test that pulls from a wip-jewel-backports branch)

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Apr 20, 2017

@dillaman This may be impulsive, but my vote would be to merge the master, kraken, and jewel backports without further ado, unless you can think of an easier way to test them.

@dillaman

This comment has been minimized.

Contributor

dillaman commented Apr 20, 2017

@smithfarm Since it's just test cases, I would agree.

@smithfarm smithfarm merged commit 210249a into ceph:master Apr 20, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@dillaman dillaman deleted the dillaman:wip-19692 branch Apr 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment