ceph-disk: fix '--runtime' omission for ceph-osd service

f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.

Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>
(cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd)

Merge pull request #17892 from smithfarm/wip-p2p-s3-test

jewel: tests: fix upgrade/jewel-x/point-to-point-x

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>

qa: point-to-point-x: upgrade client.1 to -x along with cluster nodes

The client.1 rgw in workload_x had not been upgraded to -x.

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

tests: use special branch of ceph/s3-tests with pre-10.2.10

Jewel v10.2.10 introduces a fix for S3 ACL code, for which a new test was added
to ceph/s3-tests.git (ceph-jewel branch). Since the jewel point-to-point-x
upgrade test runs s3-tests on 10.2.7, modify the test to use a special
ceph/s3-tests branch (ceph-jewel-10-2-7) that omits the new test.

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

Merge pull request #17780 from smithfarm/wip-rh-74-jewel

tests: CentOS 7.4 is now the latest

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #16297 from smithfarm/wip-20518-jewel

jewel: rbd: cli: map with cephx disabled results in error message

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

Merge pull request #17781 from smithfarm/wip-drop-11429

tests: Removed 11429 config

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

tests: Removed 11429 config

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

Conflicts:
    Cherry-picked manually because, nowadays, we have the entire ceph-qa-suite
    under qa/ in ceph/ceph.git

tests: CentOS 7.4 is now the latest

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

Conflicts
    qa/distros/supported/centos_latest.yaml (renamed from centos_7.3.yaml)

Merge pull request #16473 from smithfarm/wip-20723-jewel

jewel: osd: rados ls on pool with no access returns no error

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

Merge pull request #17626 from badone/wip-jewel-ceph-osd-flush-segfault

jewel: core: kv: let ceph_logger destructed after db reset

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

Merge pull request #17677 from mslovy/wip-disable-kstore-test

jewel: qa: disable kstore to fix false positive case

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

Merge pull request #17597 from smithfarm/wip-21186-jewel

jewel: rgw: rgw_file:  incorrect lane lock behavior in evict_block()

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

Merge pull request #17287 from smithfarm/wip-21109-jewel

jewel: rgw: send data-log list infinitely

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

Merge pull request #17285 from smithfarm/wip-20820-jewel

jewel: rgw: Segmentation fault when exporting rgw bucket in nfs-ganesha

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

Merge pull request #17281 from smithfarm/wip-20818-jewel

jewel: rgw hangs in RGWRealmReloader::reload on SIGHUP

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

Merge pull request #17280 from smithfarm/wip-20815-jewel

jewel: rgw: uninitialized memory is accessed during creation of bucket's metadata

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

Merge pull request #17279 from smithfarm/wip-20813-jewel

jewel: rgw: usage logging on tenated buckets causes invalid memory reads

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

Merge pull request #17277 from smithfarm/wip-20726-jewel

jewel: rgw: user quota did not work well on multipart upload

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>

Merge pull request #17649 from dillaman/wip-21346

jewel: qa/workunits/rbd: relax greps to support upgrade formatting change

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17166 from smithfarm/wip-20719-jewel

jewel: rgw: Truncated objects

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

Merge pull request #17165 from smithfarm/wip-20715-jewel

jewel: rgw: radosgw-admin data sync run crash

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

Merge pull request #17164 from smithfarm/wip-20712-jewel

jewel: rgw: not initialized pointer cause rgw crash with ec data pool

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

Merge pull request #17159 from smithfarm/wip-20709-jewel

jewel: rgw: radosgw-admin: bucket rm with --bypass-gc and without --purge-data doesn't throw error message

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

Merge pull request #17156 from smithfarm/wip-20673-jewel

jewel: rgw: multisite: RGWRadosRemoveOmapKeysCR::request_complete return val is wrong

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

Merge pull request #17148 from smithfarm/wip-20292-jewel

jewel: rgw: multisite: log_meta on secondary zone causes continuous loop of metadata sync

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

Merge pull request #17147 from smithfarm/wip-20290-jewel

jewel: rgw: rgw_file: prevent conflict of mkdir between restarts

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

Merge pull request #16856 from prallabh/wip-20895

jewel: rgw: bucket index check in radosgw-admin removes valid index

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

Merge pull request #16767 from linuxbox2/jewel-rgw-mpart-race

jewel: rgw : fix race in RGWCompleteMultipart

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

qa: disable kstore to fix false positive case

Signed-off-by: Ning Yao <yaoning@unitedstack.com>

Merge pull request #17574 from smithfarm/wip-21297-jewel

jewel: libradosstriper processes arbitrary printf placeholders in user input

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

rgw: fix radosgw-admin data sync run crash

If sync thread have run before, then run data sync init. sync_status is still remain in rados pool. so no matter sync_status exists or not, if state is StateInit, sync_status.sync_info.num_shards should be updated.

