Commit Graph

96033 Commits

Author SHA1 Message Date
Sage Weil
13d7c4f4ec Merge PR #26898 into nautilus
* refs/pull/26898/head:
	osd/PG: invalidate PG if merging with unexpected version
	osd,mon: include more pg merge metadata in pg_pool_t
	qa/standalone/osd/pg-split-merge.sh: reproduce pg merge problem with empty pgs
	osd: add osd_debug_no_{acting_change,purge_strays}

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-14 22:37:18 -05:00
Sage Weil
f1ab4ee685 Merge PR #26905 into nautilus
* refs/pull/26905/head:
	mgr: Cleanup get_localized_module_option function

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-03-14 17:17:25 -05:00
Sage Weil
d216aed387 Merge PR #26875 into nautilus
* refs/pull/26875/head:
	common: implement HMACs on top of OpenSSL.
	msg/async, v2: switch the pre-auth mechanism to HMAC-SHA256.
	include/types: beef sha_digest_t up with encode and compare.
	auth: add hmac_sha256() to CryptoKey.
	msg/async, v2: introduce pre_auth exchanges with CRC32.
	msg/async, v2: introduce pre_auth buffers.
	msg/async, v2: rectify the encapsulation of rx_segments_{desc,data}.
	msg/async, v2: rework decoding of MessageFrame.
	msg/async, v2: limit the num_segments to non-empty segments.
	msg/async, v2: drop the bl onwire space optimization in ControlFrames.
	msg/async, v2: clean up ret handling in ProtocolV2::write().
	msg/async, v2: drop next_payload_len as we don't need anymore.
	msg/async, v2: drop temp_buffer and limitations driven by it.
	msg/async, v2: switch to rx_buffer_t entirely.
	msg/async, v2: rx continuations use buffer::ptr_node.
	msg/async, v2: use bptr continuation for segment reading.
	msg/async: introduce bptr-carrying continuations.
	msg/async: replace CONTINUATION_PARAM() with specialized types.
	msg/async, v2: ::_banner_exchange() takes CtRef instead of CtPtr.
	msg/async: avoid extra pointers in continuation definitions.
	msg/async, v2: dissect setting stream handlers into ::finish_auth().
	msg/async, v2: drop ceph_msg_header2 handling from ControlFrames.
	msg/async, v2: drop the SignedEncryptedFrame entirely.
	msg/async, v2: reintroduce segment aligment. It's compile-time now.
	msg/async, v2: generalize Frame about number of segments.
	msg/async, v2: rework and generalize Frame encryption.
	msg/async, v2: rework the class hierarchy - introduce MessageFrame.
	msg/async, v2: rework the class hierarchy - introduce ControlFrame.
	msg/async/ProtocolV2: remove obsolete AuthFlags

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-14 10:04:14 -05:00
Jason Dillaman
bf53d69b7e
Merge pull request #26918 from trociny/wip-rbd-bench-wait-on-interrupted
rbd: wait for all io complete when bench is interrupted

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-03-14 10:27:03 -04:00
Volker Theile
9dc6de446d mgr: Cleanup get_localized_module_option function
Address comments from https://github.com/ceph/ceph/pull/26736.

Signed-off-by: Volker Theile <vtheile@suse.com>
2019-03-14 13:43:29 +01:00
Sage Weil
7831b989e8 Merge PR #26948 into nautilus
* refs/pull/26948/head:
	rbd-nbd: fix segfault for list-mapped command

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-14 07:22:30 -05:00
Sage Weil
e3085f4262 Merge PR #26864 into nautilus
* refs/pull/26864/head:
	rados: update to latest ver. of dmclock lib w performance enhancements

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-14 07:07:26 -05:00
Sage Weil
dc8a49697f Merge PR #26921 into nautilus
* refs/pull/26921/head:
	mgr/telemetry: fix 'telemetry {on,off}'

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-14 07:01:46 -05:00
Sage Weil
8fde68152d Merge PR #26924 into nautilus
* refs/pull/26924/head:
	auth/cephx: fix decode_encrypt error handling
	auth/cephx: fix encode_encrypt error handling

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-14 06:59:05 -05:00
Lenz Grimmer
d8b10c3417
Merge pull request #26951 from ricardoasmarques/validate-ceph-iscsi-config-version-nautilus
nautilus: mgr/dashboard: Validate `ceph-iscsi` config version

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-03-14 12:42:32 +01:00
Ricardo Marques
1db73ca778 mgr/dashboard: Validate ceph-iscsi config version
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit b9b2b562cc)
2019-03-14 09:42:55 +00:00
Mykola Golub
a5a49f3871 rbd-nbd: fix segfault for list-mapped command
The global ceph context is not initialized when list-mapped command
is issued.

