os/ObjectStore: fix _update_op for split dest_cid

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

Merge remote-tracking branch 'gh/jewel'

Merge pull request #8320 from dachary/wip-virtualenv-jewel

Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 2)

Reviewed-by: Dan Mick <dmick@redhat.com>

Merge pull request #8360 from jdurgin/wip-ceph-python-path

ceph.in: correct dev python path for automake builds

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

Merge pull request #8361 from liewegas/wip-test-port

test/test_pool_create.sh: fix port

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

Merge remote-tracking branch 'origin/jewel'

Merge pull request #8356 from ceph/wip-cython-build-dir

pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR

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

test/test_pool_create.sh: fix port

17108 is used by test/mon/test_pool_quota.sh

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

Merge pull request #8359 from athanatos/wip-15205

os/ObjectStore: try_move_rename in transaction append and add coverage to store_test

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

ceph.in: correct dev python path for automake builds

Accidentally broken by ad2e6f442df0fe302c09fc751fc9e12237789511

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

store_test: apply an appended transaction half the time

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

Transaction: handle OP_TRY_RENAME in dump

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

store_test: add a TryMoveRename test

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

ObjectStore::Transaction::_update_op: handle OP_TRY_RENAME

Fixes: http://tracker.ceph.com/issues/15205
Signed-off-by: Samuel Just <sjust@redhat.com>

Merge pull request #6317 from cxwshawn/wip-lost-fix

PG: pg down state blocked by osd.x, lost osd.x cannot solve peering stuck

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

Merge pull request #8292 from vshankar/bluefs-tool-fix

os/bluestore: ceph-bluefs-tool fixes

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

Merge pull request #8334 from dachary/wip-subman-facts

script: subscription-manager support (part 3)

Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #8351 from jcsp/wip-cmake-cython

cmake: Build cython modules and change paths to bin/, lib/
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

script: subscription-manager support (part 3)

Renaming subman.py in subman is cute but does not prevent the generation
of the py[co].

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

Merge pull request #8215 from dzafman/wip-14438

Wip 14438

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

Merge pull request #8261 from rjfd/wip-15217

rbd-mirror: enabling/disabling pool mirroring should update the mirroring directory

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

ceph.in: update for cmake path changes

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

vstart: update for cmake build path changes

Cribbed this from Ali's wip-cmake-make-check branch.

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

cmake: Cython modules building with cmake

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #8228 from SUSE/wip-15218

doc/dev: add "Deploy a cluster for manual testing" section

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

Merge pull request #8256 from dachary/wip-mailmap

mailmap updates

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

mailmap: Adam C. Emerson name normalization

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

mailmap: Jenkins name normalization

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

mailmap: Yan Jun affiliation

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

mailmap: Zhao Junwang affiliation

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

mailmap: Sarthak Munshi affiliation

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

mailmap: Rust Shen affiliation

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

mailmap: Eric Cook affiliation

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

mailmap: Ricardo Dias affiliation

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

mailmap: Karol Mroz affiliation

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

mailmap: James Liu affiliation

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

mailmap: Robert LeBlanc name normalization

Reviewed-by: Robert LeBlanc <robert.leblanc@endurance.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

mailmap: Yankun Li name normalization

Reviewed-by: Yankun Li <liyankun@unitedstack.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

mailmap: Josh Durgin name normalization

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Loic Dachary <loic@dachary.org>

rbd: rbd-mirroring: Added unit tests to test enable/disable image mirroring when pool-level mirroring changes

Signed-off-by: Ricardo Dias <rdias@suse.com>

rbd: rbd-mirroring: Disable image mirroring when pool-level mirroring is disabled

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15217

rbd: rbd-mirroring: Enable image mirroring when pool-level mirroring is enabled

Signed-off-by: Ricardo Dias <rdias@suse.com>

Merge pull request #8345 from tchaikov/wip-release-notes-indents

doc/release-notes: fix indents

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

Merge pull request #8342 from xiexingguo/xxg-wip-doc

doc: fix typo, duplicated content etc. for Jewel release notes

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

doc/release-notes: fix indents

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

doc: fix typo, duplicated content etc. for Jewel release notes

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

pybind/Makefile.am: Prevent race creating CYTHON_BUILD_DIR

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

Signed-off-by: Dan Mick <dan.mick@redhat.com>

Merge pull request #8321 from linuxbox2/jewel-nfs-fixes-2

rgw_file: set owner uid, gid, and Unix mode on new objects

Merge pull request #8106 from linuxbox2/wip-cmake-ssl

cmake: add FindOpenSSL.cmake

Merge pull request #8312 from SUSE/wip-submittingpatches

doc: amend Fixes instructions in SubmittingPatches

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

rgw_file tests: allow override of owner_uid and owner_gid

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

Merge pull request #8284 from yehudasa/wip-rgw-sync-fixes-5

rgw: fix lockdep false positive

Merge pull request #7820 from yuyuyu101/remove-exper

msg/async: remove experiment feature

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

Merge pull request #8308 from wido/cloudstack-docs

doc: Updated CloudStack RBD documentation

Merge pull request #8327 from vumrao/wip-vumrao-15288

doc: Remove Ceph Monitors do lots of fsync()

Merge pull request #8328 from scienceluo/master

doc: Fixes headline different font size and type

Merge pull request #8293 from dachary/wip-subman-facts

script: subscription-manager support (part 2)

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

doc: Remove Ceph Monitors do lots of fsync()
     and change the ligature of "fl" to "f" and "l"

Fixes: #15288
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>

Fixes headline different font size and type

