]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
radosgw-admin: 'sync error trim' loops until complete 24054/head
authorCasey Bodley <cbodley@redhat.com>
Thu, 12 Jul 2018 18:02:27 +0000 (14:02 -0400)
committerNathan Cutler <ncutler@suse.com>
Thu, 13 Sep 2018 04:54:54 +0000 (06:54 +0200)
commit3b97824be4552ea2abafa07fb45e009d39dc4fc3
tree03fb9d6427bb1aaae0bd06ac2a2783a5bbb32c36
parent38e4d251b66c2d682d064add3c6cc5a7d1f3dd5b
radosgw-admin: 'sync error trim' loops until complete

a single call to time_log_trim() will trim a maximum of 1000 entries.
now loops until a return code of -ENODATA indicates that all entries
in the given range were trimmed

an optional --trim-delay-ms option can be used to limit the frequency
of osd ops

Fixes: http://tracker.ceph.com/issues/24873
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 326971931d15250ed26d9213ad14e76e4ef402bc)

Conflicts:
src/rgw/rgw_admin.cc
- some control commands not backported from master
- added #include <thread> for std::this_thread and #include <chrono> for
  std::chrono::milliseconds (in master and mimic, rgw_admin.cc must be getting
  these includes via some other header)
src/rgw/rgw_admin.cc