]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw: radosgw-admin errors if marker not specified on data/mdlog trim 42640/head
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 16 Jul 2021 15:20:39 +0000 (11:20 -0400)
committerCory Snyder <csnyder@iland.com>
Wed, 4 Aug 2021 14:34:19 +0000 (10:34 -0400)
commit9671dac475346e509f242ba979028ef23a687ca0
treeea52a23ad902287de234b5128904805ab063f706
parente2668fdca6b5f2f7b45cb63fdac64caa4632f567
rgw: radosgw-admin errors if marker not specified on data/mdlog trim

Check that a marker was specified and trim if we don't have one.

Also: In a world where we're parsing for generation, it doesn't really
make sense to have a 'no marker specified' as separate from a marker
that is just an empty string.

Also: Successful datalog trim returns zero, not
-ENODATA, and radosgw-admin should expect this.

Fixes: https://tracker.ceph.com/issues/51712
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 4cb6fcf7f4e9548a8a0dd017b49a6ea23bedffd6)

Conflicts:
src/rgw/rgw_admin.cc

Cherry-pick notes:
- static_cast for RadosStore not needed in Pacific
src/rgw/rgw_admin.cc
src/rgw/rgw_datalog.cc
src/rgw/rgw_datalog.h
src/rgw/rgw_log_backing.h