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)

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)

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()

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

hammer: test: split objectcacher test into 'stress' and 'correctness'

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

hammer: test: add a data-storing MemWriteback for testing ObjectCacher

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

Hammer specific changes:

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

hammer: objectcacher: introduce ObjectCacher::flush_all()

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

Conflicts:
src/osdc/ObjectCacher.h - whitespace only changes

Semantic conflicts:
        ObjectCacher::flush_all(): dirty_or_tx_bh is a set<BufferHead *>
in Hammer

hammer: osd: provide some contents on ObjectExtent usage in testing

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

stop.sh: make more portable

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 27f2d806f905df1a51b11bd79f1af4c26471407a)

Merge pull request #12006 from SUSE/wip-17905-hammer

hammer: mon: MonmapMonitor should return success when MON will be removed

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

ceph.in: improve the error message

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

os/ObjectStore: fix _update_op for split dest_cid

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

mon/MDSMonitor: fix memory leak in prepare_beacon

prepare_beacon() case of prepare_update() should put()
message in two more cases, because is the last step
of dispatch()

Fixes: http://tracker.ceph.com/issues/17285
Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>

mon: OSDMonitor: Missing nearfull flag set

Output from 'ceph -s -f json-pretty' wans't showing nearfull flag set.

Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
(cherry picked from commit 754887b575795ef96cda095f7f0d8c898e20f00f)

mon: send updated monmap to its subscribers

prior to this change, we sends monmap when serving the subscription
requests, but the updates are not sent to the subscribers anymore.
so we need to send latest monmap to subscribes and update the
subscription status accordingly when the monmap is updated.

http://tracker.ceph.com/issues/17558
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c2b348b12c47ba505f72228ae0ea9b1a1b674719)
Conflicts:
src/mon/Monitor.cc: resolve conflicts
src/mon/MonmapMonitor.cc: remove C++11-ism

rbd: this command should be EXPORT_DIFF

Fixes: http://tracker.ceph.com/issues/17671
Signed-off-by: liyankun <lioveni99@gmail.com>

mon: update mon(peon)'s down_pending_out when osd up

Fixes: http://tracker.ceph.com/issues/17719
Signed-off-by: Dong Wu <archer.wudong@gmail.com>
(cherry picked from commit 664254a17afbad86983ea5b5b8d385662d89e65e)

Conflicts:
    src/mon/OSDMonitor.cc (auto declaration for variable "found" is a C++11ism,
        replace with the full verbose C++98 type)

librbd: request exclusive lock if current owner cannot execute op

This is a direct commit to hammer due to librbd code has evolved
significantly in the master.

Fixes: http://tracker.ceph.com/issues/17068
Signed-off-by: Mykola Golub <mgolub@mirantis.com>

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

* crush: so we don't see the reference after the removing, this keeps
  check_item_loc() happy, and move_bucket() use check_item_loc() to see if
  the removed bucket disappears after the removal.
* test: also add unittest_crush_wrapper::CrushWrapper.insert_item

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

Backport change: modify some codes that only works on c++ 11

mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)

Conflicts:
src/mon/MonmapMonitor.cc (just inserted the "err = 0" assignment
        immediately after the error message line)

librbd: prevent creation of v2 image ids that are too large

The librbd API is capped at 24 characters for expressing the
object prefix for data blocks (including trailing null byte).

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

PG: update PGPool to detect map gaps and reset cached_removed_snaps

Fixes: http://tracker.ceph.com/issues/15943
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5798fb3bf6d726d14a9c5cb99dc5902eba5b878a)

Conflicts:
src/osd/OSD.cc: trivial, fuzz is too big so git prefers to be safe

rgw-admin: return error on email address conflict (add user)

Fixes the error return inconsistency documented in upstream
Ceph issue #13598

Revised after upstream review, permits changing email address as
originally (but use case-insensitive comp).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 90c143efa2156e55dc017ebe81005315cacaf2c5)

Conflicts:
src/rgw/rgw_user.cc (there is no op_state.found_by_email
        conditional in hammer)

rgw-admin: convert user email addresses to lower case

Fixes the email address inconsistency documented in upstream
Ceph BUG #13598

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4c438dbbc0e6eda6b9a3018d60019a1a780d6f65)

rgw: fix wrong length in Content-Range HTTP header of Swift's DLO.

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

rgw: fix wrong first byte pos in Content-Range HTTP header of Swift's DLO.

Fixes: #13452
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 66f47f35bbb4966cb289811672938b90ae6d44ae)

rgw: adjust manifest head object

adjust the manifest head object:
 - when reading manifest, set the head object to the object
   we read the manifest from (and its size). Some manifests are
   broken and point at a different object
 - when copying multipart object, set the manifest head object to
   point at the new head object

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

rgw: adjust objs when copying obj with explicit_objs set

If the head object contains data, need to set it in the list of
objs (in addition to being pointed at by head_obj).

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

rgw: patch manifest to handle explicit objs copy issue

Fixes: http://tracker.ceph.com/issues/16435
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit b51476466e5bb03bbaa6e428bb6bb189a259b9fd)

librbd: block name prefix might overflow fixed size C-string

The issue which resulted in too large v2 image ids was fixed
under #16887.

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

OpRequest: release the message throttle when unregistered

We don't want messages in the OpTracker history hanging on to
message throttle.

Fixes: #14248
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 67be35cba7c384353b0b6d49284a4ead94c4152e)

Conflicts:
    src/msg/Message.h (s/nullptr/0/ because C++98)

OSDMonitor::prepare_pgtemp: only update up_thru if newer

Fixes: http://tracker.ceph.com/issues/16185
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5f2bd7b6b28aad96d68444b22c04b8b24564616b)

Conflicts:
src/mon/OSDMonitor.cc (master uses C++11 "auto" for new_up_thru
        iterator, replace with explicit type)
src/mon/OSDMonitor.h (trivial resolution)