Merge pull request #12417 from SUSE/wip-18132-hammer

hammer: osd: ReplicatedBackend::build_push_op: add a second config to limit omap entries/chunk independently of object data

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12759 from SUSE/wip-18399-hammer

hammer: tests: objecter_requests workunit fails on wip branches

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12762 from SUSE/wip-18405-hammer

hammer: Cannot reserve CentOS 7.2 smithi machines

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12685 from SUSE/wip-18273-hammer

hammer: tests: Workunits needlessly wget from git.ceph.com

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12687 from SUSE/wip-18281-hammer

hammer: mon: osd flag health message is misleading

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #12423 from SUSE/wip-18222-hammer

hammer: tests: qemu/tests/qemu-iotests/077 fails in dumpling, hammer, and jewel

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #12744 from SUSE/wip-18385-hammer

hammer: tests: Cannot clone ceph/s3-tests.git (missing branch)

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #12418 from SUSE/wip-18218-hammer

hammer: rgw sends omap_getvals with (u64)-1 limit

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #12619 from Werkov/wip-18317-hammer

hammer: rgw: TempURL in radosgw behaves now like its Swift's counterpart.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

rgw: TempURL in radosgw behaves now like its Swift's counterpart.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit a1ea7180969dcbaf88dfcc1bfafb17e82639df64)

Conflicts:
src/rgw/rgw_swift.cc
  - replace C++11 constructs,
    - s->info.method is actually unconditional member of
      allowed_methods, which was opaqued by C++11 ctors
  - drop temp_url_make_content_disp() which has no use with
    hammer's req_state

Merge pull request #12312 from YankunLi/fix_parameter_check

hammer: rbd: fix parameter check

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #12446 from dillaman/wip-18111

hammer: librbd: diffs to clone's first snapshot should include parent diffs

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #12398 from linuxbox2/hammer

hammer: rgw: do not abort when accept a CORS request with short origin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #12758 from SUSE/wip-18397-hammer

hammer: tests: OSDs commit suicide in rbd suite when testing on btrfs

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

qa/distros: add centos yaml; use that instead

Modeled after https://github.com/ceph/ceph/pull/12632

Fixes: http://tracker.ceph.com/issues/18405
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/tasks/admin_socket: subst in repo name

It is either ceph.git or ceph-ci.git.

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

rbd: only test on xfs

btrfs is not recommended for production

See 5864d56592ef3ffe765aa1ef0865610dbc7e8725 for precendent.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

tests: rbd/test_lock_fence.sh: fix rbdrw.py relative path

This commit fixes a regression introduced by
cf294777ea92f0911813a7132068584d4f73a65a

Fixes: http://tracker.ceph.com/issues/18388
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 91231de16dbe4d0e493ec617165a2b38078d122b)

use ceph-master branch for s3tests

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 21160124028ab123b5c547499d911b0a1397214f)

Conflicts: (trivial resolution)
        qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
qa/suites/rgw/verify/tasks/rgw_s3tests.yaml
qa/suites/rgw/verify/tasks/rgw_s3tests_multiregion.yaml

Merge pull request #12743 from SUSE/wip-18383

hammer: tests: populate mnt_point in qa/tasks/ceph.py

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

qa/tasks/ceph.py: populate mnt_point in hammer

In hammer, there is no "mnt_point" variable, yet 53225d5 was cherry-picked to
hammer - see 87e0299448908775600c62130617bad503027768 and https://github.com/ceph/ceph/pull/12455

This caused lots of "NameError: global name 'mnt_point' is not defined" errors
in hammer integration testing.

