Merge pull request #4875 from ceph/wip-11770-hammer

librbd: aio calls may block

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

Merge pull request #4886 from theanalyst/wip-11737-hammer

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

Merge pull request #5095 from ceph/wip-fix-doc-hammer

doc: fix doc build

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

doc: add the corresponding @endcond command for @cond

* they are used to applease asphyxiate, as it
  is not able to handle "enum" sections

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

doc: remove orphan: directive in ceph-create-keys.rst

* it is used to silence the sphinx warning, but conf.py
  does not like it.

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

doc: let doxygen ignore src/tracing

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

Merge pull request #4902 from theanalyst/wip-11908-hammer

Fixes for rados ops with snaps

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

Merge pull request #5069 from dachary/wip-11806-hammer

ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg

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

debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg (take 2)

968573b8930a7c8485bf53e3a989ce2f7d0a2fff incorrectly backported
6f11fbf41fab10924b1e0e41fcf27864779d4073. It should instead reflect that
ceph-dbg in 0.94.2 and above will break ceph-test-dbg in all versions
prior to 0.94.2.

In other words, 0.94-XXXX being lower than 0.94.1, upgrading from
0.94.1 to 0.94.2 will not notice that ceph-dbg breaks ceph-test-dbg.

$ dpkg --compare-versions 0.94-XXXX lt 0.94.1 && echo yes || echo no
yes
$ dpkg --compare-versions 0.94.2 lt 0.94.1-xxx && echo yes || echo no
no

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

Signed-off-by: Loic Dachary <loic@dachary.org>

qa/workunits/rados/test-upgarde-v9.0.1: fix exclude syntax

It's -, then a list of all exclusions separated by :.  There are just 2.

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

qa/workunits/rados/test-upgrade-v9.0.1: skip one more evict test

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

qa: add compatibility filtered rados api tests for upgrades

Post-9.0.1, the evict op returns success when an object doesn't exist
in the cache tier. Skip the tests that are incompatible across
versions.

Fixes: #11548
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #4961 from ceph/wip-11493-hammer

backport 11493 fixes, and test, prevetning ec cache pools

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

OSDMonitor: disallow ec pools as tiers

Fixes: 11650
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 11b7801bb57cb25cd2d26d58722d49691747725b)

mon: prevent pool with snapshot state from being used as a tier

If we add a pool with snap state as a tier the snap state gets clobbered
by OSDMap::Incremental::propogate_snaps_to_tiers(), and may prevent OSDs
from starting.  Disallow this.

Include a test.

Fixes: #11493
Backport: hammer, giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit bbec53edf9e585af4e20bbc9ba9057d6fdfda342)

test/librados/tier.cc: destroy and recreate cache pool on every test

Namespaces are not sufficient with the checks for 11493 in the mon.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit bef09e0cdb274cb1c87335a2af9ee532d14a4596)

Merge pull request #4846 from SUSE/wip-11862-hammer

missing man pages for ceph-create-keys, ceph-disk-*

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

Merge pull request #4934 from dachary/wip-releases-hammer

doc/release-notes: v0.94.2

doc/release-notes: v0.94.2

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

Conflicts:
doc/release-notes.rst

tests: verify librbd blocking aio code path

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4cf41486e9c9e1efcb863960a8f3e0326ffca7e5)

Conflicts:
src/test/librbd/test_librbd.cc: trival resolution

librbd: new rbd_non_blocking_aio config option

Setting this option to false reverts librbd to legacy behavior
where AIO operations could potentially block.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 769cad12716b85d87eacc1069dd9f5c21cad3915)

PendingReleaseNotes: document changes to librbd's aio_read methods

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

librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c77bce3311ab62892eb8c1d883263ba7ed663b20)

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/AsyncFlattenRequest.cc: trivial resolution

tests: update librbd AIO tests to remove result code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 948b15eb52fd5d9ce842fa12ee0cecda17353b01)

Conflicts:
src/test/librbd/test_internal.cc: trivial resolution
src/test/librbd/test_librbd.cc: trivial resolution

librbd: internal AIO methods no longer return result

All failures should be returned via the AioCompletion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9ab42d613128ab08c688ddbea93df4c95068b9cd)

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/internal.cc: trivial resolution

Throttle: added pending_error method to SimpleThrottle

Allow the client of SimpleThrottle to detect an async error
so that it can exit early.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b88b88c5df91325fb713c2031a56bffe421268e0)

librbd: add new fail method to AioCompletion

Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6d1d0c867855a96bee4c13a0c0a39a0e002ccd12)

librbd: avoid blocking AIO API methods

Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.

