test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d0f87131962b26cef9e31fa11651771856c41164)

man/8/ceph.rst: remove invalid option for reweight-by-*

--yes-i-really-mean-it is not valid option for reweight-by-*

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 797f1d41d98738411079a7a16d8b1d5352359d33)

mon: remove range=100 from reweight-by-* commands

Specifying the range makes it skip instead of error when you give
it a bad value.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 661891aa28ca0600a62e25f6d10ce7fa94e32cce)

mon: make max_osds an optional arg

We keep the config option with the default (4), but let you
specify the max # of osds to reweight as a third optional arg.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 651f05b6e6bec41b54c0a8f8ca6641ce3aa5dff3)

mon: make reweight max_change default configurable

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8a9429d85bc99874dc9871b43b2d0c7ad1086803)

mon/OSDMonitor: fix indentation

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 47b650c1497b8eaf37cfcb7e3b9fda12d8cf2d7a)

qa/workunits/cephtool/test.sh: test reweight-by-x commands

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 28b33a5b57e3f898808bd8ccc5e314667f84912a)

osd/MonCommand: add/fix up 'osd [test-]reweight-by-{pg,utilization}'

- show before/after pg placement stats
- add test- variants that don't do anything
- only allow --no-increasing on the -utilization versions (where
  it won't conflict with the optional pool list and confuse the
  arg parsing)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1de7e47833f2d14c6915d7d071fe0005408c8da0)

- use non-C++11 sort

# Conflicts:
# src/mon/OSDMonitor.cc
# src/mon/OSDMonitor.h

mon: add 'osd utilization' command

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5b757eff868dbce2393beadd9fe2522372288cc0)

osd/OSDMap: add summarize_mapping_stats

Calculate some basic stats about the PG distribution.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ea9abe53d0e777b7dc3b22af71639f77c4de08c8)

- remove c++11 auto and range-based for loops

mon: make reweight-by-* max_change an argument

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a70eaabcfc1cc1dfb9b6ba2d7f71b3d76496eb55)

osd: add mon_reweight_max_osds to limit reweight-by-* commands

Add configurable mon_reweight_max_osds which limits the number
of OSDs modified each time reweight-by-* is called (by default
to 4 OSDs).

Also change the order in which we look at OSDs to go from most
to least utilized.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 3aa0ccefddc1790df5b808bfccd5da4857951220)

osd: add mon_reweight_max_change option which limits reweight-by-*

Add a configurable mon_reweight_max_change which limits be default
the reweight-by-* commands to only change an OSDs weight by 0.05.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 6f0a1fb69da84ee18bdb9b151772cef8f32413c5)

test: add simple test for new reweight-by-* options

Test validity of --no-increasing and --yes-i-really-mean-it.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 1a6ad5053e7fc4f8942855a17ce4540e340e9d4f)

osd: add sure and no-increasing options to reweight-by-*

Add a --no-increasing option to reweight-by-* which can be used to only decrease
OSD weights without increasing any. This is useful for example if you need to
urgently lower the weight of nearly full OSDs.

Also add a --yes-i-really-mean-it confirmation to reweight-by-*.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit ddf5c2b62316bb69839f220fe2527d1467863421)

Merge pull request #6604 from ukernel/hammer-13268

hammer: client: added permission check based on getgrouplist

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #6551 from ceph/hammer-client-inoderef

hammer: client inoderef

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #7797 from SUSE/wip-14861-hammer

hammer: ceph init script unconditionally sources /lib/lsb/init-functions

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #7672 from dachary/wip-14783-hammer

hammer: test_bit_vector.cc uses magic numbers against #defines that vary

client: use fuse_req_getgroups() to get group list

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 0eb6d0ba1b65ac0aaffc72a82f07857cc65a6b88)

client: use thread local data to track fuse request

When handling an operation, libcephfs code may want to access fuse
request for extra information. by tracking fuse request in thread
local data, we can avoid adding extra parameter to Client::ll_foo
functions.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit a9f91d7d70893cdc5f832a26a5be298941d00315)

client/Client.cc: remove only once used variable

Fix for:
[src/client/Client.cc:4555]: (style) The scope of the variable
 'initial_group_count' can be reduced.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit a29dd45dd89f59ff15018f541601ac5ede162174)

client/Client.cc: fix realloc memory leak

Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4f98dab99c35663de89a06e2dfdbd874f56aed41)

client: added permission check based on getgrouplist

Fixes: #13268
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit f04c8da5432174874ca97d11a5b2fef56f95d73d)

configure.ac: added autoconf check for getgrouplist

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 16b59c6cd68d532a47e8c0e7b1f088b41433f048)