This is not a cherry-pick, because the mnt_point variable was introduced by
a54ff597faa379c8fd369352fb924651be269f95 ("tasks/ceph: convert cluster creation
to work with multiple clusters") which was not backported to hammer.

Fixes: http://tracker.ceph.com/issues/18383
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/tasks/workunit: clear clone dir before retrying checkout

If we checkout ceph-ci.git, and don't find a branch,
we'll try again from ceph.git. But the checkout will
already exist and the clone will fail, so we'll still
fail to find the branch.

The same can happen if a previous workunit task already
checked out the repo.

Fix by removing the repo before checkout (the first and
second times).  Note that this may break if there are
multiple workunit tasks running in parallel on the same
role.  That is already racy, so if it's happening, we'll
want to switch to using a truly unique clonedir for each
instantiation.

Fixes: http://tracker.ceph.com/issues/18336
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2a7013cd5a033c5be43350505d75f088e831e201)

qa/tasks/workunit: retry on ceph.git if checkout fails

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

mon/OSDMonitor: only show interesting flags in health warning

Also add PAUSEREC flag into the list.

Fixes: http://tracker.ceph.com/issues/18175
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 26220f0608f5ed4a7d97fb8d10d0d12a0fcf5583)

Conflicts:
src/mon/OSDMonitor.cc (hammer lacks CEPH_OSDMAP_FULL and order of flags
                               is slightly different)

qa/workunits: include extension for nose tests

When you have a relative path you have to include the extension.
Weird.

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

Conflicts:
qa/workunits/fs/test_python.sh (not in hammer)
qa/workunits/rbd/test_librbd_python.sh (no valgrind in hammer)

qa/workunits: use relative path instead of wget from git

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

Conflicts: (all trivial)
qa/workunits/fs/test_python.sh
qa/workunits/rados/test_python.sh
qa/workunits/rbd/rbd_mirror.sh
qa/workunits/rbd/rbd_mirror_stress.sh
qa/workunits/rbd/test_librbd_python.sh
qa/workunits/rbd/test_lock_fence.sh

qa/tasks/workunit.py: add CEPH_BASE env var

Root of git checkout

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

qa/tasks/workunit: leave workunits inside git checkout

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

Merge pull request #12455 from liewegas/qa-suite-hammer

hammer: merge ceph-qa-suite

merge ceph-qa-suite

move ceph-qa-suite dirs into qa/

Revert "tasks/workunit.py: depth 1 clone"

This reverts commit 12a707cb0f7b162e15c31915eb677bbd49b5e2cf.

tasks/workunit.py: depth 1 clone

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

tasks/workunit: remove kludge to use git.ceph.com

This was hard-coded to ceph.git (almost) and breaks when
you specify --ceph-repo.  Remove it entirely.  We'll see if
github.com is better at handling our load than it used to
be!

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

tasks/ceph: restore context of osd mount path before mkfs

all newly created files and directories under the mount dir inherit the
SELinux type of their parent directory. so we need to set it before
mkfs.

Fixes: http://tracker.ceph.com/issues/16800
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 53225d5272a1d35d4183fcfa55a139f55f77e122)

Merge pull request #1278 from ceph/wip-16225-min

hammer: SIGABRT in TrackedOp::dump() via dump_ops_in_flight()

librbd: diffs to clone's first snapshot should include parent diffs

If the clone has a backing object created after the snapshot that
overwrites an extent of the parent, the parent diffs within that
extent are not included in the result.

Hammer-specific implementation due to librbd refactoring during the
Infernalis release.

Fixes: http://tracker.ceph.com/issues/18111
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

qa/workunits/rbd: removed qemu-iotest case 077

The test case is not stable due to racing console output. This
results in spurious failures.

Fixes: http://tracker.ceph.com/issues/10773
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2c70df978d605a45ff81971b86f5afbefbdaabb6)

rgw: omap_get_all() fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 99e866feb3f8aa0ff768d6253979b6b4fc0fa452)

rgw/rgw_rados: do not omap_getvals with (u64)-1 max

Fixes: http://tracker.ceph.com/issues/17985
This will make the OSD fall over if the object is big
and the OSD doesn't impose it's own fail-safe limit.

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

osd: limit omap data in push op

We already have the config osd_recovery_max_chunk to limit the total
size of omap entries and omap data. But we need an individual config
to limit the number of omap entries independently. We call this config
osd_recovery_max_omap_entries_per_chunk here with the default number
of 64000.