Fixes: #11056
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3a7b5e30efdb21aa1a0aeb68a5d02a1ac2a5faf3)

librbd: add task pool / work queue for requests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit afb896d91f886b647baf38f7ec94cc3739f6d2a9)

Conflicts:
src/librbd/ImageCtx.cc: trivial resolution
src/librbd/ImageCtx.h: trivial resolution

0.94.2

ReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked

Otherwise we can reorder an op around another op which got blocked by a
scrub which started after the first blocked on an obc.

Fixes: #11691
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit be873eb8da7b29ecefaa5a99b88de7ddcca711ee)

ReplicatedPG::finish_ctx: take excl lock if operation is rw

Fixes: #11677
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5c2b795724423ed484ab451de855ddcfc085342b)

RadosModel: randomly prefix delete with assert_exists

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 4fe7d2abdff2fce359e5e992206644cc03825ee0)

RadosModel: assert exists on subsequent writes

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 121aa3bc612b86281535ac3bcfe98bc99bc99ace)

test/librados/snapshots.cc: add test for 11677

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit c2d17b927f8a222164b3bf2922a4ff337696f566)

mds: clear CDir::STATE_REJOINUNDEF after fetching dirfrag

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

man/ceph-create-keys.8: add missing file

This is the generated manpage, taken from a local build of master

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bcda61fcbe07ee36cd5172d80018f287591660ec)

doc: add ceph-create-keys.8

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

Conflicts:
    doc/man/8/ceph-create-keys.rst
    Includes fixes from https://github.com/ceph/ceph/pull/4855

WorkQueue: added virtual destructor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b3f5a75332c058816dc39b71e9d2b36e752159f4)

WorkQueue: add new ContextWQ work queue

The queue holds a collection of Context pointers that will
be completed by the thread pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 24a33e977f7b71962adeeb48f75d488a76e70fa9)

Merge pull request #4795 from dachary/wip-11806-hammer

ceph / ceph-dbg steal ceph-objecstore-tool from ceph-test / ceph-test-dbg

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

debian: ceph-dbg steals ceph-objectstore-tool from ceph-test-dbg

When ceph-objectstore-tool was moved from ceph-test to
ceph by 61cf5da0b51e2d9578c7b4bca85184317e30f4ca, the ceph package in
debian/control was updated accordingly, as recommended by
https://www.debian.org/doc/debian-policy/ch-relationships.html#s-replaces

The same must be done for the ceph-dbg package because
/usr/lib/debug/usr/bin/ceph-objectstore-too is no longer in
ceph-test-dbg.

Although the change was merged may 6th, 2015
8f23382064c189b657564d58c3f9d17720e891ed, teuthology jobs were not
always failing because packages were not systematically upgraded during
the installation. The missing dependencies that were responsible for
this upgrade problem were fixed by
f898ec1e4e3472b0202280f09653a769fc62c8d3 on may 18th, 2015 and all
upgrade tests relying on ceph-*-dbg packages started to fail
systematically after this date.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 6f11fbf41fab10924b1e0e41fcf27864779d4073)

Merge pull request #4773 from dachary/wip-11733-hammer

Debian: ceph-test and rest-bench debug packages should require their respective binary packages

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

debian: set rest-bench-dbg ceph-test-dbg dependencies

Debian's debug packages ought to depend on their respective binary
packages. This was the case for many of our ceph packages, but it was
not the case for ceph-test-dbg or rest-bench-dbg.

Add the dependencies on the relevant binary packages, pinned to
"= ${binary:Version}" per convention.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit f898ec1e4e3472b0202280f09653a769fc62c8d3)

Merge pull request #4696 from ceph/wip-11622-hammer

Wip 11622 hammer

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

Merge pull request #4649 from ceph/wip-hammer-package-perf-objectstore

packaging: include ceph_perf_objectstore

rgw: merge manifests correctly when there's prefix override

Fixes: #11622
Backport: hammer, firefly

Prefix override happens in a manifest when a rados object does not
conform to the generic prefix set on the manifest. When merging
manifests (specifically being used in multipart objects upload), we need
to check if the rule that we try to merge has a prefix that is the same
as the previous rule. Beforehand we checked if both had the same
override_prefix setting, but that might not apply as both manifests
might have different prefixes.

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

rgw: restore buffer of multipart upload after EEXIST

Fixes #11604
Backport: hammer, firefly

When we need to restart a write of part data, we need to revert to
buffer to before the write, otherwise we're going to skip some data.

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

packaging: include ceph_perf_objectstore