Fixes: http://tracker.ceph.com/issues/20423
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit c307910d7131fc290f00bb8e33876e667afb72ec)

Conflicts:
    src/rgw/rgw_data_sync.cc (no data_sync_module or instance_id in jewel)

Merge pull request #16299 from smithfarm/wip-20262-jewel

jewel: rgw: datalog trim can't work as expected

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

Merge pull request #17167 from smithfarm/wip-20720-jewel

jewel: multisite: RGWPeriodPuller does not call RGWPeriod::reflect() on new period

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

tests: use XFS explicitly in singleton-nomsgr/pool-access.yaml

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/suites/rados/singleton-nomsgr: fix syntax

This parsed out as

  tasks:
  - install: null
  - ceph:
      conf:
        osd: osd max object name len = 400 osd max object namespace len = 64
  - workunit:
      clients:
        all:
        - rados/test_health_warnings.sh

which is clearly not correct.

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

Conflicts:
    applied changes to pool-access.yaml instead of health-warnings.yaml

Merge pull request #15556 from cbodley/wip-19847

jewel: rgw: multisite: fixes for meta sync across periods

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

Merge pull request #17155 from smithfarm/wip-20641-jewel

jewel: rgw: multisite: lock is not released when RGWMetaSyncShardCR::full_sync() fails to write marker

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

Merge pull request #17278 from smithfarm/wip-20728-jewel

jewel: rgw: multipart parts on versioned bucket create versioned bucket index entries

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

rgw: we no longer use log_meta

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

rgw: is_single_zonegroup doesn't use store or cct

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

rgw: log_meta only for more than one zone

Fixes: http://tracker.ceph.com/issues/20357
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 088dba03ccc65609ef1c51306389ebcf1126ec8c)

rgw: only log metadata on metadata master zone

Fixes: http://tracker.ceph.com/issues/20244
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b8272f3607074a2f7cbfd08f7bbc82f22cf120ba)

Merge pull request #16296 from smithfarm/wip-20267-jewel

jewel: rbd: api: is_exclusive_lock_owner shouldn't return -EBUSY

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

Merge pull request #17385 from dillaman/wip-19957

jewel: librbd: reacquire lock should update lock owner client id

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17402 from dillaman/wip-20515

jewel: librbd: fail IO request when exclusive lock cannot be obtained

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #17412 from dillaman/wip-18704

jewel: librbd: prevent self-blacklisting during break lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

qa/workunits/rbd: relax greps to support upgrade formatting change

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

Conflicts:
qa/workunits/rbd/import_export.sh: trivial resolution

qa/suites/rados/singleton-nomsgr/pool-access: behave on ext4

We may land on an ext4 root partition.

Fixes: http://tracker.ceph.com/issues/20043
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from 657453d34914832f6e8012fbd69200e9680bd9ff)

Conflicts:
    applied the changes to pool-access.yaml instead of health-warnings.yaml
    to address a specific test failure in the jewel branch

tasks/ceph: construct CephManager earlier

Previously, if errors occurred during healthy(), then
the finally block would invoke osd_scrub_pgs, which relies
on CephManager being constructed, and it would die, hiding
the original exception.

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

Conflicts:
qa/tasks/ceph.py: the `tasks` directory was moved into
`qa` after the cherry-picked change was merged.
so apply the change manually to the ceph.py
under `qa` directory.
(cherry picked from commit bc71dabb4e311bd2461489e98e9b95d5b635effc)

kv: let ceph_logger destructed after db reset

if ceph_logger is deleted earlier than db, it may still be used by db, which cause a segment fault.

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
(cherry picked from commit a5cd03c643d6cb9074dfd2952cde83435de1b9dd)

Merge pull request #15189 from mslovy/wip-19996-jewel

jewel: osd: fix infinite loops in fiemap

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

Merge pull request #16711 from cbodley/wip-20346

jewel: rgw: meta sync thread crash at RGWMetaSyncShardCR

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

Merge pull request #17552 from dillaman/wip-21279

jewel: test/cls_rbd: mask newer feature bits to support upgrade tests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

rgw_file:  fix LRU lane lock in evict_block()

Found by "Supriti Singh" <Supriti.Singh@suse.com>.

Fixes http://tracker.ceph.com/issues/21141

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

Merge pull request #17514 from smithfarm/wip-21232-jewel

jewel: core: interval_set: optimize intersect_of insert operations

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

Merge pull request #16293 from smithfarm/wip-20460-jewel

jewel: core: test_envlibrados_for_rocksdb.yaml fails on crypto restart

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

qa/suites/rbd: fixed cache override

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

libradosstriper: remove format injection vulnerability

Fixes: http://tracker.ceph.com/issues/20240
Signed-off-by: Stan K <redrampage@selectel.ru>
(cherry picked from commit e94d3b9661d287e500cdf4e6c102d2e3bb04475e)

