]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agodoc: Replaced "plugin" with "module" in the Mgr documentation 26671/head
Lenz Grimmer [Wed, 27 Feb 2019 12:49:47 +0000 (13:49 +0100)]
doc: Replaced "plugin" with "module" in the Mgr documentation

The documentation currently refers to Ceph Manager Modules as
"plugins" in many places, while the command line interface uses
"module" to enable/disable modules. Replaced all occurences
of "plugin" with "module" in the docs, to avoid confusion and to
be in alignment with the CLI. Also fixed the capitalizations of some
module chapters.

Fixes: https://tracker.ceph.com/issues/38481
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
6 years agoMerge pull request #26130 from minshenglin/wip-37855
Matt Benjamin [Tue, 26 Feb 2019 12:05:09 +0000 (07:05 -0500)]
Merge pull request #26130 from minshenglin/wip-37855

rgw_file: use correct secret key to check auth

6 years agoMerge pull request #26611 from falcon78921/wip-doc-log-based-pg
Xie Xingguo [Tue, 26 Feb 2019 00:42:37 +0000 (08:42 +0800)]
Merge pull request #26611 from falcon78921/wip-doc-log-based-pg

doc: updated reference link for log based PG

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #26617 into master
Sage Weil [Mon, 25 Feb 2019 22:41:40 +0000 (16:41 -0600)]
Merge PR #26617 into master

* refs/pull/26617/head:
rpm: Fix pyOpenSSL dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
6 years agoMerge PR #26623 into master
Sage Weil [Mon, 25 Feb 2019 22:41:16 +0000 (16:41 -0600)]
Merge PR #26623 into master

* refs/pull/26623/head:
mgr/PyModule: put mgr_module_path first in sys.path

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26543 into master
Sage Weil [Mon, 25 Feb 2019 22:40:46 +0000 (16:40 -0600)]
Merge PR #26543 into master

* refs/pull/26543/head:
Revert "ceph.spec.in: python-kubernetes broken on rhel"

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge PR #26625 into master
Sage Weil [Mon, 25 Feb 2019 22:40:12 +0000 (16:40 -0600)]
Merge PR #26625 into master

* refs/pull/26625/head:
rpm,cmake: additional fixes to make amqp support optional

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #22755 from zhangsw/feature-rgw-appendobj
Matt Benjamin [Mon, 25 Feb 2019 22:29:10 +0000 (17:29 -0500)]
Merge pull request #22755 from zhangsw/feature-rgw-appendobj

rgw: Add append object api.

6 years agoMerge PR #26610 into master
Patrick Donnelly [Mon, 25 Feb 2019 20:25:11 +0000 (12:25 -0800)]
Merge PR #26610 into master

* refs/pull/26610/head:
doc: updated governance link for Ceph project leads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26603 from dillaman/wip-38453
Mykola Golub [Mon, 25 Feb 2019 19:13:16 +0000 (21:13 +0200)]
Merge pull request #26603 from dillaman/wip-38453

rbd-mirror: use active/active policy by default

Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #26632 into master 26632/head
Sage Weil [Mon, 25 Feb 2019 16:44:43 +0000 (10:44 -0600)]
Merge PR #26632 into master

* refs/pull/26632/head:
14.1.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
6 years agoMerge PR #26609 into master
Sage Weil [Mon, 25 Feb 2019 16:32:01 +0000 (10:32 -0600)]
Merge PR #26609 into master

* refs/pull/26609/head:
ceph_test_msgr: skip injection test for simplemessenger

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #26600 from jtlayton/wip-dashboard-rook
jtlayton [Mon, 25 Feb 2019 16:28:43 +0000 (17:28 +0100)]
Merge pull request #26600 from jtlayton/wip-dashboard-rook

mgr/dashboard: special casing for minikube in run-backend-rook-api-request.sh

6 years agorbd-mirror: use active/active policy by default 26603/head
Mykola Golub [Mon, 25 Feb 2019 09:50:00 +0000 (11:50 +0200)]
rbd-mirror: use active/active policy by default

Fixes: http://tracker.ceph.com/issues/38453
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #26522 from ashishkumsingh/wip-doc-38310
David Zafman [Mon, 25 Feb 2019 16:20:49 +0000 (08:20 -0800)]
Merge pull request #26522 from ashishkumsingh/wip-doc-38310