Signed-off-by: Wanlong Gao <wanlong.gao@easystack.cn>
(cherry picked from commit 56064c5cb645254574dbad00e6c16b783115bb93)

rgw: do not abort when accept a CORS request with short origin

Fixed: #18187

when accept a CROS request, the request http origin shorter than the bucket's corsrule
(eg. origin: http://s.com corsrule: <AllowedOrigin>*.verylongdomain.com</AllowedOrigin>).
the rgw_cors.cc::is_string_in_set() will have a wrong index, the radosrgw server will
abort.

$ curl http://test.localhost:8000/app.data -H "Origin:http://s.com"

 0> 2016-12-05 03:22:29.548138 7f6add05d700 -1 *** Caught signal (Aborted) **
 in thread 7f6add05d700 thread_name:civetweb-worker

 ceph version 11.0.2-2168-gd2f8fb4 (d2f8fb4a6ba75af7e6da0f5a7f1b49ec998b1631)
 1: (()+0x50720a) [0x7f6b147c420a]
 2: (()+0xf370) [0x7f6b09a33370]
 3: (gsignal()+0x37) [0x7f6b081ca1d7]
 4: (abort()+0x148) [0x7f6b081cb8c8]
 5: (__gnu_cxx::__verbose_terminate_handler()+0x165) [0x7f6b08ace9d5]
 6: (()+0x5e946) [0x7f6b08acc946]
 7: (()+0x5e973) [0x7f6b08acc973]
 8: (()+0x5eb93) [0x7f6b08accb93]
 9: (std::__throw_out_of_range(char const*)+0x77) 0x7f6b08b21a17]
 10: (()+0xbd97a) [0x7f6b08b2b97a]
 11: (()+0x449c1e) [0x7f6b14706c1e]
 12: (RGWCORSRule::is_origin_present(char const*)+0x48) [0x7f6b147073b8]
 13: (RGWCORSConfiguration::host_name_rule(char const*)+0x37) [0x7f6b147074e7]
 14: (RGWOp::generate_cors_headers(std::string&, std::string&, std::string&, std::string&, unsigned int*)+0xa3) [0x7f6b14593e63]
 15: (dump_access_control(req_state*, RGWOp*)+0x61) [0x7f6b14653f91]

Signed-off-by: LiuYang <yippeetry@gmail.com>
(cherry picked from commit 67d4d9e64bc224e047cf333e673bb22cd6290789)

rbd: fix parameter check

using import-diff command, the imagename must be specified.

Signed-off-by: Yankun Li <lioveni99@gmail.com>

Merge pull request #1276 from ceph/no-btrfs-on-hammer

rados: remove btrfs tests; use xfs instead

Merge pull request #11457 from tchaikov/wip-17558-hammer

hammer: mon: send updated monmap to its subscribers

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11628 from ceph/wip-hammer-11567

hammer: rgw: Don't loop forever when reading data from 0 sized segment.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #10437 from odivlad/fix-doc

hammer: docs: Bucket object versions

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Don't loop forever when reading data from 0 sized segment.

