common: change the type of counter total/unhealthy_workers

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>

Merge remote-tracking branch 'upstream/jewel'

Merge pull request #7222 from dack/master

ceph-disk: add -f flag for btrfs mkfs

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

Merge branch 'greg-fs-testing'

fsx: checkout old version until it compiles properly on miras

I sent a patch to xfstests upstream at
http://article.gmane.org/gmane.comp.file-systems.fstests/1665, but
until that's fixed we need a version that works in our test lab.

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

Merge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6463

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

Merge branch 'wip-13127-master' into greg-fs-testing

https://github.com/ceph/ceph/pull/5990

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

Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing

https://github.com/ceph/ceph/pull/5658

Reviewed-by: John Spray <jspray@redhat.com>
Conflicts:
src/common/config_opts.h

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

Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/6179

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

doc/release-notes: v10.0.2

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

Merge pull request #7235 from theanalyst/fix/pybind-build-failure

pybind: fix build failure, remove extraneous semicolon in method

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

pybind/rbd.pyx: drop stray semicolon

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

pybind: remove extraneous semicolon in method

A semicolon on `rbd_build_object_map` method was causing build failures
in current master

Fixes: #14371
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

osd: less chatter about tick

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

Merge pull request #7212 from caibo2014/fix-cephin-pipe-error

ceph.in: avoid a broken pipe error when use ceph command

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

ceph.in:avoid a broken pipe error when use ceph command

Fixes: #14354
Signed-off-by: Bo Cai <cai.bo@h3c.com>

Merge pull request #7210 from swamireddy/contrib_list_10

mailmap update

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

Merge pull request #7227 from dwj192/dwj-paxos

mon: paxos is_recovering calc error

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7216 from jcsp/wip-14357

mds: advance clientreplay when replying

Merge pull request #7219 from aiicore/affiliation

mailmap: Igor Podoski affiliation

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

mon: paxos is_recovering calc error

Fix:#14368

Signed-off-by: Weijun Duan <duanweijun@h3c.com>

Merge pull request #7224 from dillaman/wip-13818

tests: snap rename and rebuild object map in client update test

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

Merge pull request #7220 from dillaman/wip-13810-jewel

tests: notification slave needs to wait for master

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

Merge pull request #7208 from dillaman/wip-14163-jewel

helgrind: fix real (and imaginary) race conditions

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

tests: snap rename and rebuild object map in client update test

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

pybind/rbd.pyx: add rebuild_object_map method

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

Merge pull request #7215 from trociny/wip-rbd-nbd-fixes

rbd-nbd: fix up return code handling

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

add -f flag for btrfs mkfs

tests: notification slave needs to wait for master

If the slave instance starts before the master, race
conditions are possible.

Fixes: #13810
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

librbd: log write/discard errors from clip operation

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

mailmap: Igor Podoski affiliation

Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>

10.0.2

Merge pull request #7174 from xiexingguo/xxg-wip-14332

librbd: fix potential memory leak

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

Merge pull request #7165 from xiexingguo/xxg-wip-14316

cls_rbd: add guards for error cases

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

osdc: hold rwlock when updating crush location config

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

msg/simple: destroy spinlock in destructor

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

osdc: hold writer lock when updating session ops

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

librados: hold lock while testing state variable

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

config: avoid re-entrant locking on observer callback

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

WorkQueue: delay registering PointerWQ with thread pool

Derived classes should be responsible for registration to avoid
accessing a partially constructed object.

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

helgrind: suppress race conditions in external libraries

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

helgrind: annotate false-positive race conditions

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

deb,rpm: add valgrind to build dependencies

Provides necessary support for annotating helgrind
false-positives.

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

mailmap:  Jacek J. Łakis affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

Merge pull request #7069 from wonzhq/recovery-cache-hint

osd: add cache hint when pushing raw clone during recovery

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

Merge pull request #7117 from efirs/ef_light_pg_get_put

osd: avoid debug std::string initialization in PG::get/put

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

Merge pull request #7139 from tchaikov/wip-check-for-overlapped-rule

crush/CrushTester: check for overlapped rules

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

Merge pull request #7156 from xiexingguo/xxg-wip-14299

librados: fix several flaws introduced by the enumeration_objects API

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