doc: Fix incorrect mention of 'osd_deep_mon_scrub_interval'

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge PR #26598 into master
Sage Weil [Mon, 25 Feb 2019 16:08:07 +0000 (10:08 -0600)]
Merge PR #26598 into master

* refs/pull/26598/head:
doc/releases/nautilus: note about msgr2
doc/releases/nautilus: rgw highlights
doc/releases/nautilus: draft notes

Reviewed-by: Kai Wagner <kwagner@suse.com>
6 years agoMerge PR #26280 into master
Sage Weil [Mon, 25 Feb 2019 14:44:23 +0000 (08:44 -0600)]
Merge PR #26280 into master

* refs/pull/26280/head:
mgr: Remove _ceph_(g|s)et_module_option_ex() method
mgr: remove _ceph_get_module_option_ex() method

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #26487 into master
Sage Weil [Mon, 25 Feb 2019 14:43:57 +0000 (08:43 -0600)]
Merge PR #26487 into master

* refs/pull/26487/head:
CLI: ability to change file ownership

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26591 into master
Sage Weil [Mon, 25 Feb 2019 14:43:40 +0000 (08:43 -0600)]
Merge PR #26591 into master

* refs/pull/26591/head:
osd/PrimaryLogPG: handle object !exists in handle_watch_timeout

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agodoc/releases/nautilus: note about msgr2
Sage Weil [Fri, 22 Feb 2019 22:05:41 +0000 (16:05 -0600)]
doc/releases/nautilus: note about msgr2

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/releases/nautilus: rgw highlights
Sage Weil [Fri, 22 Feb 2019 18:38:57 +0000 (12:38 -0600)]
doc/releases/nautilus: rgw highlights

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/releases/nautilus: draft notes
Sage Weil [Fri, 22 Feb 2019 17:54:15 +0000 (11:54 -0600)]
doc/releases/nautilus: draft notes

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_msgr: skip injection test for simplemessenger 26609/head
Sage Weil [Sun, 24 Feb 2019 15:36:57 +0000 (09:36 -0600)]
ceph_test_msgr: skip injection test for simplemessenger

The interceptor is only implemented in asyncmessenger.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26539 from tspmelo/wip-nfs-status
Lenz Grimmer [Mon, 25 Feb 2019 12:12:22 +0000 (13:12 +0100)]
Merge pull request #26539 from tspmelo/wip-nfs-status

mgr/dashboard: Add NFS status endpoint

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agorpm,cmake: additional fixes to make amqp support optional 26625/head
Tim Serong [Mon, 25 Feb 2019 08:48:11 +0000 (19:48 +1100)]
rpm,cmake: additional fixes to make amqp support optional

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #26620 from cyx1231st/wip-seastar-async-echo
Kefu Chai [Mon, 25 Feb 2019 08:44:20 +0000 (16:44 +0800)]
Merge pull request #26620 from cyx1231st/wip-seastar-async-echo

test/crimson: split async-msgr out of alien_echo

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/PyModule: put mgr_module_path first in sys.path 26623/head
Tim Serong [Mon, 25 Feb 2019 03:47:12 +0000 (14:47 +1100)]
mgr/PyModule: put mgr_module_path first in sys.path

If the various python site packages appear first in sys.path, and there
happens to be a package whose name is the same as an mgr module, mgr will
try to load that thing instead of the expected mgr module.  This results
in a very terse couple of errors:

  mgr[py] Class not found in module 'deepsea'
  mgr[py] Error loading module 'deepsea': (22) Invalid argument

Before this commit, sys.path on my SLE 11 SP1 dev system is:

  /usr/lib/python36.zip
  /usr/lib64/python3.6
  /usr/lib64/python3.6
  /usr/lib64/python3.6/lib-dynload
  /usr/lib64/python3.6/site-packages
  /usr/lib/python3.6/site-packages
  /usr/local/lib64/python3.6/site-packages
  /usr/local/lib/python3.6/site-packages
  /usr/lib64/ceph/mgr

After this commit, /usr/share/ceph/mgr comes before python's site-packages,
and everything works properly:

  /usr/lib/python36.zip
  /usr/lib64/python3.6
  /usr/lib64/python3.6
  /usr/lib64/python3.6/lib-dynload
  /usr/share/ceph/mgr
  /usr/lib64/python3.6/site-packages
  /usr/lib/python3.6/site-packages
  /usr/local/lib64/python3.6/site-packages
  /usr/local/lib/python3.6/site-packages

