Skip to content

Commit 5a91525

Browse files
authored
Merge pull request ceph#60890 from rzarzynski/wip-os-fastomapiter-killomapiterator
osd, os: drop the OmapIterator in favor of omap_iterate. Remove ObjectMap Reviewed-by: Laura Flores <[email protected]> Reviewed-by: Ronen Friedman <[email protected]>
2 parents 9aacbd1 + 65b67f4 commit 5a91525

29 files changed

+531
-4585
lines changed

ceph.spec.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,6 @@ Summary: Ceph Object Storage Daemon
939939
%if 0%{?suse_version}
940940
Group: System/Filesystems
941941
%endif
942-
Provides: ceph-test:/usr/bin/ceph-osdomap-tool
943942
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
944943
Requires: sudo
945944
Requires: libstoragemgmt
@@ -2317,7 +2316,6 @@ fi
23172316
%{_bindir}/ceph-bluestore-tool
23182317
%{_bindir}/ceph-erasure-code-tool
23192318
%{_bindir}/ceph-objectstore-tool
2320-
%{_bindir}/ceph-osdomap-tool
23212319
%{_bindir}/ceph-osd
23222320
%{_libexecdir}/ceph/ceph-osd-prestart.sh
23232321
%{_mandir}/man8/ceph-clsinfo.8*

debian/ceph-osd.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ usr/bin/ceph-bluestore-tool
55
usr/bin/ceph-clsinfo
66
usr/bin/ceph-erasure-code-tool
77
usr/bin/ceph-objectstore-tool
8-
usr/bin/ceph-osdomap-tool
98
<pkg.ceph.crimson> usr/bin/crimson-store-nbd
109
usr/bin/${CEPH_OSD_BASENAME} => /usr/bin/ceph-osd
1110
usr/bin/ceph_objectstore_bench

src/os/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
set(libos_srcs
22
ObjectStore.cc
33
Transaction.cc
4-
DBObjectMap.cc
54
memstore/MemStore.cc
65
kstore/KStore.cc
76
kstore/kstore_types.cc

0 commit comments

Comments
 (0)