Merge pull request #17084 from badone/wip-ceph-disk-dmcrypt-key-jewel

jewel: ceph-disk: Use stdin for 'config-key put' command

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

Merge pull request #17008 from asheplyakov/19182-bp-jewel

jewel: mon: fix force_pg_create pg stuck in creating bug

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

osd: Reverse order of op_has_sufficient_caps and do_pg_op

Fixes: http://tracker.ceph.com/issues/19790
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit a921882e7c676d68ed67b54301b49fd9bed42945)

Conflicts:
        qa/suites/rados/singleton-nomsgr/all/pool-access.yaml - drop mgr.x
            role, which is not needed in jewel and might even cause the test to
            fail
        src/osd/PrimaryLogPG.cc - this file doesn't exist in jewel, so apply
            the change manually to ReplicatedPG.cc (i.e., by moving the
            op->includes_pg_op() conditional below the
            !op_has_sufficient_caps(op) conditional)

Merge pull request #17133 from smithfarm/wip-21035-jewel

jewel: ceph-disk: systemd unit timesout too quickly

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #16316 from smithfarm/wip-20362-jewel

jewel: rgw: VersionIdMarker and NextVersionIdMarker are not returned when listing object versions

Reviewed-by: Casey Bodley <cbodley@redhat.com>

ceph_test_objectstore: disable filestore_fiemap

This very reliably triggers a test failure for
ObjectStore/StoreTest.Synthetic/1.

FIEMAP is bad!  Do not use it!

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

test/cls_rbd: mask newer feature bits to support upgrade tests

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

Merge pull request #16703 from ddiss/wip-20837-jewel

jewel: ceph-disk: don't activate suppressed journal devices

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

Merge pull request #17396 from smithfarm/wip-21113-jewel

jewel: cephfs: get_quota_root sends lookupname op for every buffered write

Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #17009 from dreamhost/wip-16463-jewel

jewel: rgw: aws4: add rgw_s3_auth_aws4_force_boto2_compat conf option

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

Merge pull request #16963 from smithfarm/wip-20972-jewel

jewel: cephfs: ceph-fuse segfaults at mount time, assert in ceph::log::Log::stop

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16952 from dreamhost/wip-20966-jewel

jewel: rgw: radosgw-admin: fix bucket limit check argparse, div(0)

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #16951 from linuxbox2/jewel-aws4-plus

jewel: rgw: replace '+' with "%20" in canonical query string for s3 v4 auth

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

Merge pull request #16880 from linuxbox2/jewel-rgw-dir-suggest

jewel: rgw: Fix up to 1000 entries at a time in check_bad_index_multipart

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

Merge pull request #16720 from prallabh/wip-jewel-20821

jewel: rgw: Do not decrement stats cache when the cache values are zero

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

interval_set: optimize intersect_of for identical spans

Optimize comparisons for identical spans of intervals.
When this patch is combined with the previous map insert
optimization, a benchmark using 400000 identical
intervals shows a 7 times performance improvement in
comparison to without the patches.

Signed-off-by: Zac Medico <zmedico@gmail.com>
(cherry picked from commit b6a035666c2765f8895ee9991348dbc025613ed7)

interval_set: optimize intersect_of insert operations

Use the std::map insert method with hint iterator to optimize
inserts. This increases performance more than 3.5 times for
large numbers of intervals. This will help performance
especially in the PGPool::update method, where profiling data
has shown that intersection operations are a hot spot. The
following benchmark data is for 400000 intervals:

    4 +-+--+----+----+----+----+----+----+----+----+--+-+
P     +    +    +    +    +    +    +    +  *************
E     |                             ********            |
R 3.5 +-+                       ****                  +-+
F     |                   ******                        |
O     |                 **                              |
R   3 +-+           ****                              +-+
M     |          ***                                    |
A     |        **                                       |
N 2.5 +-+     *                                       +-+
C     |     **                                          |
E     |     *                                           |
    2 +-+ **                                          +-+
R     |  **                                             |
A     | **                                              |
T 1.5 +**                                             +-+
I     |**                                               |
O     +*   +    +    +    +    +    +    +    +    +    +
    1 +*+--+----+----+----+----+----+----+----+----+--+-+
      0   0.1  0.2  0.3  0.4  0.5  0.6  0.7  0.8  0.9

                        SET SIZE RATIO

The above chart was generated using benchmark results
from the following program:

#include <iostream>
#include <sys/timeb.h>
#include "include/interval_set.h"