(If you're interested in seeing what's in sys.path, turn "debug mgr" up
to at least 10, then grep the logs for "Computed sys.path")

Fixes: https://tracker.ceph.com/issues/38469
Signed-off-by: Tim Serong <tserong@suse.com>
6 years agotest/crimson: enable unauthenticated connections for async_echo 26620/head
Yingxin Cheng [Mon, 25 Feb 2019 06:36:29 +0000 (14:36 +0800)]
test/crimson: enable unauthenticated connections for async_echo

Enable co-operability with crimson-msgr in unittest_alien_echo.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: split async-msgr out of alien_echo
Yingxin Cheng [Mon, 25 Feb 2019 06:32:13 +0000 (14:32 +0800)]
test/crimson: split async-msgr out of alien_echo

async-msgr is not compatible with custom-built libs for seastar, so
split it.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agorpm: Fix pyOpenSSL dependency 26617/head
Brad Hubbard [Mon, 25 Feb 2019 02:06:57 +0000 (12:06 +1000)]
rpm: Fix pyOpenSSL dependency

Fedora29 does not have pyOpenSSL but it does have python-pyOpenSSL

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
6 years agodoc: updated reference link for log based PG 26611/head
James McClune [Sun, 24 Feb 2019 21:08:44 +0000 (16:08 -0500)]
doc: updated reference link for log based PG

Added :ref: label to Log Based PG page. Referenced <log-based-pg>
label on Asynchronous Recovery page.

Fixes: https://tracker.ceph.com/issues/38465
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agodoc: updated governance link for Ceph project leads 26610/head
James McClune [Sun, 24 Feb 2019 20:58:02 +0000 (15:58 -0500)]
doc: updated governance link for Ceph project leads

Added :ref: label to Governance page. Referenced <governance>
label on Development Workflow page.

Fixes: https://tracker.ceph.com/issues/38464
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge PR #26466 into master
Sage Weil [Sun, 24 Feb 2019 15:33:32 +0000 (09:33 -0600)]
Merge PR #26466 into master

* refs/pull/26466/head:
msg/async, v2: fix wrong base for KeepAliveFrameAck.
msg/async, v2: frame decoding operates on bufferlist.
msg/async, v2: drop ceph_msg_header2 fields duplicating segment info.
msg/async, v2: drop the scaffolding in preamble parsing.
msg/async, v2: handle msg authentication failures.
msg/async, v2: drop depedency on uint128_t. Clean up onwire crypto.
msg/async, v2: fix cur_msg_size in ::reset_recv_state().
msg/async, v2: drop magic numbers for segments.
msg/async, v2: get rid of magic number in SignedEncryptedFrame.
msg/async, v2: get rid of the magic number for default alignment.
msg/async, v2: decouple onwire segment length from logical length.
msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().
msg/async, v2: drop handling of extra segments in ::fill_preamble().
msg/async, v2: get rid of magic numbers for alignment.
msg/async, v2: drop reserve() from onwire crypto's TxHandler.
msg/async: add con_mode to debug lines
msg/DispatchQueue: include con_mode in <== line
common/ceph_strings: get_con_mode_name()
msg/Connection: add get_con_mode()
msg/async/ProtocolV2: clean up preamble comments
msg/async, v2: improve debug around sending client indent.
msg/async, v2: bring back the no-encryption ability.
msg/async, v2: workaround con_mode handling.
msg/async, v2: drop the throttles bypass.
msg/async, v2: READ_MESSAGE_FRONT -> THROTTLE_DONE.
msg/async: WaitFrame of V2 can be crypto processed now.
msg/async: initial multi-segment support for V2.
msg/async: V2 bypasses throttles just for development.
msg/async: rectify reseting security state in ProtocolV2::reset_recv_state().
msg/async: switch to CRC32 for V2 preamble blocks.
msg/async: bump up preamble block size to 32 bytes.
msg/async: get rid of the distiction on main and extra V2 preamble.
msg/async: add debug around empty ClientIdent::addrs.
msg/async: V2 uses segments instead of next_payload_len, part 1.
msg/async: perform V2 frame dispatch in dedicated method.
msg/async: implement crc checking for main preamble of V2.
msg/async: receive V2 messages with new preable format.
msg/async: transmit V2 messages with new preable format.
msg/async: reset crypto processors in ProtocolV2::reset_recv_state().
msg/async: preamble of V2 Frames is now encrypted and authenticated.
msg/async: slightly rework ProtocolV2 preamble crafting.
msg/async: reset the rx stream handler in ::handle_read_frame_length_and_tag.
auth, msg/async, v2: drop AuthStreamHandler and AES128GCM_StreamHandler.
msg/async: Messages in Protocol2 are crypto-processed only once.
msg/async: SignedEncryptedFrame uses ceph::crypto::onwire.
msg/async: expose message segmentation to ::write_message().
auth: implement ceph::crypto::onwire with OpenSSL EVP.
auth: introduce ceph::crypto::onwire interfaces.
msg/async: decouple MessageHeaderFrame from SignedEncryptedFrame.
msg/async: move Protocol* asserts in SignedEncryptedFrame to compile time.
msg/async: simplify encryption handling in the PayloadFrame class.
auth: drop AES128CBC_HMACSHA256_StreamHandler.
msg/async: ensure consistency between con_mode and session_security.
msg/async: drop MessageFrame. Use MessageHeaderFrame instead.
msg/async: set con_mode and session_security at both peers.
msg/async, auth: switch AuthStreamHandler::rxtx_t to std::unique_ptr.
crypto: AES128GCM_StreamHandler brings authenticated encryption with AES-GCM.
include: uint128_t -> ceph::uint128_t + using.
msg/async: move crypto handling from ProtocolV2 into AuthStreamHandler.
auth, msg: dissect AuthStreamHandler from AuthSessionHandler.
auth/cephx: make _calc_signature() of CephxSessionHandler private.
auth: drop {en,de}crypt_message() from AuthSessionHandler.
auth: introduce DummyAuthSessionHandler.
auth: make AuthSessionHandler purely abstract.
auth: drop no_security() from AuthSessionHandler.
auth: drop get_protocol() and get_key() from AuthSessionHandler.
auth: drop sign_bufferlist() from AuthSessionHandler.
msg/async: drop get_auth_meta() from Protocol.
msg/async: emphasize ProtocolV2 does authenticated encryption.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26560 from xiexingguo/wip-pool-force-recovery
Xie Xingguo [Sat, 23 Feb 2019 07:30:14 +0000 (15:30 +0800)]
Merge pull request #26560 from xiexingguo/wip-pool-force-recovery