mailmap: Drunkard Zhang affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Anthony Alba affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Dunrong Huang affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Jeremy Qian affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Shang Ding affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Chuanhong Wang affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mds: advance clientreplay when replying

...not just at the end of _dispatch.  Often we reply
to clients (i.e. complete a request) outside of
_dispatch, and currently in these cases we fail
to check for clientreplay completion (only hitting
that next time someone talks to _dispatch)

Fixes: #14357
Signed-off-by: John Spray <john.spray@redhat.com>

mailmap:  Marc Koderer affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Kongming Wu name normalization

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Zhang Huan affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Wei Feng affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

tests: improve rbd-nbd tests

- cleanup on a test failure;
- minimize interference with other processes (tests) that are
  run concurrently;
- use xmlstarlet when parsing rbd output;
- add exit status test.

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

rbd-nbd: correctly set exit status if map command failed

- parent_wait() returns child exit status so test for "!= 0";
- do_map() is expected to return a negative value on failure.

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

rbd-nbd: returned length equal requested only for read and write

On success aio_discard returns 0.

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

mailmap: Lenz Grimmer affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Igor Fedotov affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Igor Podoski affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Cilang Zhao affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

Merge pull request #7204 from dillaman/wip-14308-jewel

librbd: better handling of exclusive lock transition period

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

client: add scattered write callback to ObjecterWriteback

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Update for ceph::real_time
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

objectcacher: coalesce dirty buffers in one object into one IO

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Update for ceph::real_time
Signed-off-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #6505 from aiicore/reduce_strings

osd: reduce string use in coll_t::calc_str()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Evgeniy Firsov <evgeniy.firsov@sandisk.com>

Merge pull request #7054 from songbaisen/master

osd: optimize the session_handle_reset function

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

Merge pull request #7055 from xiexingguo/xxg-wip-14185

osd: several small cleanups

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

Merge pull request #7085 from tchaikov/wip-11692

config: complains when a setting is not tracked

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

Merge pull request #7097 from tchaikov/bloat-leveldb-new

tools: ceph_monstore_tool: add inflate-pgmap command

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

Merge pull request #7109 from Aran85/wip-mon-laggy-interval

mon/OSDMonitor: osdmap laggy set a maximum limit for interval

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

Merge pull request #7151 from ceph/wip-14256

osdc: Fix race condition with tick_event and shutdown

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

Merge pull request #7157 from songbaisen/song3

crush: clean up whitespace removal

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

mailmap: Hector Martin affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Tao Chang affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Florent Manens affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

mailmap: Evgeniy Firsov affiliation

Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>

Merge pull request #7205 from ceph/wip-python-dev-dep

packaging: add build dependency on python devel package

Reviewed-by: Alfredo Deza <adeza@redhat.com>

packaging: add build dependency on python devel package

This is required for building python modules with cython, but for some
reason is not a direct dependency (on debian only a recommends) for
the cython package itself.

Refs: #14059
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6944 from linuxbox2/wip-civetwarn

rgw: warn on suspicious civetweb frontend parameters

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

librbd: add additional granularity to lock states

Allow all pre-release actions to see that the exclusive lock is
still owned and all post-acquire actions to see that the exclusive
lock is now owned.

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

librbd: initialize object map before replaying journal

The journal might replay write events which will need to update the
object map.

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

librbd: do not accept RPC requests while transitioning lock state

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

librbd: avoid error message when peer owns exclusive lock

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

java/test: update for libcephfs permission check

libcephfs permission check does not allow some operations for
non-root userm, disable the permission check for mount tests.

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

cmake: include access tests in test_libcephfs

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

client: allow user with WRITE perm to set atime/mtime to current time

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

Merge pull request #6332 from dx9/wip-12406-test_librdb_fsx

test/librbd/fsx: Use c++11 std::mt19937 generator instead of random_r()

Improve portability - random_r() is GNU-specific.

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

client: reduce _getattr() calls during permission check

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

test_libcephfs: update test cases for libcephfs permission check

libcephfs permission check does not allow some operations for
non-root user. so we temporarily disable the permission check
for some tests.

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

client: add permission check for libcephfs

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

client: apply umask for new files when posix acl is enabled

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

client: permission check for harklink

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

client: permission check for setxattr/removexattr

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

client: permission check for lookup

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

client: permission check for setattr

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