The /usr/bin/ceph_perf_objectstore file is installed by default. Prior
to this commit it was missing from the packaging. This caused the RPM to
fail to build in mock.

Add ceph_perf_objectstore to the "ceph-test" RPM and Debian package.

If we end up developing further ceph_perf_* utilities, it would make
sense to glob them all with a wildcard, similar to what we are doing
with all the ceph_test_* utilities in ceph-test.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 338b44bc74bc4597939c5c58f2a6f2cb08de7d9c)

Merge pull request #4568 from dachary/wip-10662-10663-hammer

RGW swift API: Response header of COPY request for object does not

contain x-copied-from, custom metadata, x-copied-from-last-modified, X-Copied-From-Account headers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4629 from ceph/hammer-uclient-checking

Hammer uclient checking

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

client: fix error handling in check_pool_perm

Previously, on an error such as a pool not existing,
the caller doing the check would error out, but
anyone waiting on waiting_for_pool_perm would
block indefinitely (symptom was that reads on a
file with a bogus layout would block forever).

Fix by triggering the wait list on errors and
clear the CHECKING state so that the other callers
also perform the check and find the error.

Additionally, don't return the RADOS error code
up to filesystem users, because it can be
misleading.  For example, nonexistent pool is
ENOENT, but we shouldn't give ENOENT on IO
to a file which does exist, we should give EIO.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit e08cf25cafef5752877439c18cc584b0a75eca08)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

client: use SaferCond in check_pool_perm

Just because it's easier to read.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 289ee3b80ccce6bab2966f513a37332280d04a06)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

client: check OSD caps before read/write

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 3c4028ec21e3ef9e8801c4570420c88722651cc7)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #4567 from dachary/wip-10938-hammer

RGW Swift API: response for GET/HEAD on container does not contain the X-Timestamp header

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4570 from dachary/wip-10243-hammer

civetweb is hitting a limit (number of threads 1024)

Merge pull request #4573 from dachary/wip-11125-hammer

rgw: keystone token cache does not work correctly

Merge pull request #4574 from dachary/wip-11160-hammer

rgw: shouldn't need to disable rgw_socket_path if frontend is configured

Merge pull request #4575 from dachary/wip-10650-hammer

Response header of swift API PUT /container/object returned by RGW

does not contain last-modified, content-length, x-trans-id headers. But Swift returns these headers.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4576 from dachary/wip-10661-hammer

RGW swift API: Response header of POST request for object does not contain content-length and x-trans-id headers

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4579 from dachary/wip-11036-hammer

RGW Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4580 from dachary/wip-11088-hammer

RGW Swift API: wrong handling of empty metadata on Swift container

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4581 from dachary/wip-11323-hammer

rgw: quota not respected in POST object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4566 from dachary/wip-11478-hammer

Queued AIO reference counters not properly updated

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

Merge pull request #4564 from dachary/wip-11369-hammer

Periodic failure of TestLibRBD.DiffIterateStress

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

Merge pull request #4585 from ceph/wip-11370-hammer

A retransmit of proxied flatten request can result in -EINVAL

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

Merge pull request #4618 from dachary/wip-11398-kill-daemons-hammer

tests: ceph-helpers kill_daemons fails when kill fails

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

tests: ceph-helpers kill_daemons fails when kill fails

Instead of silently leaving the daemons running, it returns failure so
the caller can decide what to do with this situation. The timeout is
also extended to minutes instead of seconds to gracefully handle the
rare situations when a machine is extra slow for some reason.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 0e26e9f72bc14417266b87ac1159607e1b109303)

Added a "ceph hello world" for a simple check for ceph-deploy qa suite

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 13abae186357f4e9bb40990a7a212f93ec2e1e79)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #4502 from dachary/wip-11026-hammer

objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend

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

Merge pull request #4562 from dachary/wip-11376-hammer

ceph-objectstore-tool should be in the ceph server package

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

packaging: mv ceph-objectstore-tool to main ceph pkg

This change ensures that the ceph-objectstore-tool utility is present on
all OSDs.  This makes it easier for users to run this tool to do manual
debugging/recovery in some scenarios.

http://tracker.ceph.com/issues/11376 Refs: #11376

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 61cf5da0b51e2d9578c7b4bca85184317e30f4ca)
    Conflicts:
            debian/control
            because file layout changes from ceph-test and ceph << 0.94.1-46

Merge pull request #4561 from dachary/wip-11143-hammer

src/ceph-disk : disk zap sgdisk invocation

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

Merge pull request #4560 from dachary/wip-11507-hammer

object creation by write cannot use an offset on an erasure coded pool

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

Merge pull request #4559 from dachary/wip-11429-hammer