mgr: add per pool force-recovery/backfill commands

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agomgr: add per pool force-recovery/backfill commands 26560/head
xie xingguo [Wed, 20 Feb 2019 10:40:02 +0000 (18:40 +0800)]
mgr: add per pool force-recovery/backfill commands

For those with multiple storage pools sharing the same devices,
I think it would make much more sense to offer per-pool
commands to bring pools with high priority, e.g., because they
are hosting data of more importance than others, back to normal
quickly.

Fixes: http://tracker.ceph.com/issues/38456
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agomsg/async, v2: fix wrong base for KeepAliveFrameAck. 26466/head
Radoslaw Zarzynski [Sat, 23 Feb 2019 00:49:17 +0000 (01:49 +0100)]
msg/async, v2: fix wrong base for KeepAliveFrameAck.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge PR #26602 into master
Sage Weil [Fri, 22 Feb 2019 22:00:25 +0000 (16:00 -0600)]
Merge PR #26602 into master

* refs/pull/26602/head:
Revert "pybind: set language_level for cythonize explicitly"
Revert "pybind: auto encode/decode cstr"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #26436 from dzafman/wip-bionic-core
David Zafman [Fri, 22 Feb 2019 20:52:37 +0000 (12:52 -0800)]
Merge pull request #26436 from dzafman/wip-bionic-core

run-standalone.sh: Need double-quotes to handle | in core_pattern on all distributions

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agomgr/dashboard: special casing for minikube in run-backend-rook-api-request.sh 26600/head
Jeff Layton [Fri, 22 Feb 2019 19:40:51 +0000 (14:40 -0500)]
mgr/dashboard: special casing for minikube in run-backend-rook-api-request.sh

For people running minikube for testing, the hostname "minikube" is
often not resolvable. If that's what the hostname is, then get
the address from "minikube ip" instead.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agoRevert "pybind: set language_level for cythonize explicitly" 26602/head
Neha Ojha [Fri, 22 Feb 2019 19:41:55 +0000 (11:41 -0800)]
Revert "pybind: set language_level for cythonize explicitly"

This reverts commit ded3d43dbf8a36daa65d8efe406af4d12ffc7dd8.

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agoRevert "pybind: auto encode/decode cstr"
Neha Ojha [Fri, 22 Feb 2019 19:39:20 +0000 (11:39 -0800)]
Revert "pybind: auto encode/decode cstr"

