Commit Graph

95494 Commits

Author SHA1 Message Date
Brad Hubbard
504ab05463 tools/ceph_kvstore_tool: Move summary output to print_summary
Post 301a64212f we are still seeing an ICE
in the copy_store_to code. Moving the summary printing to its own
function alleviates the issue.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2019-02-27 18:17:28 +10:00
Kefu Chai
bc9ac5a5d5
Merge pull request #26527 from iotcg/doc
use preferred commands for ceph config-key

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-27 11:08:05 +08:00
Kefu Chai
97d0a1098e
Merge pull request #26558 from k0ste/prometheus_metadata
mgr/prometheus: get osd_objectstore once instead twice.

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-02-27 10:49:24 +08:00
Patrick Donnelly
8d6fb148f9
Merge PR #26646 into master
* refs/pull/26646/head:
	doc: fix typo in objectops.rst

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-26 12:04:20 -08:00
Andrew Schoen
a125087d25
Merge pull request #26627 from jan--f/c-v-38472
ceph-volume: don't create osd['block.db'] by default

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2019-02-26 10:35:22 -06:00
Andrew Schoen
3c2595d280
Merge pull request #26225 from jan--f/c-v-simple-activate-all
ceph-volume: add --all flag to simple activate

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2019-02-26 09:27:10 -06:00
Lenz Grimmer
aded02d065
Merge pull request #26481 from votdev/gitignore_wheelhouse
mgr: Ignore __pycache__ and wheelhouse dirs

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-02-26 15:44:42 +01:00
Lenz Grimmer
01c7fae349
Merge pull request #26338 from rhcs-dashboard/ts-cleanup
mgr/dashboard: typescript cleanup

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-02-26 15:06:43 +01:00
Sage Weil
e4b45b9849 Merge PR #26636 into master
* refs/pull/26636/head:
	messages/MMonMgrDigest: use set_data() to avoid screwing up byte_throttler

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-02-26 06:40:48 -06:00
Matt Benjamin
c5f21d2212
Merge pull request #26130 from minshenglin/wip-37855
rgw_file: use correct secret key to check auth
2019-02-26 07:05:09 -05:00
Lan Liu
0a875211a5 doc: fix typo in objectops.rst
Signed-off-by: Lan Liu <liulan@umcloud.com>
2019-02-26 18:07:43 +08:00
Changcheng Liu
2ef3243121 doc: use preferred commands for ceph config-key
'del' & 'list' & 'put' are deprecated. It's preferred to
using 'rm' & 'ls' & 'set' for ceph config-key

Signed-off-by: Changcheng Liu <changcheng.liu@intel.com>
2019-02-26 09:01:14 +08:00
Xie Xingguo
59a99dfbd7
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>
2019-02-26 08:42:37 +08:00
Sage Weil
d2a3168bf3 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>
2019-02-25 16:41:40 -06:00
Sage Weil
ff7fd6d930 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>
2019-02-25 16:41:16 -06:00
Sage Weil
4059cbd756 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>
2019-02-25 16:40:46 -06:00
Sage Weil
1f909bc88b 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>
2019-02-25 16:40:12 -06:00
Matt Benjamin
d82c9d5807
Merge pull request #22755 from zhangsw/feature-rgw-appendobj
rgw: Add append object api.
2019-02-25 17:29:10 -05:00
Patrick Donnelly
31940a8743
Merge PR #26610 into master
* refs/pull/26610/head:
	doc: updated governance link for Ceph project leads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-25 12:25:11 -08:00
Mykola Golub
40dfac3638
Merge pull request #26603 from dillaman/wip-38453
rbd-mirror: use active/active policy by default

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-02-25 21:13:16 +02:00
Sage Weil
df32d57638 messages/MMonMgrDigest: use set_data() to avoid screwing up byte_throttler
Use the existing set_data() helper to avoid breaking the byte_throttler
accounting.

Fixes e4ae368ff7

Fixes: http://tracker.ceph.com/issues/38295
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-25 12:41:59 -06:00
Sage Weil
dddb858f5d 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>
2019-02-25 10:44:43 -06:00
Sage Weil
781f314180 Merge PR #26609 into master
* refs/pull/26609/head:
	ceph_test_msgr: skip injection test for simplemessenger

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-02-25 10:32:01 -06:00
jtlayton
d86a0d55cb
Merge pull request #26600 from jtlayton/wip-dashboard-rook
mgr/dashboard: special casing for minikube in run-backend-rook-api-request.sh
2019-02-25 17:28:43 +01:00
Mykola Golub
8cd3062323 rbd-mirror: use active/active policy by default
Fixes: http://tracker.ceph.com/issues/38453
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2019-02-25 11:23:25 -05:00
David Zafman
ce975581a6
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>
2019-02-25 08:20:49 -08:00
Sage Weil
4f1df7184e 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>
2019-02-25 10:08:07 -06:00
Sage Weil
d1c3b40ea0 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>
2019-02-25 08:44:23 -06:00
Sage Weil
1b52c723f8 Merge PR #26487 into master
* refs/pull/26487/head:
	CLI: ability to change file ownership

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-02-25 08:43:57 -06:00
Sage Weil
9e3866620b 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>
2019-02-25 08:43:40 -06:00
Sage Weil
47af6314d1 doc/releases/nautilus: note about msgr2
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-25 08:39:23 -06:00
Sage Weil
9183431e16 doc/releases/nautilus: rgw highlights
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-25 08:39:23 -06:00
Sage Weil
fdf75b2d22 doc/releases/nautilus: draft notes
Signed-off-by: Sage Weil <sage@redhat.com>
2019-02-25 08:39:23 -06:00
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
Lenz Grimmer
55dd5e11ce
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>
2019-02-25 13:12:22 +01:00
Jan Fajerski
f648ba1d9a ceph-volume: don't create osd['block.db'] by default
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2019-02-25 12:55:42 +01:00
Tim Serong
be98097979 rpm,cmake: additional fixes to make amqp support optional
Signed-off-by: Tim Serong <tserong@suse.com>
2019-02-25 19:49:20 +11:00
Kefu Chai
4530e4874e
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>
2019-02-25 16:44:20 +08:00
Tim Serong
7e34b27676 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>
2019-02-25 19:05:14 +11:00
Yingxin Cheng
a8ddabb8ab 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>
2019-02-25 14:36:29 +08:00
Yingxin Cheng
b9b0c61bf7 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>
2019-02-25 14:32:13 +08:00
Brad Hubbard
ff324f450c rpm: Fix pyOpenSSL dependency
Fedora29 does not have pyOpenSSL but it does have python-pyOpenSSL

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2019-02-25 13:37:23 +10:00
James McClune
0dc5000124 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>
2019-02-24 16:08:44 -05:00
James McClune
93b904b32a 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>
2019-02-24 15:58:02 -05: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