The 0 sized segment can arise depending on how
the client uploads the object in the first place.
The cpu loop then happens during a swift `GET'.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 46c5f9773246522e66bb2cca49345d0b62a16c42)

Merge pull request #9873 from odivlad/fix-init-el7-hammer

hammer: build/ops: remove SYSTEMD_RUN from initscript

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #10238 from aiicore/hammer

hammer: mon: fix memory leak in prepare_beacon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #10569 from jschmid1/wip-16918-hammer

hammer: build/ops: make stop.sh more portable

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #10724 from Vicente-Cheng/wip-16584-hammer

hammer: crush: reset bucket->h.items[i] when removing tree item

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #10904 from tchaikov/wip-14470-hammer

hammer: mon: return size_t from MonitorDBStore::Transaction::size()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #10905 from SUSE/wip-11101-hammer

hammer: build/ops: improve ceph.in error message

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #10987 from Vicente-Cheng/wip-16592-hammer

hammer: librbd: ceph 10.2.2 rbd status on image format 2 returns "(2) No such file or directory"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11125 from tchaikov/wip-17179-hammer

hammer: tools: add a tool to rebuild mon store from OSD

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #11273 from aiicore/wip-17403-hammer

hammer: mon: OSDMonitor: Missing nearfull flag set

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #11618 from asheplyakov/hammer-16546

hammer: rbd: fix possible rbd data corruption

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11676 from asheplyakov/hammer-16151

hammer: osd: update PGPool to detect map gaps and reset cached_removed_snaps

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11899 from SUSE/wip-17840-hammer

hammer: rgw: the value of total_time is wrong in the result of 'radosgw-admin log show' opt

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #11927 from SUSE/wip-17764-hammer

hammer: osd: fix collection_list shadow return value

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #12071 from SUSE/wip-17957-hammer

hammer: RWLock.h: 124: FAILED assert(r == 0) in rados-jewel-distro-basic-smithi

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11929 from SUSE/wip-17359-hammer

hammer: tools: ceph-objectstore-tool crashes if --journal-path <a-directory>

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11930 from SUSE/wip-17346-hammer

hammer: cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11931 from SUSE/wip-17333-hammer

hammer: tools: crushtool --compile generates output despite missing item

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11932 from SUSE/wip-17146-hammer

hammer: PG::choose_acting valgrind error or ./common/hobject.h: 182: FAILED assert(!max || (*this == hobject_t(hobject_t::get_max())))

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11933 from SUSE/wip-17142-hammer

hammer: osd: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11934 from SUSE/wip-17120-hammer

hammer: mon: %USED of ceph df is wrong

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11935 from SUSE/wip-16870-hammer

hammer: osd: crash on EIO during deep-scrubbing

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11937 from SUSE/wip-16428-hammer

hammer: mon: prepare_pgtemp needs to only update up_thru if newer than the existing one

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11938 from SUSE/wip-14323-hammer

hammer: msg: OpTracker needs to release the message throttle in _unregistered

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #11939 from SUSE/wip-13927-hammer

hammer: mds: fix cephfs-java ftruncate unit test failure

Reviewed-by: John Spray <john.spray@redhat.com>

rgw: doc: Mark S3 object version API as supported

S3 object version is already in since Hammer.
Ref: http://marc.info/?l=ceph-devel&m=143715290627682

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
(cherry picked from commit b62c3b9537e8ab33416a7fb0dd7b801a790d42ee)

doc: add bucket object version description.
bucket object version has been supported, but do not have description in the docs,
so add this part.

Signed-off-by: shawn chen <cxwshawn@gmail.com>
(cherry picked from commit 5c395ff85627f0f4154af27aff03dd0a9c409fb4)

Merge pull request #11946 from SUSE/wip-17883-hammer

hammer: mon: OSDs marked OUT wrongly after monitor failover

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #11948 from SUSE/wip-17671-hammer

hammer: rbd: export diff should open image as read-only

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11949 from SUSE/wip-17374-hammer

hammer: librbd: image.stat() call in librbdpy fails sometimes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11950 from SUSE/wip-17123-hammer

hammer: rgw: COPY broke multipart files uploaded under dumpling

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #11951 from SUSE/wip-16594-hammer

hammer: rgw: swift: ranged request on a DLO provides wrong values in Content-Range HTTP header

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #11952 from SUSE/wip-16318-hammer

hammer: rgw: fix inconsistent uid/email handling in radosgw-admin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #12018 from trociny/wip-17068-hammer

hammer: librbd: request exclusive lock if current owner cannot execute op

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #11045 from SUSE/wip-17150-hammer

hammer: rgw: Anonymous user is able to read bucket with authenticated read ACL

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #11809 from SUSE/wip-17631-hammer

hammer: rgw: fix crash when client posts object with null condition

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

PendingReleaseNotes: document the feature to rebuild monstore

Signed-off-by: Kefu Chai <kchai@redhat.com>

doc: fill keyring with caps before passing it to ceph-monstore-tool

to make sure the recovered monitor store is ready for use.

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

tools/ceph_monstore_tool: bail out if no caps found for a key

we take it as an error if no caps is granted to an entity in the
specified keyring file when rebuilding the monitor db.

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

tools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db

we should rebuild pgmap_meta table from the collected osdmaps

Fixes: http://tracker.ceph.com/issues/17400
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cdfa7a69f63d047205dcfccd63b5d58ab0d4695b)
Conflicts:
src/tools/ceph_monstore_tool.cc: remove C++11-ism

tools/rebuild_mondb: kill compiling warning

As follow:

[ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
         if (have_crc && osdmap.get_crc() != crc) {
                      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
     uint32_t crc;

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit f16a31476a3f9b44a7c3dabf0dfd2a0d015b11b9)

tools/rebuild_mondb: return error if ondisk version of pg_info is incompatible

In this case "r" will be >= 0 and caller will be able to catch
this kind of error.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ac7c1dca0a4f6e92e50d362784122e2d3200e6b5)

tools/rebuild_mondb: avoid unnecessary result code cast

In general we return negative codes for error cases, so there is
no need perform the cast here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 6a1c01d334fe65124043aa68a6e0cfaea43836b5)

doc: add rados/operations/disaster-recovery.rst

document the process to recover from leveldb corruption.

Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 79a9f299253e24d20547131b3c9c9e0667e3b869)

tools/ceph_monstore_tool: add "rebuild" command

Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d909fa035c8fbbded786b2ca072acc10ea6b6052)

Conflicts:
ceph_monstore_tool.cc: remove C++11ish

tools/ceph-objectstore-tool: add "update-mon-db" command

Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 24faea7ce446bbf09cbd4a9d3434dd5444a6c295)

Conflicts:
src/tools/Makefile-server.am: add rebuild_mondb.{cc,h}, as autotools
          support is dropped in master
ceph_objectstore_tool.cc, rebuild_mondb.cc: remove C++11ish
          adapt to hammer

mon/AuthMonitor: make AuthMonitor::IncType public

so ceph-objectstore-tool is able to use it when rebuilding monitor
db.

Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 19ef4f16b3aba04119ac647cd6261c74a57ce829)

thrasher: Add dump_ops_enable options

Add dump_ops_enable which continuously dumps ops using 3 commands

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

Excluded dynamic optracker testing with optrack_toggle_delay option

Conflicts:
tasks/ceph_manager.py (trivial)
tasks/thrashosds.py (trivial)

ceph_manager: Add timeout to admin_socket/osd_admin_socket

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

Thrasher: log backtrace of thrown exception

* add a wrapper to log uncaught exception to self.logger, greenlet also
  prints the backtrace and exception to stderr, but teuthology.log does
  not capture stderr. so we need to catch them by ourselves to reveal
  more info to root-cause this issue.
* log uncaught exception thrown by Thrasher.do_thrash() to self.log.

See: #10630
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 64de3cd574b200d90cb3aea0d646a6236d8fec5e)

rados: remove btrfs tests; use xfs instead

Signed-off-by: Sage Weil <sage@redhat.com>

hammer: ObjectCacher: fix bh_read_finish offset logic

If we have an incoming read split across multiple BufferHeads, we want to
line up the BufferHead's bl with the incoming OSDOp's bl at the right offset. We
were erroneously using this nonsense calculation (always equal to zero!) when
a much simpler comparison of the BufferHead's logical object offset to the
incoming OSDOp's logical offset will do the trick nicely.

Fixes: http://tracker.ceph.com/issues/16002
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 9ec6e7f608608088d51e449c9d375844631dcdde)

hammer: test: build a correctness test for the ObjectCacher

For now it's very specifically designed to reproduce
http://tracker.ceph.com/issues/16002, but it can
be extended to other patterns in the future.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0fd55a9886dd8da344c23a5e9898ee5c5061e8f9)

Hammer specific changes:

* use utime_t instead of ceph::real_time
* ObjectCacher::prepare_write() has no journal_tid argument
* rewrite the code in C++98