This reverts commit c36d0f1a7de4668eb81075e4a94846cf81fc30cd.

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years ago14.1.0 v14.1.0
Jenkins Build Slave User [Fri, 22 Feb 2019 18:07:07 +0000 (18:07 +0000)]
14.1.0

6 years agoMerge pull request #25438 from MahatiC/wip-move-to-trash
Mykola Golub [Fri, 22 Feb 2019 16:57:10 +0000 (18:57 +0200)]
Merge pull request #25438 from MahatiC/wip-move-to-trash

rbd: move image to trash as first step when removing

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #26506 from ricardoasmarques/multi-backstore-backend
Lenz Grimmer [Fri, 22 Feb 2019 16:48:25 +0000 (17:48 +0100)]
Merge pull request #26506 from ricardoasmarques/multi-backstore-backend

mgr/dashboard: iSCSI - Infrastructure for multiple backstores (backend)

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoosd/PrimaryLogPG: handle object !exists in handle_watch_timeout 26591/head
Sage Weil [Fri, 22 Feb 2019 14:56:16 +0000 (08:56 -0600)]
osd/PrimaryLogPG: handle object !exists in handle_watch_timeout

- watch on object
- watch timeout queued
- rados op deletes object
- handle_watch_timeout tries to delete it again

Fixes: http://tracker.ceph.com/issues/38432
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26515 from theanalyst/civetweb-fixes-n
Matt Benjamin [Fri, 22 Feb 2019 14:20:38 +0000 (09:20 -0500)]
Merge pull request #26515 from theanalyst/civetweb-fixes-n

civetweb: pull up to ceph-master

6 years agoRevert "ceph.spec.in: python-kubernetes broken on rhel" 26543/head
Jeff Layton [Wed, 20 Feb 2019 15:12:31 +0000 (10:12 -0500)]
Revert "ceph.spec.in: python-kubernetes broken on rhel"

This reverts commit c32c4874e139d0e97116d6f3d368ac9c3e393c9f.

An updated python2-kubernetes package that does not depend on
python-adal has made it into the epel7 repos. With that change,
we can now revert this patch.

When we readd it back though, add in %{_python_buildid} so that
this works correctly on python3-based distros as well.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge PR #26550 into master
Sage Weil [Fri, 22 Feb 2019 13:14:33 +0000 (07:14 -0600)]
Merge PR #26550 into master

* refs/pull/26550/head:
mon/AuthMonitor: provide auth_lock-safe _assign_global_id()
mon/AuthMonitor: provide AuthMonitor with mon count and rank *only* while active

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
6 years agoMerge PR #26476 into master
Sage Weil [Fri, 22 Feb 2019 13:11:28 +0000 (07:11 -0600)]
Merge PR #26476 into master

* refs/pull/26476/head:
pybind: auto encode/decode cstr
pybind: set language_level for cythonize explicitly

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26552 into master
Sage Weil [Fri, 22 Feb 2019 13:10:51 +0000 (07:10 -0600)]
Merge PR #26552 into master

* refs/pull/26552/head:
osdc/Objecter: invalidate crcs on preallocated rx buffers

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26568 into master
Sage Weil [Fri, 22 Feb 2019 13:10:32 +0000 (07:10 -0600)]
Merge PR #26568 into master

* refs/pull/26568/head:
unittest_auth: add unit tests for AuthRegistry con_mode selection
auth/AuthRegistry: register as an observer
auth/AuthRegistry: clear output vectors
common/options: add ms_mon_client_mode
auth: push con_mode selection into AuthRegistry helper

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agocivetweb: pull up to ceph-master 26515/head
Abhishek Lekshmanan [Tue, 19 Feb 2019 16:03:38 +0000 (17:03 +0100)]
civetweb: pull up to ceph-master

Contains the following fixes
- absolute url fixes
- ssl socket closing fixes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
6 years agoMerge pull request #26584 from capri1989/doc-fixes
Kefu Chai [Fri, 22 Feb 2019 11:31:58 +0000 (19:31 +0800)]
Merge pull request #26584 from capri1989/doc-fixes

doc: Remove value 'mon_osd_max_split_count'

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agodoc: Remove value 'mon_osd_max_split_count' from the docs 26584/head
Kai Wagner [Fri, 22 Feb 2019 09:18:44 +0000 (10:18 +0100)]
doc: Remove value 'mon_osd_max_split_count' from the docs