init-ceph: check if /lib/lsb/init-functions exists

On OSX/FreeBSD, /lib/lsb/init-functions does not exist

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit bb1fa7f3993dfcd1243b2a9a0bb432c269df215f)

Merge pull request #7671 from tchaikov/wip-14583-hammer

hammer: global/pidfile: do not start two daemons with a single pid-file

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #7702 from ceph/wip-14077-hammer

hammer: scrub bogus results when missing a clone

Reviewed-by: Martin Palma <martin@palma.bz>
Reviewed-by: Wei-Chung Cheng <freeze.vicente.cheng@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>

global: do not start two daemons with a single pid-file (part 2)

Fixes the following bugs:

* the fd is open(O_WRONLY) and cannot be read from, safe_read
  always fails and never removes the pid file.

* pidfile_open(g_conf) is close(STDOUT_FILENO) and there is a risk that
  pidfile_open gets STDOUT_FILENO only to have it closed and redirected
  to /dev/null.

* Before writing the file, ftruncate it so that overriding a file
  containing the pid 1234 with the pid 89 does not end up being
  a file with 8934.

* Before reading the file, lseek back to offset 0 otherwise it
  will read nothing.

* tests_pidfile was missing an argument when failing
  TEST_without_pidfile and killed all process with ceph in their name,
  leading to chaos and no useful error message.

* lstat(fd) cannot possibly return a result different from the one
  obtained right after the file was open, stat(path) must be used
  instead.

In addition to fixing the bugs above, refactor the pidfile.cc
implementation to:

* be systematic about error reporting (using cerr for when removing
  the pidfile because derr is not available at this point and derr
  when creating the pidfile).

* replace pidfile_open / pidfile_write with just pidfile_write since
  there never is a case when they are not used together.

More test cases are added to test_pidfile to verify the bugs above are
fixed.

http://tracker.ceph.com/issues/13422 Fixes: #13422

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 9828d49d6f3ccfc78d496153d263ea39b1722d4b)

Conflicts:
src/global/global_init.cc
      - the `flag` argument of `global_init_prefork()` is not used, so
        it was removed in master. but the cleanup commit was not
        cherry-picked to hammer, thus the conflict. we can just keep it
        around in hammer to minimize the code churn, although it may
        stand in the way of future backports.)
      - s/nullptr/NULL/ as hammer does not support c++11.

Merge backport pull request #6545 into wip-14077-hammer

A commit skipped because remove_coll() still needed in Hammer

Merge backport pull request #5783 into wip-14077-hammer

Merge backport pull request #5031 into wip-14077-hammer

Merge backport pull request #5842 into wip-14077-hammer

Merge backport pull request #5127 into wip-14077-hammer

Merge backport 6 commits from pull request #5197 into wip-14077-hammer

Excludes the ceph-objectstore-tool meta-list op

Merge backport branch 'wip-temp' into wip-14077-hammer

Merge backport pull request #4932 into wip-14077-hammer

Merge backport pull request #4915 into wip-14077-hammer

Merge backport 1 commit from pull request #4863 into wip-14077-hammer

Merge backport 8 commits from pull request #4784 into wip-14077-hammer

Only excludes actual fix for #10794

Merge backport 41 commits from pull request #4473 into wip-14077-hammer

Merge backport branch 'wip-journal-header' of git://github.com/XinzeChi/ceph into wip-14077-hammer

Includes a change to the code in the original merge commit itself

Merge backport 1 commit of pull request #3686 into wip-14077-hammer

ceph-objectstore-tool: Add dry-run checking to ops missing it

Update test to check most operations

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e89f0e1c5e8a378809bec7c705ea2c23235d4b28)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

test: Remove redundant test output

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e6f1bdcd310bd6417f0f695fba3430fd0edba43d)

test: osd-scrub-snaps.sh uses ceph-helpers.sh and added to make check

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d712737be1aadb38ecc3882200999d79d748cdb8)

ceph-helpers.sh in different location in Hammer

test: Verify replicated PG beyond just data after vstart

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9a29c5983cd392e4b479b6b685fb0c3797c10cd2)

osd: Use boost::optional instead of snap 0 for "all_clones"

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 310bf784b7cd8d75f2ab7ee431bc764f5b312aa2)

test: Fix verify() used after import to also check xattr and omap

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 92d00f22805599c519806c6ff6164847b5c33931)

osd, test: When head missing a snapset, clones not an error

Fix log message for this case and make into "info"

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit f508ddc6e9b40fe5c1c54e5faa569f2bc7b78c4b)

test: Add test cases for xattr and omap ceph-objectstore-tool operations

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit cbaed6a8c737f77e68a0eb7f1fca32ec4155f045)

