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

mimic: rbd: filter out group/trash snapshots from snap_list #28138

Merged
merged 3 commits into from Jul 1, 2019

Conversation

@dillaman
Copy link
Contributor

dillaman commented May 15, 2019

dillaman and others added 3 commits Feb 28, 2019
Do not zero-fill the BitVector's bitset prior to decoding the data.
Additionally, only read-update-modify the portions of the footer
that are potentially affected by the updated state.

Fixes: http://tracker.ceph.com/issues/38538
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 071671f)

Conflicts:
	src/cls/rbd/cls_rbd.cc
	src/cls/rbd/cls_rbd_client.h
	src/common/bit_vector.hpp
	src/test/common/test_bit_vector.cc
	src/test/librbd/test_ObjectMap.cc
Trivial conflicts with bufferlist::begin/cbegin and assert/ceph_assert
Fixes:
  [root@ ~]# rbd snap rm img1@snap1
  [root@ ~]# rbd snap ls img1 -a
  SNAPID NAME                                 SIZE    TIMESTAMP                NAMESPACE
       4 f2e82bd1-e2ff-4a6b-aaef-5a12a2b23a30 100 MiB Sat Aug 18 08:48:34 2018 trash (snap1)
  [root@ ~]# rbd snap purge img1
  Removing all snapshots: 0% complete...failed.
  rbd: removing snaps failed: (2) No such file or directory

Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 2c79a49)
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 91c67b2)
@dillaman dillaman added this to the mimic milestone May 15, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Jun 26, 2019

@yuriw yuriw merged commit 2eff40c into ceph:mimic Jul 1, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.