Signed-off-by: Kai Wagner <kwagner@suse.com>
6 years agoMerge pull request #26510 from callithea/wip-add-ganesha-qa-tests
Lenz Grimmer [Fri, 22 Feb 2019 09:28:41 +0000 (10:28 +0100)]
Merge pull request #26510 from callithea/wip-add-ganesha-qa-tests

mgr/dashboard: Added NFS Ganesha suite to QA tests

Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge pull request #26520 from ktdreyer/rpm-rhel8
Kefu Chai [Fri, 22 Feb 2019 07:44:52 +0000 (15:44 +0800)]
Merge pull request #26520 from ktdreyer/rpm-rhel8

rpm: RHEL 8 fixes

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26555 from tchaikov/wip-install-build-deps
Kefu Chai [Fri, 22 Feb 2019 07:39:55 +0000 (15:39 +0800)]
Merge pull request #26555 from tchaikov/wip-install-build-deps

cmake,rgw: make amqp support optional

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
6 years agoMerge pull request #26582 from tchaikov/wip-cmake-silence-syntax-warning
Kefu Chai [Fri, 22 Feb 2019 07:37:09 +0000 (15:37 +0800)]
Merge pull request #26582 from tchaikov/wip-cmake-silence-syntax-warning

cmake: fix syntax error of set()

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agocmake: fix syntax error of set() 26582/head
Kefu Chai [Fri, 22 Feb 2019 05:37:43 +0000 (13:37 +0800)]
cmake: fix syntax error of set()

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoinstall-deps,do_freebsd: disable amqp support 26555/head
Kefu Chai [Thu, 21 Feb 2019 11:17:04 +0000 (19:17 +0800)]
install-deps,do_freebsd: disable amqp support

per Willem's request.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agorpm: disable amqp endpoint on SLE/OpenSUSE
Kefu Chai [Thu, 21 Feb 2019 08:09:00 +0000 (16:09 +0800)]
rpm: disable amqp endpoint on SLE/OpenSUSE

as librabbitmq-devel is not packaged on them yet.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: remove amqp_mock from UNITTEST_LIBS
Kefu Chai [Thu, 21 Feb 2019 10:54:31 +0000 (18:54 +0800)]
cmake: remove amqp_mock from UNITTEST_LIBS

this mock library is only used by rgw tests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomsg/async, v2: frame decoding operates on bufferlist.
Radoslaw Zarzynski [Thu, 21 Feb 2019 20:35:13 +0000 (21:35 +0100)]
msg/async, v2: frame decoding operates on bufferlist.