osd, test: Keep missing count and log number of missing clones

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 2e0bb0ae9498fd9a0c49f1b81bf0c86f7a7cac42)

Conflicts:
src/osd/ReplicatedPG.h (trivial)

rados: Minor output changes for consistency across operations

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 016ed34ce85fa111f54857a8ca1002ae32b52b8e)

test: Eliminate check for bogus "obj13/head snaps empty" error

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8227b4b75c24b632e637decbe4b818606e8589ee)

ceph-objectstore-tool: Add new remove-clone-metadata object op

Fixes: #12740
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit c6d283f0f16347a13418d8a0ed136913e1161893)

No Sequencer in transactions in Hammer

osd: Fix trim_object() to not crash on corrupt snapset

Add test case to check for trim_object() osd crash

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit eb0ca424815e94c78a2d09dbf787d102172f4ddf)

Conflicts:
src/osd/ReplicatedPG.cc (trivial)

ceph-objectstore-tool: Improve object spec error handling

Add test cases

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit caf2d5970b0a3e3ce4ef941d1955b7821a0fc916)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)

ceph-objectstore-tool: Add undocumented clear-snapset command for testing

Add test cases using new feature to corrupt SnapSet

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b6302acdd344997aabdb426104de9f24e9990437)

No Sequencer in transactions in Hammer

ceph-objectstore-tool: Add set-size command for objects

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 138a33b8946e6fea1e09527b8bc45b7aa4bee1d6)

No Sequencer in transactions in Hammer

ceph-objectstore-tool: Enhanced dump command replaces dump-info

Show object stat information from objectstore
Show SnapSet if present
Add --head for search by object name

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1688debf7892d36c773c12d7d0b1b9b4cddc5f98)

test: Add some clones to ceph-objectstore-tool test

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b4ba3e66548a5dee58553df071b916c85d701caf)

ceph-objectstore-tool: For corrupt objectstores, don't abort listing on errors

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d276d3286504ea702ae561b91dff4121c99feb9a)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

ceph-objectstore-tool: Improve some error messages

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b0c884ba8b51eedf9def093c61f0f06398101ecc)

ceph-objectstore-tool: White space fixes

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 0564f398269d920d90f6d6ecb008ebcd6609d611)

tools/rados: Improve xattr import handling so future internal xattrs ignored

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9222f56403cf52ec161a38fc437a3f04c24d1625)

Conflicts:
src/tools/rados/RadosImport.cc (Code in ceph_objectstore_tool.cc in Hammer)

test: Test scrubbing of snapshot problems

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e5ad33ec07ee9fffe862d84955a566261d101713)

osd: Don't crash if OI_ATTR attribute is missing or corrupt

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e0b39650028205e9d9e314b75c444cc8cf055a31)

osd: Additional _scrub() check for snapset inconsistency

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9e48e1801ea1a10ce495b3947da06676c2f5f72f)

osd: Better SnapSet scrub checking (find issues instead of asserting)

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3b381caaad20c683a330e8b7a4e1c017abcb60df)

osd: Make the _scrub routine produce good output and detect errors properly

Catch decode errors so osd doesn't crash on corrupt OI_ATTR or SS_ATTR
Use boost::optional<> to make current state clearer
Create next_clone as needed using head/curclone
Add equivalent logic after getting to end of scrubmap.objects

Fixes: #12738
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a23036c6fd7de5d1dbc2bd30c967c0be51d94ca5)

Conflicts:
src/osd/ReplicatedPG.cc (no num_objects_pinned in hammer)
src/osd/ReplicatedPG.h (no get_temp_recovery_object() in hammer)

osd: Fix log message name of ceph-objectstore-tool

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 545e4b2c582625f8b93502266ca59ee40e0d0e5f)

ceph-objectstore-tool: add mark-complete operation

It is supposed to be used as a last resort to fix a cluster that has
PGs in 'incomplete' state, using the following procedure:

1) stop the osd that is primary for the incomplete PG;
2) run:
  ceph-objectstore-tool --data-path ... --journal-path ... --pgid $PGID --op mark-complete
3) start the osd.

Fixes: #10098
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 6907778d767ba08bb80c495785056ed122b023fe)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)
src/tools/ceph_objectstore_tool.cc (trivial)

test: Fix failure test to find message anywhere in stderr

Consolidate test_failure() and test_failure_tty()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 95bd3c2c54312417b132ddb91c89fdbe63b01fd0)

test: add test for {get,set}-inc-osdmap commands.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 818de1a2c89272d98610328a958fea06d1cc41cc)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)

test: Add debug argument to the ceph-objectstore-tool test

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a3b14ede9e829ec85c49980ecbff11f584ca70ae)