The regression was introduced by a92628f285.

Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-03-14 07:47:34 +00:00
Patrick Donnelly
7de8cb405c
Merge PR #26935 into nautilus
* refs/pull/26935/head:
	qa: extend MDS heartbeat grace for valgrind

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-13 20:37:03 -07:00
Patrick Donnelly
505a05f351
Merge PR #26916 into nautilus
* refs/pull/26916/head:
	qa: ignore MON_DOWN for volume-client testing

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-13 20:31:01 -07:00
Sage Weil
4bb4f7a891 Merge PR #26894 into nautilus
* refs/pull/26894/head:
	qa/standalone/erasure-code/test-erasure-code: adjust test to avoid m=0
	erasure-code: ensure m >= 1
	mon/OSDMonitor: set ec min_size to k + min(1, m - 1)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-13 22:07:45 -05:00
Patrick Donnelly
beea915c01
Merge PR #26919 into nautilus
* refs/pull/26919/head:
	doc: add CephFS notes for nautilus

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-13 13:23:52 -07:00
Patrick Donnelly
145c37c048
doc: add CephFS notes for nautilus
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-03-13 11:51:06 -07:00
Sage Weil
decb964626 Merge remote-tracking branch 'gh/nautilus' 2019-03-13 13:31:03 -05:00
Sage Weil
52d5797c3d qa/standalone/erasure-code/test-erasure-code: adjust test to avoid m=0
_DD is k=2 m=0, which we don't allow.  Switch it to cDD.

I confess I don't fully understand why this was _DD to begin with, but
I'm pretty sure mapping is there to control the order of results so that
it can be mapped to the CRUSH rule output sanely, and the coding portion
is not relevant to the test.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-13 12:46:50 -05:00
Patrick Donnelly
7b520755ce
qa: extend MDS heartbeat grace for valgrind
Valgrind makes the MDS slowwwww. The newish mds_heartbeat_grace config allows
us to keep sending beacons to the mons even if the internal heartbeat is slow.
This avoids the laggy messages which are useful to grep for unrelated messaging
issues.

Fixes: http://tracker.ceph.com/issues/38723
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-03-13 09:18:32 -07:00
Lenz Grimmer
bb3b2471ac
Merge pull request #26790 from ricardoasmarques/iscsi-passwords-with-slash
mgr/dashboard: iSCSI - Support iSCSI passwords with '/'

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
2019-03-13 17:07:18 +01:00
Sage Weil
497e00c4da mgr/telemetry: fix 'telemetry {on,off}'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-13 10:32:18 -05:00
Ricardo Marques
a5c6cc8bb2 mgr/dashboard: Always get iSCSI passwords decrypted
Fixes: https://tracker.ceph.com/issues/38630