rgw_file: set owner uid, gid, and Unix mode on new objects

Unix attributes aren't current materialized, but a future change
will serialize them in a new object attribute.

Also moves create and mkdir into operations on RGWLibFS, which
better encapsulates the behavior.

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

Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV (part 2)

The new default must be taken into account by make check scripts
otherwise they fail.

Followup of 5b3da26.

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

Merge pull request #8299 from liewegas/wip-15230

messages/MOSDOp: clear reqid inc for v6 encoding

Merge pull request #8318 from tchaikov/wip-15240

test/system/*: use dynamically generated pool name

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

test/system/*: use dynamically generated pool name

was using "foo" for the pool name. this works if we are performing
tests in serial. but if we do it in parallel, the tests interfere
with each other.

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

Merge pull request #7094 from songbaisen/wipdf

mon: show the pool quota info on ceph df detail command

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #8275 from xiexingguo/xxg-wip-fixdirtyinfo

osd: fix dirtying info without correctly setting drity_info field

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

Merge pull request #8230 from majianpeng/clear-omap

osd: fix bugs for omap ops

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

Merge pull request #8254 from xiexingguo/xxg-wip-osd

osd: fix reference count, rare race condition etc.

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

Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge

osd: more fixes for incorrectly dirtying info; resend reply for duplicated scrub-reserve req

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

Merge pull request #8247 from liewegas/wip-split-creates

mon: do not send useless pg_create messages for split pgs

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

Merge pull request #8208 from liewegas/wip-15027

mon: mark_down_pgs in lockstep with pg_map's osdmap epoch

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

script: subscription-manager support (part 2)

Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.

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

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

ceph_test_rados_api_misc: debug LibRadosMiscConnectFailure.ConnectFailure

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

messages/MOSDOp: clear reqid inc for v6 encoding

For the new v7 encoding, we put the client incarnation in the
reqid so that we can have it at the beginning of the encoding.
However, we do *not* want to do this for the v6 encoding, as that
version of get_reqid() will return reqid if it is not ==
osd_reqid_t().

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

Merge pull request #8265 from athanatos/wip-journal-default

config_opts: disable filestore throttle soft backoff by default

Merge pull request #8306 from tchaikov/wip-doc-formatting

doc/rados/operations/crush: fix the formatting

Merge pull request #8202 from XinzeChi/wip-objecter-tid

osdc/Objecter: dout log after assign tid

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

Merge remote-tracking branch 'gh/jewel'

Merge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage

makefile: fix rbdmap manpage

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

doc: amend Fixes instructions in SubmittingPatches

Since the "Fixes: #..." line is interpreted by GitHub as referring to a
pull request, yet the intention is for it to refer to the tracker issue,
change our instructions to use the full tracker issue URL.

Now that github pull request numbers are in the 8000s, there are cases when
a PR is wrongly closed by a "Fixes: #..." line in a commit message. See

https://github.com/ceph/ceph/pull/8286#event-603120191

for one such case.

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

cmake: conditionally install man pages

this matches its counterpart in automake
* install fuse related man pages only if HAVE_LIBFUSE
* install rbd related man pages only if WITH_RBD

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

autotools: add rbdmap to dist_man_MANS

this fixes the rpm/deb build failure
was introduced by 20c8650

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

Merge pull request #8038 from badone/wip-crushtool-crash

crushtool: Don't crash when called on a file that isn't a crushmap

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

Merge pull request #8309 from tchaikov/wip-15240

test/system/rados_list_parallel: print oid if rados_write fails

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

xxHash: fix submodule commit

This was inadvertantly rewinded in b9a14312edd6a4edb0f4783ab08ad97e0e9ba03f

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

osd/pg: publish stats to osd if pg is currently marked as down

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

osd/pg: publish stats to osd if we recovered from degraded

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

osd/pg: avoid publishing pg_stat twice in a short interval

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

osd/pg: fold sanity check into one single "if" qualification

Just as "boost::statechart::result
PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserved &evt)"
does.

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

osd/pg: drop unnecessary update_heartbeat_peers()

The proc_replica_info() method will do the same job in a
smarter way, so the succeeding call to update_heartbeat_peers()
is unnecessary and cost expensive.

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

Merge pull request #8211 from liewegas/wip-jewel

doc: draft notes for jewel

Merge pull request #8044 from dzafman/wip-8885

osd: fix dump_ops_in_flight races

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

Merge pull request #8156 from liewegas/wip-pg-query

osd/PG: indicate in pg query output whether ignore_history_les would help

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

Merge pull request #8177 from majianpeng/signal-handle

global/signal_handler: print thread name in signal handler

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

test/system/rados_list_parallel: print oid if rados_write fails

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

doc/release-notes: rgw typo

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

Merge pull request #8294 from theanalyst/rgw/bucket-quota-check

rgw:Use count fn in RGWUserBuckets for quota check

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

doc: Updated CloudStack RBD documentation

Signed-off-by: Wido den Hollander <wido@42on.com>

Update SSL support a bit.

Use cmake's FindOpenSSL.  Actually use the library definitions that
come out of it.  Also use the include path.  If SSL is disabled,
then build without any of this.  The result will be a version
of civetweb that includes openssl support using dlopen() - ie,
what we used to do.  This is probably a bit silly, and I hope
nobody actually expects to use it that way, but it's mostly harmless.

Signed-off-by: Marcus Watts <mwatts@redhat.com>

cmake: add FindOpenSSL.cmake

Use find_package to enforce the dependency up front (we should be
using this pattern throughout top-level CMakeLists.txt).

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