rados: Fix usage for "notify" command

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b968fb3bcefb0cdafb1e84d7c679b61a201a940f)

test: add test for {get,set}-osdmap commands

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0257c150fe552300c0d9f5a22a27aaa49fb6cc64)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)

tools, test: Some ceph-objectstore-tool error handling fixes

Improve various error messages generated with invalid syntax
Add test cases for most of these error messages

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 127a5f191d3d2442edd3a3fa820006bca3a08c93)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)

tools/ceph-objectstore-tool: add get-inc-osdmap command

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7801bb20d23ce83fc4093c23331bcb75e43c878f)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

tools: Check for valid --op earlier so we can get a better error message

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d8460714fab61d0a3092b3e7b290c0c19ad58beb)

Conflicts:
src/test/ceph_objectstore_tool.py (trivial)
src/tools/ceph_objectstore_tool.cc (meta-list op not in Hammer)

tools/ceph-objectstore-tool: add set-inc-osdmap command

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 95344d07c3a1a9a6b1246e5eca3f7daeb062dd06)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

tools: Fix newlines in output of --op list

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6aec38b51f0c14684912b5ee28fb5b1375cb8f8a)

tools/ceph-objectstore-tool: add "get-osdmap" command

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit f0c130d6b1bc2a8a0cce6d78a6e69995fe00a427)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

tools: Fix dump-super which doesn't require pgid

A valid pgid had to be specified in order for superblock to be displayed,
but it was otherwise ignored.
Fix message that didn't include dump-super

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit fd1772e0ac4cb801d6f3b056645eeb4d3d6ef001)

tools/ceph-objectstore-tool: add "set-osdmap" command

Fixes: #12193
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 3e30c1746fb8d90b04e4776849069db0b7737c87)

Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)

tools: Check and specify commands that require the pgid specification

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 5534bc864813d96a0d20791d79151c4f6695a013)

hobject_t: modify operator<<

Put the most significant fields to the left so that it matches the sort
order.  Also use unambiguous separator when the nspace is present
(like we do with the key).

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ecdc8f697acf1627b35a83663c219a3bb0ada453)

test, tools: Improve ceph-objectstore-tool import error handling and add tests

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ddc4d52782a04d99a4293c9fc278894dfe328515)

tools: For ec pools list objects in all shards if the pgid doesn't specify

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1aa9655f10b0fcc42cb5114681b8b24a2ccb68f4)

tools: clean up errors in ceph-objectstore-tool

We use negative error codes everywhere else, should
use them here too.  Also add a couple of strategically
placed prints.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8e5594da29e782b6efd046ed03f313599dafa1c5)

Conflicts:
src/tools/RadosDump.cc (Excluded, not in Hammer)

test/ceph-objectstore-tool: Don't need stderr noise

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit d7858c66454093dd6f2fab60e33e5b2472bcd80a)

osd: Show number of divergent_priors in log message

Report dirty_divergent_priors as true or false
Use dout(5) so tests can verify divergent_priors created

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 67da8feb0ff8659f1ff812be5a866ef5e97facf2)

osd, tools: Always filter temp objects since not being exported

Can't use object_locator_to_pg() directly with a temp object
because the pool is negative.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 557c6530a515cffacbaec439cabff8a079edbf5b)

test/ceph-objectstore-tool: Show command that should have failed

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 23551deea66673c35d7183d18b63b5a8438ebf00)

test: Add config changes to all tests to avoid order dependency

ReplayCorrupt was crashing because journal_ignore_corruption wasn't set true
Improve ReplayCorrupt by checking setting of bool corrupt and use ASSERT_FALSE()

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9016269a1c248da69a0e85df4ca3ba95011710c5)

tools: Don't export temporary objects until we have persistent-temp objects

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 4fcf5dd370e8cfac75fadbf709a785053eb26ad9)

Remove "assert(!i->hobj.is_meta());" since is_meta() is not in Hammer

test/ceph_objectstore_tool: Improve dump-journal testing

Fix false failure when journal has no entries
Test dump-journal on all osds in 2 places

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ce76f88777ec026521cce465095d6376efd460a8)

ceph-objectstore-tool: Allow --pgid specified on import (for post split)

Revamp split import testing to use --pgid option post split

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 90202a70f8c32120625c99ef5131778b3c9f6303)

ceph-objectstore-tool: Invalidate pg stats when objects were skipped during pg import

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 51e27984ec131fd21bbc26411ae1540b9047eb37)

ceph-objectstore-tool: Add dump-super to show OSDSuperblock in format specified

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 99d7663f870abfa82711dbf0451334f7d6c883d8)