Signed-off-by: Ricardo Marques <rimarques@suse.com>
2019-03-13 15:00:04 +00:00
Ricardo Marques
864c05fade mgr/dashboard: Support iSCSI password with '/'
Signed-off-by: Ricardo Marques <rimarques@suse.com>
2019-03-13 15:00:04 +00:00
Lenz Grimmer
d239b3c0e7
Merge pull request #26765 from p-na/wip-pna-rbd-conf-table-search
mgr/dashboard: Fix search in `Source` column of RBD configuration list

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-13 15:37:28 +01:00
Lenz Grimmer
57d6cc93bf
Merge pull request #26766 from p-na/wip-pna-fix-table-search
mgr/dashboard: Search broken for entries with null values

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-13 15:27:10 +01:00
Casey Bodley
f80051b4ce
Merge pull request #26800 from linuxbox2/wip-rgw-limitcheck-trunc
rgw: bucket limit check misbehaves for > max-entries buckets (usually…

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-03-13 09:53:08 -04:00
Sage Weil
96b837830c Merge PR #26920 into master
* refs/pull/26920/head:
	qa/tasks/mgr/test_module_selftest: fix localized value test
	mgr/BaseMgrStandbyModule: parse prefix properly

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-03-13 08:16:20 -05:00
Boris Ranto
4b3db559e7
Merge pull request #26756 from badone/wip-f28-broken-Cython-dep
rpm: Install python2-Cython on f28

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2019-03-13 13:31:15 +01:00
Sage Weil
ebdd003bf4 qa/tasks/mgr/test_module_selftest: fix localized value test
When mgr/selftest/testkey = foo and mgr/selftest/x/testkey is not set,
then get_localized() should return foo.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-13 07:11:47 -05:00
Sage Weil
0eaad2d8d8 Merge PR #26886 into master
* refs/pull/26886/head:
	crush/CrushWrapper: ensure crush_choose_arg_map.size == max_buckets

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-03-13 06:56:16 -05:00
Sage Weil
d5aa4ff8f1 Merge PR #26917 into master
* refs/pull/26917/head:
	osd/osd_types: include omap and hit_set_archive bytes in pool usage

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-13 06:55:58 -05:00
xie xingguo
d44b055487 auth/cephx: fix decode_encrypt error handling
**decode_encrypt** returns 0 on success, 1 otherwise

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-03-13 17:21:24 +08:00
Ricardo Marques
dacde1548d
Merge pull request #26788 from ricardoasmarques/iscsi-docs-password
doc/rbd/iscsi-target-cli: Update auth command

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-03-13 09:20:09 +00:00
xie xingguo
19d8ef6f00 auth/cephx: fix encode_encrypt error handling
**encode_encrypt** returns 0 on success, 1 otherwise

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-03-13 16:30:54 +08:00
Brad Hubbard
6de7111e73 rpm: Install python2-Cython in python2 environment
do_cmake.sh tests for Cython module version in python2

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2019-03-13 12:22:31 +10:00
Radoslaw Zarzynski
9a391a235c common: implement HMACs on top of OpenSSL.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-13 01:23:09 +01:00
Radoslaw Zarzynski
8e324a5851 msg/async, v2: switch the pre-auth mechanism to HMAC-SHA256.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-13 01:23:09 +01:00
Radoslaw Zarzynski
39573a06d3 include/types: beef sha_digest_t up with encode and compare.
BEWARE: sha_digest_t is part of our public. The commit tries to
preserve it as the cost of avoiding a clean-up.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-13 01:23:09 +01:00
Radoslaw Zarzynski
dc4dceffef auth: add hmac_sha256() to CryptoKey.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-13 01:23:08 +01:00
Radoslaw Zarzynski
a70a3563b0 msg/async, v2: introduce pre_auth exchanges with CRC32.
CRC32 is just scaffolding and will be replaced with
HMAC-SHA256 or other msg auth code.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-13 01:23:08 +01:00
Boris Ranto
5965b6c164
Merge pull request #26880 from pcuzner/prom-add-recovery-metrics
mgr/prometheus: Add recovery metrics

Reviewed-by: Boris Ranto <branto@redhat.com>
2019-03-13 01:07:09 +01:00
Sage Weil
e66ed5883c mgr/BaseMgrStandbyModule: parse prefix properly
Fixes: http://tracker.ceph.com/issues/38705
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-12 16:45:32 -05:00
Boris Ranto
8d9c6c209f
Merge pull request #26712 from badone/wip-b64decode-decorator-traceback
pybind/mgr/restful: Decode the output of b64decode

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2019-03-12 20:46:59 +01:00
David Zafman
3ab9f38799
Merge pull request #26899 from dzafman/wip-38678
Minor cleanups in tests and log output

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-12 12:41:40 -07:00
Mykola Golub
95b6a760b6 rbd: wait for all io complete when bench is interrupted
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-03-12 18:24:19 +00:00
Sage Weil
a413c60e5a Merge PR #26890 into master
* refs/pull/26890/head:
	ceph.spec.in: add libstoragemgmt to mgr package

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-12 13:15:32 -05:00
Sage Weil
ab0a652826 erasure-code: ensure m >= 1
Fixes: http://tracker.ceph.com/issues/38682
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-12 13:12:58 -05:00
Patrick Donnelly
4f3df2cc82
Merge PR #26893 into master
* refs/pull/26893/head:
	qa: unmount clients prior to marking fs down

Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-03-12 10:47:53 -07:00
Sage Weil
55b4d52e28 osd/osd_types: include omap and hit_set_archive bytes in pool usage
- Include the hit_set_archive bytes if we're in legacy mode.

- Add in (estimated) omap bytes for both nautilus+ and legacy mode, since
we didn't break out omap usage by pool (oops!).

Fixes: http://tracker.ceph.com/issues/38703
Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-12 12:42:23 -05:00