Merge PR #19766 into master

* refs/pull/19766/head:
mds: fix typo

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

Merge pull request #19756 from shinobu-x/objecter_unique_lock

osdc: Do not use lock_guard as unique_lock

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

Revert "Merge PR #19369 into master"

This reverts commit 3189ba19a779e4a54265aa831a57d686a7911187, reversing
changes made to b7620de0200bdbac6a1a7abbdfbafd8b43d7bf47.

Despite the change in json format being positive, the unfortunate side-effect
is that it broke upgrade testing (because the QA framework must handle the
transition of mdsmap["info"] to a list from object) and the ceph-mgr.

Fixes: http://tracker.ceph.com/issues/22527
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #19763 from tchaikov/wip-cmake

cmake: pass static linkflags to the linker who links libcommon

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

Merge pull request #19780 from tchaikov/wip-22266

tools/ceph_monstore_tool: include mgrmap in initial paxos epoch

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

tools/ceph_monstore_tool: include mgrmap in initial paxos epoch

before this change, the "mgr" map is not included paxos, thus why the
peon mon fails to have the mgr map after it is sync'ed with its leader.
and hence there is chance that ceph-mgr is unable to get a mgr map from
the monitor it is connected to.

Fixes: http://tracker.ceph.com/issues/22266
Signed-off-by: Kefu Chai <kchai@redhat.com>

cmake: pass static linkflags to the linker who links libcommon

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

mds: fix typo

Signed-off-by: dongdong tao <tdd21151186@gmail.com>

Merge pull request #19768 from cbodley/wip-rgw-cache-dedeque

rgw: change ObjectCache::lru from deque back to list

rgw: add invalidate_lru() call back to ObjectCache::put()

the removal of this line was causing s3test failures independently of
the change from list-deque

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

rgw: change ObjectCache::lru from deque back to list

ObjectCacheEntry stores an lru_iter into this lru, and depends on that
iterator remaining valid as other entries are inserted/erased

Fixes: http://tracker.ceph.com/issues/22560
Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge tag 'v13.0.1'

v13.0.1

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

Merge pull request #19724 from dillaman/wip-18480

rbd: support cloning an image from a non-primary snapshot

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

Merge pull request #19750 from badone/wip-dump_loads-formatter-null-check

mds: Remove redundant null pointer check

osdc: Do not use lock_guard as unique_lock

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

Merge pull request #19752 from Liuchang0812/cleanup-dev-doc

doc: fix CFLAGS in doc/dev/cpu-profiler.rst

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

doc: fix CFLAGS in doc/dev/cpu-profiler.rst

Signed-off-by: Chang Liu <liuchang0812@gmail.com>

mds: Remove redundant null pointer check

Resolves Coverity CID 1426746

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #19666 from trociny/wip-nbd-unmap-by-image

rbd-nbd: allow to unmap by image or snap spec

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

Merge pull request #19745 from ceph/wip-use-installer0-master2

qa/tests - Added options to use both cases: mon.a and installer.0

qa/tests - Added options to use both cases: mon.a and installer.0

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

Merge pull request #19512 from Liuchang0812/wip-dashboard-rgw

mgr/dashboard: RGW page

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

Merge pull request #19645 from tchaikov/wip-install-deps

install-deps: use DTS-7 on aarch64 and only download mirrored package indexes

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

Merge pull request #19375 from qrGitHub/wip-rgw-redundant-parenthesis

rgw: remove redundant parenthesis in logs

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

Merge pull request #19650 from yaozongyou/fix-erasure-code-memory-leak

erasure-code: use jerasure_free_schedule to properly free a schedule

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

Merge pull request #19649 from yaozongyou/fix-dns-resolve-memory-leak

common/dns_resolve: fix memory leak

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

Merge pull request #19659 from Songweibin/wip-doc-rbd

 doc/rbd: add missing several commands in rbd CLI man page

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

Merge pull request #19634 from jcsp/wip-22514

qa: configure zabbix properly before selftest

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

Merge pull request #19599 from yaozongyou/config-cleanup

common/config: cleanup remove some unused macros

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

Merge pull request #19581 from adamemerson/wip-cache-on-the-barrelhead

Cache on the barrelhead

Merge pull request #19546 from ZVampirEM77/wip-em-pg-cleanup3

osd/PG: some cleanups && add should_gather filter for loop logging

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

Merge pull request #19524 from fungusakafungus/fix-22313

pybind/mgr/prometheus: fix metric type undef -> untyped

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

Merge pull request #19519 from ifed01/wip-ifed-fix-col-split

os/bluestore: fix potential assert when splitting collection.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #19452 from wido/mgr-zabbix-runtimerror

mgr/Zabbix: Various fixes to Zabbix module

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

Merge pull request #19735 from shinobu-x/osd_oprequest_xlist

osd: Remove unnecessary headers

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #19738 from lixiaoy1/minor_fix

msg/async: use device before checking

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

test/rbd: new unit test cases for clone request state machine

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

librbd: permit creation of clones against non-primary images

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

librbd: switching to pool mode shouldn't affect existing mirrored images

Previously, non-primary images within a pool would prevent the switch from
image-mode to pool-mode mirroring.

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

msg/async: use device before checking

Signed-off-by: Xiaoyan Li <xiaoyan.li@intel.com>

Merge pull request #19737 from tchaikov/wip-dedup-rgw-admin-opt

doc: remove duplicated --max-buckets option desc

Reviewed-by: Jos Collin <jcollin@redhat.com>

doc: remove duplicated --max-buckets option desc

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

osd: Remove unnecessary headers

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

install-deps.sh: check if have access to stdout

$- is "hB" if launched via command line, and it is "himBH" only when
we are actually *in* an interactive shell. so checking "test -t 1" is
what we want.

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

ceph.spec.in: use DTS-7 on aarch64 also

see https://bugs.centos.org/view.php?id=14078

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

install-deps: bump DTS version on aarch64 to 7

see https://bugs.centos.org/view.php?id=14078

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

install-deps.sh: only download mirrored package index

E: Failed to fetch http://mirror.cs.uchicago.edu/ubuntu-toolchain-r/dists/xenial/main/binary-i386/Packages  404  Not Found
E: Failed to fetch http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r/dists/xenial/main/i18n/Translation-en  404  Not Found [IP: 213.180.204.183 80]
E: Some index files failed to download. They have been ignored, or old ones used instead.

On Ubuntu amd64 installations, i386 is enabled as an additional
architecture by default. apt & co. expect repositories to provide all
configured architectures, which causes the error above.

Signed-off-by: Songbo Wang <wangsongbo@cloudin.cn>

install-deps.sh: do not download i18n apt index

and do not fail the `apt-get update` command, if any mirror is not
reachable.

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

Merge pull request #19010 from shinobu-x/src_cls_func

cls_acl/_crypto: Add modeline

Merge pull request #15855 from linuxbox2/wip-nfs-docsync

RGW NFS:  mount cmdline example missing -osync

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

Merge pull request #16932 from amitkumar50/cov-cls-rgw-1

cls/rgw: Initialization of uninitialized members

Merge pull request #17089 from amitkumar50/test-cov-journal-1

test/journal: Initialize member variable m_work_queue

Merge pull request #17090 from amitkumar50/test-cov-messages-8

messages: Initializing variable ceph_mds_reply_head

Merge pull request #17367 from amitkumar50/cov-rgw-5

rgw: unreachable return in RGWRados::trim_bi_log_entries

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

Merge pull request #17369 from amitkumar50/cov-test-5

test: Initialization of *comp_racing_read class CopyFromOp

Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #17439 from ClemPi/wip-doc-radosgw-admin-max-buckets

doc: add --max-buckets to radosgw-admin(8)

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

Merge branch 'master' into wip-doc-radosgw-admin-max-buckets

Merge pull request #17535 from emmericp/mon-session-show-client-features

mon: show feature flags when printing MonSession

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #17563 from amitkumar50/cov-rbd-5

rbd: Initializing m_finalize_ctx

Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #18886 from BlaineEXE/update-kube-helm-start-doc

doc: Add newbie-friendly updates to Helm start doc

Reviewed-by: Alex Marangone <amarango@redhat.com>

Merge pull request #19028 from shinobu-x/src_mon_monmapmonitor

mon: Drop redundant access specifier, etc (cleanup)

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge branch 'master' into src_mon_monmapmonitor

Merge pull request #19049 from shinobu-x/primarylogpg_warning

osd/PrimaryLogPG: derr when object size becomes over osd_max_object_size

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

Merge pull request #19268 from shinobu-x/vstart_picking_up_random_port

vstart.sh: drop .ceph_port and use randomly selected available port

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

Merge pull request #19605 from ceph/wip-use-installer0-master

qa/tests: run ceph-ansible task on installer.0 role/node

Merge pull request #19643 from shinobu-x/address_helper_a

common: cleanup address_helper

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

Merge pull request #19671 from joscollin/wip-rgw-commented-functions

rgw: drop commented functions

