Commit Graph

95434 Commits

Author SHA1 Message Date
Sage Weil
5c82ada83b ceph_test_msgr: skip injection test for simplemessenger
The interceptor is only implemented in asyncmessenger.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-25 08:34:45 -06:00
Sage Weil
d7a279f759 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>
2019-02-24 09:33:32 -06:00
Xie Xingguo
be26cb08e5
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>
2019-02-23 15:30:14 +08:00
xie xingguo
fa98f09674 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>
2019-02-23 12:18:24 +08:00
Radoslaw Zarzynski
1ea97560e4 msg/async, v2: fix wrong base for KeepAliveFrameAck.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-23 01:49:17 +01:00
Sage Weil
a0ea40bc5c 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>
2019-02-22 16:00:25 -06:00
David Zafman
99af224af2
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>
2019-02-22 12:52:37 -08:00
Neha Ojha
7c965b1778 Revert "pybind: set language_level for cythonize explicitly"
This reverts commit ded3d43dbf.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-02-22 11:41:55 -08:00
Neha Ojha
ce515221a2 Revert "pybind: auto encode/decode cstr"
This reverts commit c36d0f1a7d.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-02-22 11:41:04 -08:00
Mykola Golub
cd0d6e2e31
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>
2019-02-22 18:57:10 +02:00
Lenz Grimmer
5a742c68cc
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>
2019-02-22 17:48:25 +01:00
Matt Benjamin
a25d30b894
Merge pull request #26515 from theanalyst/civetweb-fixes-n
civetweb: pull up to ceph-master
2019-02-22 09:20:38 -05:00
Sage Weil
be257763f9 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>
2019-02-22 07:14:33 -06:00
Sage Weil
b700dca795 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>
2019-02-22 07:11:28 -06:00
Sage Weil
7633fff7d0 Merge PR #26552 into master
* refs/pull/26552/head:
	osdc/Objecter: invalidate crcs on preallocated rx buffers

Reviewed-by: Sage Weil <sage@redhat.com>
2019-02-22 07:10:51 -06:00
Sage Weil
6888565dbf 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>
2019-02-22 07:10:32 -06:00
Abhishek Lekshmanan
90c6e1d2f5 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>
2019-02-22 13:37:50 +01:00
Kefu Chai
80784dd9dc
Merge pull request #26584 from capri1989/doc-fixes
doc: Remove value 'mon_osd_max_split_count'

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-22 19:31:58 +08:00
Kai Wagner
1bf96668a5 doc: Remove value 'mon_osd_max_split_count' from the docs
Signed-off-by: Kai Wagner <kwagner@suse.com>
2019-02-22 11:16:34 +01:00
Lenz Grimmer
72ef9b58ec
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>
2019-02-22 10:28:41 +01:00
Kefu Chai
ae786b93c8
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>
2019-02-22 15:44:52 +08:00
Kefu Chai
66fb02dcfe
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>
2019-02-22 15:39:55 +08:00
Kefu Chai
381667c120
Merge pull request #26582 from tchaikov/wip-cmake-silence-syntax-warning
cmake: fix syntax error of set()

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-02-22 15:37:09 +08:00
Kefu Chai
8a6658f8a9 cmake: fix syntax error of set()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-22 13:43:00 +08:00
Kefu Chai
818e1031d0 install-deps,do_freebsd: disable amqp support
per Willem's request.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-22 10:30:25 +08:00
Kefu Chai
dd5bc2ff21 rpm: disable amqp endpoint on SLE/OpenSUSE
as librabbitmq-devel is not packaged on them yet.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-22 10:30:25 +08:00
Kefu Chai
ba9da1f76e cmake: remove amqp_mock from UNITTEST_LIBS
this mock library is only used by rgw tests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-02-22 10:30:25 +08:00
Radoslaw Zarzynski
774bd9d99e 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>
2019-02-22 00:01:05 +01:00
Radoslaw Zarzynski
2ef6329081 msg/async, v2: drop ceph_msg_header2 fields duplicating segment info.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:04 +01:00
Radoslaw Zarzynski
8bb18a8353 msg/async, v2: drop the scaffolding in preamble parsing.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:04 +01:00
Radoslaw Zarzynski
2c2867ad27 msg/async, v2: handle msg authentication failures.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:04 +01:00
Radoslaw Zarzynski
fe387e02b1 msg/async, v2: drop depedency on uint128_t. Clean up onwire crypto.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
fa7e6d6d10 msg/async, v2: fix cur_msg_size in ::reset_recv_state().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
8d49bc3cce msg/async, v2: drop magic numbers for segments.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
50b5174637 msg/async, v2: get rid of magic number in SignedEncryptedFrame.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
4423434d26 msg/async, v2: get rid of the magic number for default alignment.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
813a8e1ba3 msg/async, v2: decouple onwire segment length from logical length.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:03 +01:00
Radoslaw Zarzynski
da0766454a msg/async, v2: follow the const bl& concept in authenticated_encrypt_update().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:02 +01:00
Radoslaw Zarzynski
0d9299df43 msg/async, v2: drop handling of extra segments in ::fill_preamble().
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:02 +01:00
Radoslaw Zarzynski
7adfc3102f msg/async, v2: get rid of magic numbers for alignment.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:02 +01:00
Radoslaw Zarzynski
61d2d4ab6a msg/async, v2: drop reserve() from onwire crypto's TxHandler.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:02 +01:00
Sage Weil
3bd82834a0 msg/async: add con_mode to debug lines
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-21 23:31:02 +01:00
Sage Weil
94f4cb2ff5 msg/DispatchQueue: include con_mode in <== line
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-21 23:31:01 +01:00
Sage Weil
2ee03d1b18 common/ceph_strings: get_con_mode_name()
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-21 23:31:01 +01:00
Sage Weil
0b7ef076f3 msg/Connection: add get_con_mode()
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-21 23:31:01 +01:00
Sage Weil
28646a6cec msg/async/ProtocolV2: clean up preamble comments
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-21 23:31:01 +01:00
Radoslaw Zarzynski
dbf8700513 msg/async, v2: improve debug around sending client indent.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:01 +01:00
Radoslaw Zarzynski
e02b2f5c88 msg/async, v2: bring back the no-encryption ability.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:01 +01:00
Radoslaw Zarzynski
ee8deb4de8 msg/async, v2: workaround con_mode handling.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:00 +01:00
Radoslaw Zarzynski
9ef345fdf7 msg/async, v2: drop the throttles bypass.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-02-21 23:31:00 +01:00