This change is driven by buggy buffer's life time management
polluting AuthAuthorizer::bl with dangling raw_static instances.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop ceph_msg_header2 fields duplicating segment info.
Radoslaw Zarzynski [Thu, 21 Feb 2019 20:33:48 +0000 (21:33 +0100)]
msg/async, v2: drop ceph_msg_header2 fields duplicating segment info.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop the scaffolding in preamble parsing.
Radoslaw Zarzynski [Thu, 21 Feb 2019 00:42:17 +0000 (01:42 +0100)]
msg/async, v2: drop the scaffolding in preamble parsing.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: handle msg authentication failures.
Radoslaw Zarzynski [Thu, 21 Feb 2019 00:26:25 +0000 (01:26 +0100)]
msg/async, v2: handle msg authentication failures.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop depedency on uint128_t. Clean up onwire crypto.
Radoslaw Zarzynski [Wed, 20 Feb 2019 15:01:28 +0000 (16:01 +0100)]
msg/async, v2: drop depedency on uint128_t. Clean up onwire crypto.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: fix cur_msg_size in ::reset_recv_state().
Radoslaw Zarzynski [Wed, 20 Feb 2019 06:16:53 +0000 (07:16 +0100)]
msg/async, v2: fix cur_msg_size in ::reset_recv_state().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop magic numbers for segments.
Radoslaw Zarzynski [Wed, 20 Feb 2019 01:44:38 +0000 (02:44 +0100)]
msg/async, v2: drop magic numbers for segments.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: get rid of magic number in SignedEncryptedFrame.
Radoslaw Zarzynski [Wed, 20 Feb 2019 01:24:24 +0000 (02:24 +0100)]
msg/async, v2: get rid of magic number in SignedEncryptedFrame.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: get rid of the magic number for default alignment.
Radoslaw Zarzynski [Wed, 20 Feb 2019 01:21:52 +0000 (02:21 +0100)]
msg/async, v2: get rid of the magic number for default alignment.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: decouple onwire segment length from logical length.
Radoslaw Zarzynski [Tue, 19 Feb 2019 20:56:25 +0000 (21:56 +0100)]
msg/async, v2: decouple onwire segment length from logical length.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: follow the const bl& concept in authenticated_encrypt_update().
Radoslaw Zarzynski [Tue, 19 Feb 2019 20:51:36 +0000 (21:51 +0100)]
msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop handling of extra segments in ::fill_preamble().
Radoslaw Zarzynski [Tue, 19 Feb 2019 16:14:52 +0000 (17:14 +0100)]
msg/async, v2: drop handling of extra segments in ::fill_preamble().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: get rid of magic numbers for alignment.
Radoslaw Zarzynski [Tue, 19 Feb 2019 16:13:32 +0000 (17:13 +0100)]
msg/async, v2: get rid of magic numbers for alignment.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop reserve() from onwire crypto's TxHandler.
Radoslaw Zarzynski [Tue, 19 Feb 2019 13:09:52 +0000 (14:09 +0100)]
msg/async, v2: drop reserve() from onwire crypto's TxHandler.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: add con_mode to debug lines
Sage Weil [Mon, 18 Feb 2019 19:43:31 +0000 (13:43 -0600)]
msg/async: add con_mode to debug lines

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/DispatchQueue: include con_mode in <== line
Sage Weil [Sun, 17 Feb 2019 15:42:23 +0000 (09:42 -0600)]
msg/DispatchQueue: include con_mode in <== line

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agocommon/ceph_strings: get_con_mode_name()
Sage Weil [Sun, 17 Feb 2019 15:42:10 +0000 (09:42 -0600)]
common/ceph_strings: get_con_mode_name()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/Connection: add get_con_mode()
Sage Weil [Sun, 17 Feb 2019 15:41:56 +0000 (09:41 -0600)]
msg/Connection: add get_con_mode()

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/ProtocolV2: clean up preamble comments
Sage Weil [Sun, 17 Feb 2019 15:30:56 +0000 (09:30 -0600)]
msg/async/ProtocolV2: clean up preamble comments

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async, v2: improve debug around sending client indent.
Radoslaw Zarzynski [Thu, 14 Feb 2019 03:59:32 +0000 (04:59 +0100)]
msg/async, v2: improve debug around sending client indent.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: bring back the no-encryption ability.
Radoslaw Zarzynski [Sun, 17 Feb 2019 01:26:59 +0000 (02:26 +0100)]
msg/async, v2: bring back the no-encryption ability.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: workaround con_mode handling.
Radoslaw Zarzynski [Sat, 16 Feb 2019 00:38:40 +0000 (01:38 +0100)]
msg/async, v2: workaround con_mode handling.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: drop the throttles bypass.
Radoslaw Zarzynski [Fri, 15 Feb 2019 15:40:22 +0000 (16:40 +0100)]
msg/async, v2: drop the throttles bypass.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: READ_MESSAGE_FRONT -> THROTTLE_DONE.
Radoslaw Zarzynski [Fri, 15 Feb 2019 14:11:09 +0000 (15:11 +0100)]
msg/async, v2: READ_MESSAGE_FRONT -> THROTTLE_DONE.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: WaitFrame of V2 can be crypto processed now.
Radoslaw Zarzynski [Thu, 14 Feb 2019 00:41:09 +0000 (01:41 +0100)]
msg/async: WaitFrame of V2 can be crypto processed now.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agorpm: build __pycache__ directories on RHEL 8 26520/head
Ken Dreyer [Tue, 19 Feb 2019 16:42:09 +0000 (09:42 -0700)]
rpm: build __pycache__ directories on RHEL 8

In RHEL 8, rpmbuild does not automatically generate __pycache__
directories. Generate them explicitly with the %py_byte_compile macro.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
6 years agorpm: fix pyOpenSSL requirement for RHEL 8
Ken Dreyer [Mon, 18 Feb 2019 22:38:17 +0000 (15:38 -0700)]
rpm: fix pyOpenSSL requirement for RHEL 8

On RHEL 7, this package is named "pyOpenSSL", but on RHEL 8, Fedora, and
SUSE, it is named "python3-pyOpenSSL".

