]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #15183 into master
authorSage Weil <sage@redhat.com>
Fri, 23 Aug 2019 15:46:33 +0000 (10:46 -0500)
committerSage Weil <sage@redhat.com>
Fri, 23 Aug 2019 15:46:33 +0000 (10:46 -0500)
* refs/pull/15183/head:
kv/rocksdb: support rmrange unconditionally
cls/rgw: rgw_bi_log_trim() uses cls_cxx_map_remove_range()
cls/log: cls_log_trim() uses cls_cxx_map_remove_range()
test/cls: add cls_log.trim_by_marker test
test/cls: test_cls_log doesn't allocate ObjectOperations
test/cls: test_cls_log uses fixture for temporary pool
test/cls: add cls_rgw.bi_log_trim test
cls/rgw: expose cls_rgw_bilog_list/trim() for single shard
test/cls: test_cls_rgw uses cls_rgw_obj_key
test/cls: test_cls_rgw doesn't allocate ObjectOperations
test/cls: test_cls_rgw uses fixture for temporary pool
objclass: add cls_cxx_map_remove_range()
librados: add rados_write_op_omap_rm_range2()
osdc: add Objecter omap_rm_range()
osd: add CEPH_OSD_OP_OMAPRMKEYRANGE to do_osd_ops()
osd: add omap_rmkeyrange() to PGTransaction
os: add bufferlist overload for omap_rmkeyrange()
tracing: add do_osd_op_pre_omaprmkeyrange
rados: add CEPH_OSD_OP_OMAPRMKEYRANGE

Reviewed-by: Sage Weil <sage@redhat.com>
13 files changed:
1  2 
src/cls/rgw/cls_rgw.cc
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h
src/common/legacy_config_opts.h
src/common/options.cc
src/kv/RocksDBStore.cc
src/kv/RocksDBStore.h
src/librados/librados_c.cc
src/objclass/class_api.cc
src/objclass/objclass.h
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc
src/osdc/Objecter.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge