Merge pull request #17415 from wangshuguangbj/bug_mon_mdsmonitor_assert

mon/MDSMonitor: fix a bug at preprocess_beacon

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

Merge pull request #17454 from xiexingguo/wip-vs

src/vstart.sh: default os to filestore for FreeBSD

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

Merge pull request #17522 from liupan1111/wip-fix-disk-error

os/bluestore: report error and quit correctly when disk error happens.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>

Merge pull request #17525 from jcsp/wip-21249

mon: fix `osd out` clog message

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

Merge pull request #17581 from liewegas/wip-migration-fixups

doc/rados/operations/bluestore-migration: typos

doc/rados/operations/bluestore-migration: typos

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

Merge pull request #17322 from liewegas/wip-post-luminous-mon

mon: remove pre-luminous compat cruft (2 of many)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

Merge pull request #17578 from liewegas/wip-integration

script/build-integration-branch: check errors

Merge pull request #17577 from ktdreyer/gitignore-debian-patches

.gitignore: allow debian .patch files

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

script/build-integration-branch: check errors

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

.gitignore: allow debian .patch files

The Ubuntu packaging layout with git-buildpackage assumes a
"debian/patches/" directory with several .patch files in it.

When upstream's .gitignore tells Git to ignore .patch files, we have to
edit that line out downstream. When we forget to do that downstream, it
can lead to missing patches and broken downstream builds.

Allow patches in the /debian/patches directory so it's easier to
maintain an Ubuntu package based on upstream's Git repo.

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

Merge pull request #17548 from yangdongsheng/mailmap

mailmap, organizationmap: add Dongsheng, Liuzhong, Pengcheng, Yang Affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

organization: add Liuzhong Chen, Pengcheng Zhang, Yang Wang

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

mailmap: add Dongsheng Yang, Liuzhong Chen, Pengcheng Zhang, Yang Wang

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

Merge pull request #17540 from heyingstar/wip-update-organization

.mailmap, .organizationmap: add Fufei, Mingqiao and Ying Affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

add Ying He,Mingqiao Wu,Fufei Shang to mailmap and organizationmap

Signed-off-by: Ying He <heyingbj@inspur.com>

