Merge PR #29292 into master

* refs/pull/29292/head:
	os/bluestore: warn on no per-pool omap
	os/bluestore: fsck: warning (not error) by default on no per-pool omap
	os/bluestore: fsck: int64_t for error count
	os/bluestore: default size of 1 TB for testing
	os/bluestore: behave if we *do* set PGMETA and PERPOOL flags
	os/bluestore: do not set both PGMETA_OMAP and PERPOOL_OMAP
	os/bluestore: fsck: only generate 1 error per omap_head
	os/bluestore: make fsck repair convert to per-pool omap
	os/bluestore: teach fsck to tolerate per-pool omap
	os/bluestore: ondisk format change to 3 for per-pool omap
	mon/PGMap: add data/omap breakouts for 'df detail' view
	osd/osd_types: separate get_{user,allocated}_bytes() into data and omap variants
	mon/PGMap: fix stored_raw calculation
	mon/PGMap: add in actual omap usage into per-pool stats
	osd: report per-pool omap support via store_statfs_t
	os/bluestore: set per_pool_omap key on mkfs
	osd/osd_types: count per-pool omap capable OSDs
	os/bluestore: report omap_allocated per-pool
	os/bluestore: add pool prefix to omap keys
	kv/KeyValueDB: take key_prefix for estimate_prefix_size()
	os/bluestore: fix manual omap key manipulation to use Onode::get_omap_key()
	os/bluestore: make omap key helpers Onode methods
	os/bluestore: add Onode::get_omap_prefix() helper
	os/bluestore: change _do_omap_clear() args

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc doc/rados/operations/health-checks.rst
Simple merge

diff --cc qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
Simple merge

diff --cc qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
Simple merge

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/kv/RocksDBStore.cc
Simple merge

diff --cc src/kv/RocksDBStore.h
Simple merge

diff --cc src/librados/librados_cxx.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
index 8cb06a67100d8641a697747e04da3518903be03c,ceea70e660abef4468eb520b1eaba82aebc81087..ca1a700a661969a20f36bc8e9fd3a03448d5f2fd
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -3848,10 -3877,10 +3877,10 @@@ BlueStore::OmapIteratorImpl::OmapIterat
    CollectionRef c, OnodeRef o, KeyValueDB::Iterator it)
    : c(c), o(o), it(it)
  {
 -  RWLock::RLocker l(c->lock);
 +  std::shared_lock l(c->lock);
    if (o->onode.has_omap()) {
-     get_omap_key(o->onode.nid, string(), &head);
-     get_omap_tail(o->onode.nid, &tail);
+     o->get_omap_key(string(), &head);
+     o->get_omap_tail(&tail);
      it->lower_bound(head);
    }
  }

diff --cc src/os/bluestore/BlueStore.h
Simple merge

diff --cc src/os/filestore/FileStore.cc
Simple merge

diff --cc src/os/filestore/FileStore.h
Simple merge

diff --cc src/os/kstore/KStore.cc
Simple merge

diff --cc src/os/kstore/KStore.h
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/test/objectstore/store_test.cc
Simple merge