Prior to this change, the RHEL conditional was applying to both RHEL 7
and 8, so we would fail to resolve the "pyOpenSSL" package dependency on
RHEL 8.

Update the RPM conditionals to use "pyOpenSSL" on RHEL 7 and
"python3-pyOpenSSL" on all other distributions.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
6 years agorpm: fix python dependencies on RHEL 8
Ken Dreyer [Mon, 18 Feb 2019 22:19:41 +0000 (15:19 -0700)]
rpm: fix python dependencies on RHEL 8

On RHEL 8, the python34-* and Cython packages are named identically to
Fedora (eg "python3-Cython"). Move the Python 2 "Cython" and python34-*
BuildRequires lines inside a RHEL 7 conditional, so RHEL 8 falls through
to the Fedora package names.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
6 years agoMerge pull request #26566 from theanalyst/vstart-beast
Casey Bodley [Thu, 21 Feb 2019 21:48:55 +0000 (16:48 -0500)]
Merge pull request #26566 from theanalyst/vstart-beast

vstart: make beast as the default frontend for rgw

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agomsg/async: initial multi-segment support for V2.
Radoslaw Zarzynski [Fri, 15 Feb 2019 02:09:19 +0000 (03:09 +0100)]
msg/async: initial multi-segment support for V2.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: V2 bypasses throttles just for development.
Radoslaw Zarzynski [Thu, 14 Feb 2019 20:02:52 +0000 (21:02 +0100)]
msg/async: V2 bypasses throttles just for development.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: rectify reseting security state in ProtocolV2::reset_recv_state().
Radoslaw Zarzynski [Thu, 14 Feb 2019 19:31:49 +0000 (20:31 +0100)]
msg/async: rectify reseting security state in ProtocolV2::reset_recv_state().

The reason for that is:

  2019-02-14 19:59:00.774 7f78aebf3700 20 --2- v2:127.0.0.1:40678/0 >>
    v2:127.0.0.1:40680/0 conn(0x5574ae75e480 0x5574ae696000 :-1 s=READY
    pgs=11 cs=0 l=0 rx=0x5574ae2af5f0 tx=0x5574ae79bc00).handle_read_frame_preamble_main
    r=-1
  2019-02-14 19:59:00.774 7f78aebf3700  1 --2- v2:127.0.0.1:40678/0 >>
    v2:127.0.0.1:40680/0 conn(0x5574ae75e480 0x5574ae696000 :-1 s=READY
    pgs=11 cs=0 l=0 rx=0x5574ae2af5f0 tx=0x5574ae79bc00).handle_read_frame_preamble_main
    read frame length and tag failed r=-1 ((1) Operation not permitted)
  2019-02-14 19:59:00.774 7f78aebf3700 10 --2- v2:127.0.0.1:40678/0 >>
    v2:127.0.0.1:40680/0 conn(0x5574ae75e480 0x5574ae696000 :-1 s=READY
    pgs=11 cs=0 l=0 rx=0x5574ae2af5f0 tx=0x5574ae79bc00)._fault

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: switch to CRC32 for V2 preamble blocks.
Radoslaw Zarzynski [Thu, 14 Feb 2019 19:30:05 +0000 (20:30 +0100)]
msg/async: switch to CRC32 for V2 preamble blocks.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: bump up preamble block size to 32 bytes.
Radoslaw Zarzynski [Thu, 14 Feb 2019 19:25:55 +0000 (20:25 +0100)]
msg/async: bump up preamble block size to 32 bytes.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: get rid of the distiction on main and extra V2 preamble.
Radoslaw Zarzynski [Thu, 14 Feb 2019 15:58:42 +0000 (16:58 +0100)]
msg/async: get rid of the distiction on main and extra V2 preamble.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: add debug around empty ClientIdent::addrs.
Radoslaw Zarzynski [Thu, 14 Feb 2019 03:02:41 +0000 (04:02 +0100)]
msg/async: add debug around empty ClientIdent::addrs.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: V2 uses segments instead of next_payload_len, part 1.
Radoslaw Zarzynski [Thu, 14 Feb 2019 00:39:26 +0000 (01:39 +0100)]
msg/async: V2 uses segments instead of next_payload_len, part 1.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async: perform V2 frame dispatch in dedicated method.
Radoslaw Zarzynski [Wed, 13 Feb 2019 18:13:43 +0000 (19:13 +0100)]
msg/async: perform V2 frame dispatch in dedicated method.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>