qa/workunits/*: require-osd-release mimic, not luminous

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

Merge pull request #16998 from trociny/wip-20860

rbd-mirror: update asok hook name on image rename

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

Merge pull request #17300 from Songweibin/wip-mirror-peer-set

librbd: should not set self as remote peer

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

Merge pull request #17218 from PCzhangPC/benchrw

rbd: use different logic to disturb thread's offset in bench seq test

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

Merge pull request #17187 from trociny/wip-mock-valgrind

test/librbd: fix valgrind memory leak warning

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

Merge pull request #16597 from PCzhangPC/fix6

rbd: snap limit should't be set smaller than the number of  existing snaps

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #17018 from alex-mikheev/wip_rdma_rxpool_2

msg/async/rdma: refactor rx buffer pool allocator

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #17504 from dillaman/wip-21251

qa/suites/rbd: miscellaneous test fixes

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

Merge pull request #17532 from dillaman/wip-21179

rbd: support iterating over metadata items when listing

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

Merge pull request #17509 from dillaman/wip-21217

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

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

Merge pull request #17499 from dillaman/wip-21247

cls/rbd: metadata_list not honoring max_return parameter

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge PR #17340 into master

* refs/remotes/upstream/pull/17340/head:
mds: void sending cap import message when inode is frozen
client: fix message order check in handle_cap_export()

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

Merge PR #16778 into master

* refs/remotes/upstream/pull/16778/head:
mds: fix return value of MDCache::dump_cache
mds: new cap message flags indicate if there is pending capsnap
mds: properly do null snapflush part2
mds: track snap inodes through sorted map
mds: properly drop wrlock when finishing snapflush

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

Merge PR #17291 into master

* refs/remotes/upstream/pull/17291/head:
mds: fix 'dirfrag end' check in Server::handle_client_readdir

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>

Merge PR #17289 into master

* refs/remotes/upstream/pull/17289/head:
osd, mds, tools: drop the invalid comment and some unused variables

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

Merge PR #17219 into master

* refs/remotes/upstream/pull/17219/head:
mds: fix StrayManager::truncate()

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

Merge pull request #17505 from liewegas/wip-20910

qa/objectstore/bluestore*: less debug output

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

Merge pull request #17459 from xiexingguo/wip-bs-tracked-key

os/bluestore: add bluestore_prefer_deferred_size_hdd/ssd to tracked keys

Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #17463 from tchaikov/wip-ceph-tell-mds-star

ceph: fixes for "tell <service>.*" command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Chang Liu <liuchang0812@gmail.com>

Merge pull request #17503 from liewegas/wip-21250

os/bluestore/BlueFS: prevent _compact_log_async reentry

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@gmail.com>

cls/rbd: metadata_list not honoring max_return parameter

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

rbd: support iterating over metadata items when listing

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

Merge pull request #17510 from liewegas/wip-crush-fix-rule-lookup

crush: fix fast rule lookup when uniform

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

mon: fix `osd out` clog message

This was printing the absolute time instead of the period.

Fixes: http://tracker.ceph.com/issues/21249
Signed-off-by: John Spray <john.spray@redhat.com>

Merge pull request #17356 from shashalu/bucket_link/unlink_olh

rgw: don't write bucket_header when it is not changed in bucket_link/unlink

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

Merge pull request #17434 from iliul/remove-useless-output

rgw: Remove the useless output when list zones

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

Merge pull request #17518 from wjwithagen/wjw-githubmap

.githubmap: Add wjwithagen as a known Ceph reviewer

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

os/bluestore: report error and quit correctly when disk error happens.

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>

qa/standalone/mon/misc.sh: fix mon feature test

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

mon: s/mon_debug_no_require_luminous/mon_debug_no_require_mimic/

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

qa/workunits/cephtool/test.sh: drop 'pg set_full_ratio'

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

doc/man/8/ceph.rst: remove pg set_*full_ratio

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

test/osd/CMakeLists: fix test name

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

doc/man/8/ceph: remove old 'ceph pg ' force_create_pg, set_[near]full_ratio

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

ceph-object-corpus: PGMap encoding change

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

mon: do not join quorum unless luminous upgrade has completed

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

mon/OSDMonitor: encode without MIMIC if require_osd_release < mimic

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

mon: remove mon_osd_allow_primary_{temp,affinity}

These are covered by require_osd_release in the OSDMap.

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

mon/Elector: drop pre-luminous elector compat

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

mon/PGMap: remove old PGMapUpdater methods

These were used by PGMonitor.

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

osd/OSDMap: remove unused static

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

mon/PGMap: remove legacy encode/decode methods

These were used by PGMonitor when stored in per-pg and per-osd k/v
pairs.

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

mon/PGMap: streamline encoding

The only user left is 'pg getmap' and ceph-dencoder; we can drop
the compat cruft.

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

mon/PGMap: remove unused functions

These are left over from health cleanup

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

mon/PGMap: remove Incremental encode/decode

Unused!

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

mon/PGMap: remove osd_epochs

This was used for the min_last_epoch_clean tracking; we don't need
it now.

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

mon/PGMap: remove min_last_epoch_clean

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

osd/OSDMap: remove get_full_osd_util

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

mon/PGMap: remove full osd tracking

Also drop compat PGMap encoding since we are >= luminous and this is
local to the mgr anyway.

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

mon: remove PGStatService

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

mon: drop pgservice member

Just use mgrstatmon() directly.

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

mon: make MgrStatMonitor implement PGStatService directly

Avoid the intermediate glue class, simplify.

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

mon/PGStatService: prune interface

Remove now unused methods

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

mon/OSDMonitor: drop pre-luminous PGStatService users

These are no longer relevant now that we are >= luminous.

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

mon: drop PGMapStatService

There is only one user and one implementation; this just makes the
code hard to read.

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

mon/OSDMonitor: drop legacy 'osd df'

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

mon: add MIMIC mon feature

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

mon: drop hide_mgr_flag behavior

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

mon: collapse MonPGStatService into PGStatService

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

mon: remove some upgrade-specific bits of PGStatService

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

mon: remove PGMonitor

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

mon: remove OldHealthMonitor

The only service this provided was mon space notifications, which
are now handled explicitly by the new HealthMonitor's
check_member_health(), and communited by the new MMonHealthChecks.

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

mon: remove legacy get_health infrastructure

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

mon: CEPH_MON_FEATURE_INCOMPAT_MIMIC

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

mon: require SERVER_LUMINOUS from mons, osds

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

mds: fix return value of MDCache::dump_cache

previous commit "mds: track snap inodes through sorted map" makes
MDCache::dump_cache return 1 on success.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

.githubmap: Add myself

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

os/filestore: use __func__ instead of hardcode function name

Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>

Merge pull request #16145 from yehudasa/wip-20234

rgw: add tail tag to track tail instance
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #17502 from dillaman/wip-21248

librbd: rename of non-existent image results in seg fault

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

Merge pull request #17375 from liupan1111/wip-final-fix-nbd

rbd-nbd: fix generic option issue

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

Merge pull request #17507 from batrick/githubmap-update

githubmap: add some known Ceph reviewers

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

Merge PR #17319 into master

* refs/remotes/upstream/pull/17319/head:
qa: whitelist expected rstat warning
qa: sync whitelist with fs/basic_functional
qa: whitelist expected MDS_CACHE_OVERSIZED

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

Merge PR #17301 into master

* refs/remotes/upstream/pull/17301/head:
mds: fix "1 filesystem is have a..." message

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

Merge PR #17263 into master

* refs/remotes/upstream/pull/17263/head:
mds: remove unused method
mds: move EMetaBlob cons to header

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

Merge PR #17178 into master

* refs/remotes/upstream/pull/17178/head:
ceph-dencoder: simplify decoding/encoding cephfs inode

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

Merge PR #17095 into master

* refs/remotes/upstream/pull/17095/head:
client: reset unmounting flag to false when starting a new mount
client: add mountedness check inside client_lock
client: rework Client::get_local_osd() return codes
client: remove misleading comment in get_cap_ref

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

Merge PR #16562 into master

* refs/remotes/upstream/pull/16562/head:
cephfs/fuse: set big_writes default is false

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

Merge PR #16305 into master

* refs/remotes/upstream/pull/16305/head:
qa/cephfs: test CephFS recovery pools
qa/cephfs: support CephFS recovery pools
qa/ceph_test_case: support CephFS recovery pools
qa/cephfs: Allow deferred fs creation
qa/cephfs: Refactor alternate pool test

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

githubmap: add some known GitHub reviewers

Selection from [1] where the GitHub username is available.

[1] http://pad.ceph.com/p/reviewers

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

Merge pull request #17447 from tchaikov/wip-freebsd-coredump

test/coredumpctl: support freebsd

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

crush: fix fast rule lookup when uniform

Older clients will search for the first rule with a matching ruleset,
type, and size.  The has_uniform_rules bool is only set if we have rule
ids and rulesets that line up, but we must also verify that the rest of the
mask matches or else we can get a different CRUSH mapping result because
the mask might not match and old clients will fail to find a rule and we
will find one.  We also can't just check the ruleset as the legacy clients
find the *first* (of potentially many) matching rules; hence we only do
the fast check if all rulesets == rule id.

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>

qa/objectstore/bluestore*: less debug output

Let's see if this makes the spurious MON_DOWN failures go away?  (See
http://tracker.ceph.com/issues/20910)

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