int main(int argc, char *argv[])
{
  const int interval_count = std::stoi(argv[1]);
  const int interval_distance = 4;
  const int interval_size = 2;
  const int sample_count = 8;
  const int max_offset = interval_count * interval_distance;
  interval_set<int> a, b, intersection;

  for (int i = 0; i < max_offset; i+=interval_distance) {
    a.insert(i, interval_size);
  }

  for (int m = 1; m < 100; m++) {
    float ratio = 1 / float(m);

    for (int i = 0; i < max_offset; i+=interval_distance*m) {
      b.insert(i, interval_size);
    }

    struct timeb start, end;
    int ms = 0;
    for (int i = 0; i < sample_count; i++) {
      ftime(&start);
      intersection.intersection_of(a, b);
      ftime(&end);
      ms += (int) (1000.0 * (end.time - start.time)
        + (end.millitm - start.millitm));
      intersection.clear();
    }
    b.clear();

    std::cout << ratio << "\t" << ms << std::endl << std::flush;
  }
}

Signed-off-by: Zac Medico <zmedico@gmail.com>
(cherry picked from commit 32bc0430f70b057d1bba623252e92ab9f279028d)

Merge pull request #15966 from prallabh/jewel

jewel: rgw: Custom data header support

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

Merge pull request #16144 from smithfarm/wip-20364-jewel

jewel: mon: osd crush set crushmap need sanity check

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

osdc/Objecter: release message if it is not handled

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

Conflicts:
   src/osdc/Objecter.h (in master, ms_fast_dispatch function declaration has an
                       "override" specifier; in jewel, this specifier is missing)

crypto: allow PK11 module to load even if it's already initialized

there is chance that other pieces of application loads PK11 module
already and does not finalize it before calling common_init_finish().

also, upon fork, PK11 module resets its entire status including `nsc_init`,
by which PK11 module tell if it is initialized or not. so the behavior
of NSS_InitContext() could be different before and after fork. that's
another reason to ignore CKR_CRYPTOKI_ALREADY_INITIALIZED error (see
NSS_GetError()).

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

Merge pull request #17210 from dzafman/wip-20730-jewel

jewel: core: disable skewed utilization warning by default

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

Merge pull request #16405 from dzafman/wip-20041-jewel

jewel: osd: scrub_to specifies clone ver, but transaction include head write ver

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

Merge pull request #16169 from Vicente-Cheng/wip-20511-jewel

jewel: osd: ReplicatedPG: solve cache tier osd high memory consumption

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

Merge pull request #16167 from Vicente-Cheng/wip-20492-jewel

jewel: osd: omap threadpool heartbeat is only reset every 100 values

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

Merge pull request #16151 from Vicente-Cheng/wip-20349-jewel

jewel: cephfs: df reports negative disk "used" value when quota exceed

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16150 from Vicente-Cheng/wip-20403-jewel

jewel: mds: save  projected path into inode_t::stray_prior_path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #16141 from smithfarm/wip-20270-jewel

jewel: tests: LibRadosMiscConnectFailure.ConnectFailure hang

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

Merge pull request #16285 from smithfarm/wip-18137-jewel

jewel: rbd-mirror: image sync should send NOCACHE advise flag

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

Merge pull request #16295 from smithfarm/wip-20265-jewel

jewel: rbd: cli: ensure positional arguments exist before casting

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

Merge pull request #16276 from smithfarm/wip-19563-jewel

jewel: rgw: folders starting with _ underscore are not in bucket index

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

Merge pull request #16268 from cbodley/wip-16072-jewel

jewel: rgw: rgw_common.cc: modify the end check in RGWHTTPArgs::sys_get

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

Merge pull request #16266 from cbodley/wip-20408

jewel: rgw: multipart copy-part remove '/' for s3 java sdk request header

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #15988 from cbodley/wip-jewel-15983

jewel: rgw: fix infinite loop in rest api for log list

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

Merge pull request #15449 from smithfarm/wip-19720-jewel

jewel: rgw: rgw_file: fix size and (c|m)time unix attrs in write_finish

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #17351 from liewegas/wip-prune-past-intervals-jewel

osd: add osd_hack_prune_past_intervals

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

librbd: prevent self-blacklisting during break lock

(derived from commit 5c590acaec4dd66a9a8c3aa0ec8ab904dd350216)

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

mon: osd crush set crushmap need sanity check

The sanity check verifying the new crushmap does not remove crush rules
that are in use is not exclusive to ceph setcrushmap.

Fixes: http://tracker.ceph.com/issues/19302
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit ed760457bf154c10adf75c6df046eecab7eb8e4b)

 crush: when take place the crush map should consider the rule is in used

Signed-off-by: song baisen song.baisen@zte.com.cn
(cherry picked from commit 09bf6f2858d09c8c314a8c242a9c70d2834718dc)

librbd: fix missing write block validation in IO work queue

(derived from commit 8e76ebd93fd7525f6909a7da178e9b92c98e1ebe)

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

qa/suites/rbd: test dynamic features with cache disabled

The journaling logic follows different paths depending on the
cache configuration.

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