Merge pull request #19679 from trociny/wip-ggate-list-unmap

rbd-ggate: small fixes and improvements

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #19689 from chnmagnus/wip-bug-on-config-metavariables

rgw: the metavariables in frontends-related config won't be expanded

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

Merge pull request #19692 from hikycool/master

doc: Add introduction about different way to run rbd-mirror

Merge pull request #19701 from joscollin/wip-tracker-22542

doc: update Blacklisting and OSD epoch barrier

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

Merge pull request #19713 from Leeshine/wip-rgw-typo

rgw: fix typo in GetOmapKeysCR

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

rgw: fix typo in GetOmapKeysCR

Signed-off-by: lvshanchun <lvshanchun@gmail.com>

Merge pull request #19709 from luomuyao/dev

rgw: drop unused iter in XMLObj::find_first

Reviewed-by: Jos Collin <jcollin@redhat.com>

rgw: drop unused variable iter in XMLObj::find_first

Signed-off-by: luomuyao <luo.muyao@zte.com.cn>

doc: fix grammar mistake

Fixed grammar mistake in a sentence.

Signed-off-by: Jos Collin <jcollin@redhat.com>

doc: update Blacklisting and OSD epoch barrier

Updated missing OSD epoch barrier section, which is referenced by http://docs.ceph.com/docs/master/cephfs/full/#hammer-and-later.

Fixes: http://tracker.ceph.com/issues/22542
Signed-off-by: Jos Collin <jcollin@redhat.com>

rbd-ggate: allow to unmap by image or snap spec

(to match the behaviour of krbd unmap)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

rbd-ggate: extended info when listing devices

This matches nbd and krbd drivers output.

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

Merge pull request #19691 from MrStupnikov/fix_logic

doc: Improved hitset parameters description

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

doc: Improve parameters description in cache_tiering article

hit_set parameters aren't described in a sequence they introduced.
This patch effecrively changes the sequence to improve
description's logic.

Signed-off-by: Alexey Stupnikov <aleksey.stupnikov@gmail.com>

Merge pull request #19690 from Songweibin/wip-doc-librbdpy

doc/rbd: correct the path of librbd python APIs

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

doc: correct the path of librbd python APIs

* update the API Documentation page for librbdpy with the
  correct path.
* fix a typo.

Signed-off-by: songweibin <song.weibin@zte.com.cn>

[DOC]Add introduction about different way to run rbd-mirror

Add a way to run rbd-mirror process in foregroup.
This way is useful to run rbd-mirror in a container when you don't
want to build a specified rbd-mirror image

Signed-off-by: Yu Shengzuo <yu.shengzuo@99cloud.net>

rgw: the metavariables in frontends-related config won't be expanded

When using metavariables in frontends-related config, I found that metavariables won't be expanded. Such as:
the `name` variable won't be expanded.
```
[client.rgw]
rgw frontends = civetweb port=8000 access_log_file=/path/$name.access.log
```
The reason is as follows:

In `rgw_main.cc/main()` function, program uses frontends-related config before the `expand_all_meta` function call that is called in the `global_init` function.

Signed-off-by: chnmagnus chnmagnus@qq.com

Merge pull request #19255 from JianyuLi/joa-mdbalancer

MDS: make rebalancer evaluate the overload state of each mds with the same criterion

Merge pull request #19591 from qrGitHub/wip-rgw-unused-variable3

rgw: drop marker in RGWLC::process()

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>

Merge pull request #19675 from qrGitHub/wip-rgw-typo-complete

rgw: fix typo compete to complete

Reviewed-by: Jos Collin <jcollin@redhat.com>

rgw: fix typo compete to completes

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>

rbd-ggate: output error on map failure

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

rbd-nbd: allow to unmap by image or snap spec

(to match the behaviour of krbd unmap)

Signed-off-by: Mykola Golub <mgolub@suse.com>

qa/workunits/rbd: bench-write is part of exclusive option test

Signed-off-by: Mykola Golub <mgolub@suse.com>

rbd-ggate: honor rbd_default_pool config setting

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

rgw: drop commented functions

Dropped commented functions.

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #19583 from qrGitHub/wip-rgw-unused-variable

rgw: drop iter in rgw_op.cc

Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #19667 from trociny/wip-affiliation

mailmap: update affiliation for Mykola Golub

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

rgw: remove unused variable iter in file rgw_op.cc

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>

Merge pull request #19618 from dillaman/wip-18435

librbd: filter out potential race with image rename

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

mailmap: update affiliation for Mykola Golub

Signed-off-by: Mykola Golub <mgolub@suse.com>