OSD::load_pgs: we need to handle the case where an upgrade from earlier versions which ignored non-existent pgs resurrects a pg with a prehistoric osdmap

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

Merge pull request #4563 from tchaikov/wip-hammer-11534

mon: Total size of OSDs is a maginitude less than it is supposed to be.

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

Merge pull request #4577 from dachary/wip-10666-hammer

RGW swift API: Response header of GET request for container does not contain X-Container-Object-Count, X-Container-Bytes-Used and x-trans-id headers

Reviewed-by: Dmytro Iurchenko <diurchenko@mirantis.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

rgw: send Content-Length in response for HEAD on Swift account.

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

rgw: send Content-Length in response for DELETE on Swift container.

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

rgw: send Content-Length in response for PUT on Swift container.

Fixes: #11036
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 10c1f1aa1e09df5edf5d2f9f9b0273ddbcb384fa)

librbd: flatten should return -EROFS if image is read-only

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f141e02ab719df830648318f4c1d9ca286071ed3)

librbd: allow snapshots to be created when snapshot is active

The librbd API previously permitted the creation of snapshots while
the image context was associated to another snapshot.  A recent code
cleanup broke that ability, so this re-introduces it.  The code change
also allows minor cleanup with rebuild_object_map.

Fixes: #11475
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 594a6610802f2cadb62200815bd8b9860809e759)

Conflicts:
src/librbd/internal.cc

librbd: better handling for duplicate flatten requests

A proxied flatten request could be replayed, resulting in a
-EINVAL error code being generated on the second attempt. Filter
out that error if it is known the parent did exist before the
op started.

Fixes: #11370
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ef7e210c3f747bc4c3c8768c7b6407cc91c5c319)

librbd: use generic helper for issuing async requests

resize, flatten, and rebuild object map now use the same
bootstrap code for sending the request to the remote lock owner
or executing the request locally.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 18fd6ca7f59d5545f0bb0b0e899d0739639ce104)

Conflicts:
src/librbd/internal.cc

OSD: handle the case where we resurrected an old, deleted pg

Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap.  Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs.  Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.

Fixes: 11429
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)

rgw: improve metadata handling on copy operation of Swift API.

Fixes: #10645
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit a00cb31cc52e91bfacdd15e0af60be74e66c1996)

rgw: quota not respected in POST object

Signed-off-by: Sergey Arkhipov <nineseconds@yandex.ru>
Backport: hammer, firefly
Fixes: #11323
(cherry picked from commit e76f84e179d2ba8bfc0dc5abf4e620fef14bc8a0)

Conflicts:
src/rgw/rgw_op.cc
        discard the whitespace modification hunk that were creating
conflict and ignore the conflict due to an unrelated cast
        modification in the context

rgw: fix handling empty metadata items on Swift container.

Fixes: #11088
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 1660d8625212f7b5fb30568ed640f467297e36cb)

rgw: send Content-Length in response for GET on Swift container.

Fixes: #10971
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5a64fb5430b6b42174bf53a5910d9435043c1380)

rgw: enable end_header() to handle proposal of Content-Length.

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

rgw: Swift API. Complement the response to "show container details"

OpenStack Object Storage API v1 states that X-Container-Object-Count, X-Container-Bytes-Used and user-defined metadata headers should be included in a response.

Fixes: #10666
Backport: hammer
Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
(cherry picked from commit d3a3d5ae5859cd7f2eed307e8f942f9a9fd75f35)

rgw: enforce Content-Length in response for POST on Swift cont/obj.

Fixes: #10661
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit fd0c612cf867d2e99e74820130357e63305970fb)

rgw: send Last-Modified header in response for PUT on Swift object.

Fixes: #10650
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 9a22acc57684534a245f25848c23d1db21f16653)

rgw: don't use rgw_socket_path if frontend is configured

Fixes: #11160
Backport: hammer, firefly

Previously if we wanted to use the tcp fcgi socket, we needed to clear
rgw_socket_path.

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

rgw: update keystone cache with token info

Fixes: #11125
Backport: hammer, firefly

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

civetweb: update max num of threads

Fixes: #10243
cherry-picked upstream fixed into submodule

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

rgw: improve code formatting ONLY.

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

rgw: send X-Copied-From-Last-Modified header of Swift API.

Fixes: #10663
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit e7724a1d8c0872362c19f578fe30ac2cf3dada90)

rgw: dump object metadata in response for COPY request of Swift API.

Fixes: #10663
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit c52b75edeaeef19471b9aca772bf08055bf04031)

rgw: refactor dumping metadata of Swift objects.

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