]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agomgr/orchestrator: Add error handling to interface 27095/head
Sebastian Wagner [Wed, 13 Feb 2019 14:01:25 +0000 (15:01 +0100)]
mgr/orchestrator: Add error handling to interface

Also:

* Small test_orchestrator refactorization
* Improved Docstring in MgrModule.remote
* Added `raise_if_exception` that raises Exceptions
* Added `OrchestratorError` and `OrchestratorValidationError`
* `_orchestrator_wait` no longer raises anything
* `volumes` model also calls `raise_if_exception`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 61d53ed70e2deafd6bebdf0a8e569cdc46b89e97)

6 years ago14.2.0 v14.2.0
Jenkins Build Slave User [Mon, 18 Mar 2019 10:08:29 +0000 (10:08 +0000)]
14.2.0

6 years agoMerge PR #26956 into nautilus
Sage Weil [Mon, 18 Mar 2019 04:09:34 +0000 (23:09 -0500)]
Merge PR #26956 into nautilus

* refs/pull/26956/head:
doc/releases/nautilus: more detail around ceph-volume step

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #27011 from liewegas/wip-redirect-mimic
Kefu Chai [Sun, 17 Mar 2019 17:22:44 +0000 (01:22 +0800)]
Merge pull request #27011 from liewegas/wip-redirect-mimic

qa/suites/upgrade/mimic-x/parallel: enable all classes

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27018 from liewegas/wip-38294
Kefu Chai [Sun, 17 Mar 2019 17:22:01 +0000 (01:22 +0800)]
Merge pull request #27018 from liewegas/wip-38294

qa/suites/upgrade/luminous-x: disable c-o-t import/export tests between versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #26960 into nautilus
Sage Weil [Sun, 17 Mar 2019 13:32:11 +0000 (08:32 -0500)]
Merge PR #26960 into nautilus

* refs/pull/26960/head:
ceph_release: nautilus is will be 'stable' for v14.2.0

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
6 years agoqa/suitse/upgrade/luminous-x/stress-split-erasure-code: disable c-o-t tests 27018/head
Sage Weil [Sun, 17 Mar 2019 09:59:36 +0000 (04:59 -0500)]
qa/suitse/upgrade/luminous-x/stress-split-erasure-code: disable c-o-t tests

The stress-split thrasher already had this off, but the ec variant did
not.  We don't support ceph-objectstore-tool exports/imports between major
versions.

Fixes: http://tracker.ceph.com/issues/38294
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_rados_api_tier_cxx: remove mimic checks 27011/head
Sage Weil [Sat, 16 Mar 2019 22:12:01 +0000 (17:12 -0500)]
ceph_test_rados_api_tier_cxx: remove mimic checks

These checks don't work when the cluster is newer than mimic.

Instead, let's just try not to run this test on a pre-mimic cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27002 into nautilus
Sage Weil [Sat, 16 Mar 2019 20:47:29 +0000 (15:47 -0500)]
Merge PR #27002 into nautilus

* refs/pull/27002/head:
mgr/telemetry: check for errors when sending report

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/upgrade/mimic-x/parallel: enable all classes
Sage Weil [Sat, 16 Mar 2019 20:27:29 +0000 (15:27 -0500)]
qa/suites/upgrade/mimic-x/parallel: enable all classes

This fixes the redirect tiering tests, which need the 'cas' class.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_test_rados_api_tier_cxx: remove luminous check
Sage Weil [Sat, 16 Mar 2019 20:21:37 +0000 (15:21 -0500)]
ceph_test_rados_api_tier_cxx: remove luminous check

It was a flawed check, since it would fail for anything newer than
luminous.  And in any case, we don't need it anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27000 into nautilus
Sage Weil [Sat, 16 Mar 2019 18:03:54 +0000 (13:03 -0500)]
Merge PR #27000 into nautilus

* refs/pull/27000/head:
osd: stringify as int

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/telemetry: check for errors when sending report 27002/head
Dan Mick [Sat, 16 Mar 2019 03:05:46 +0000 (20:05 -0700)]
mgr/telemetry: check for errors when sending report

There was no error checking, and the server has been failing for
some time, but no one noticed.  Oops.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
6 years agoMerge PR #26563 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:49:02 +0000 (16:49 -0500)]
Merge PR #26563 into nautilus

* refs/pull/26563/head:
doc/ceph-volume/lvm/batch: fix typos

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26994 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:48:27 +0000 (16:48 -0500)]
Merge PR #26994 into nautilus

* refs/pull/26994/head:
doc: add scrub link for nautilus release notes

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26822 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:45:53 +0000 (16:45 -0500)]
Merge PR #26822 into nautilus

* refs/pull/26822/head:
osd/PG: adjust pg history on fabricated merge target if necessary

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #26986 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:43:33 +0000 (16:43 -0500)]
Merge PR #26986 into nautilus

* refs/pull/26986/head:
mgr: Make 3rd parameter optional in ceph_get_module_option

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26949 into nautilus
Sage Weil [Fri, 15 Mar 2019 21:43:17 +0000 (16:43 -0500)]
Merge PR #26949 into nautilus

* refs/pull/26949/head:
mgr/dashboard: add test_module_selftest to API tests

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoosd: stringify as int 27000/head
Sage Weil [Fri, 15 Mar 2019 21:41:53 +0000 (16:41 -0500)]
osd: stringify as int

Otherwise we get

$ hexdump -C require_osd_release
00000000  0e 0a                                             |..|
00000002

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/releases/nautilus: more detail around ceph-volume step 26956/head
Sage Weil [Thu, 14 Mar 2019 19:43:08 +0000 (14:43 -0500)]
doc/releases/nautilus: more detail around ceph-volume step

Recommend host reboots to verify ceph-volume adoption worked.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26997 from cbodley/wip-38008
Casey Bodley [Fri, 15 Mar 2019 21:06:34 +0000 (17:06 -0400)]
Merge pull request #26997 from cbodley/wip-38008

doc/rgw: document placement targets and storage classes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
6 years agoMerge PR #26995 into nautilus
Sage Weil [Fri, 15 Mar 2019 20:29:04 +0000 (15:29 -0500)]
Merge PR #26995 into nautilus

* refs/pull/26995/head:
osd/PG: fix pg merge check for rc clusters

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agodoc/rgw: document storage class configuration 26997/head
Casey Bodley [Fri, 15 Mar 2019 18:29:43 +0000 (14:29 -0400)]
doc/rgw: document storage class configuration

Fixes: http://tracker.ceph.com/issues/38008
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agodoc/rgw: document placement target configuration
Casey Bodley [Fri, 15 Mar 2019 18:35:13 +0000 (14:35 -0400)]
doc/rgw: document placement target configuration

Fixes: http://tracker.ceph.com/issues/24508
Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoosd/PG: fix pg merge check for rc clusters 26995/head
Sage Weil [Fri, 15 Mar 2019 17:24:52 +0000 (12:24 -0500)]
osd/PG: fix pg merge check for rc clusters

If a cluster had a pg merge pending before last_pg_merge_meta was
introduced then the source_pgid will be pg_t().  If that's the case,
skip these new checks.

Likewise, if we decode a legacy pg_pool_t, put the old merge les/lec
values into the correct location.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc: add scrub link for nautilus release notes 26994/head
Patrick Donnelly [Fri, 15 Mar 2019 17:15:58 +0000 (10:15 -0700)]
doc: add scrub link for nautilus release notes

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26958 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:09:35 +0000 (12:09 -0500)]
Merge PR #26958 into nautilus

* refs/pull/26958/head:
mon: avoid using naked pointer
msg/async: do not "return std::move(local_var)"
mon: do not assert on bad auth payload

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge PR #26959 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:09:18 +0000 (12:09 -0500)]
Merge PR #26959 into nautilus

* refs/pull/26959/head:
mgr/crash: include entity (instead of daemon) in 'crash ls'

Reviewed-by: Dan Mick <dmick@redhat.com>
6 years agoMerge PR #26965 into nautilus
Sage Weil [Fri, 15 Mar 2019 17:08:34 +0000 (12:08 -0500)]
Merge PR #26965 into nautilus

* refs/pull/26965/head:
ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big
msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge PR #26974 into nautilus
Patrick Donnelly [Fri, 15 Mar 2019 16:36:57 +0000 (09:36 -0700)]
Merge PR #26974 into nautilus

* refs/pull/26974/head:
doc: add cephfs scrub related admin document

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26984 from ricardoasmarques/remove-iscsi-gateway-param-nautilus
Lenz Grimmer [Fri, 15 Mar 2019 15:40:40 +0000 (16:40 +0100)]
Merge pull request #26984 from ricardoasmarques/remove-iscsi-gateway-param-nautilus

mgr/dashboard: Drop iSCSI gateway name parameter

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agomgr: Make 3rd parameter optional in ceph_get_module_option 26986/head
Volker Theile [Fri, 15 Mar 2019 14:42:44 +0000 (15:42 +0100)]
mgr: Make 3rd parameter optional in ceph_get_module_option

Fixes: https://tracker.ceph.com/issues/38766
File "/usr/share/ceph/mgr/mgr_module.py", line 863, in _handle_command
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:    return self.handle_command(inbuf, cmd)
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 114, in handle_command
2019-03-15T11:28:31.324 INFO:tasks.ceph.mgr.x.mira117.stderr:    self._self_test()
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 213, in _self_test
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    self._self_test_config()
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/selftest/module.py", line 313, in _self_test_config
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    assert self.get_module_option_ex("foo", "bar") is None
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:  File "/usr/share/ceph/mgr/mgr_module.py", line 942, in get_module_option_ex
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:    r = self._ceph_get_module_option(module, key)
2019-03-15T11:28:31.325 INFO:tasks.ceph.mgr.x.mira117.stderr:TypeError: ceph_get_module_option() takes exactly 3 arguments (2 given)

Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agomgr/dashboard: Drop iSCSI gateway name parameter 26984/head
Ricardo Marques [Fri, 15 Mar 2019 13:50:09 +0000 (13:50 +0000)]
mgr/dashboard: Drop iSCSI gateway name parameter

iSCSI gateway name will now be obtained from the
ceph-iscsi `/api/sysinfo/hostname` endpoint

Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #26971 from theanalyst/nautilus-rgw-enoent-mdlog
Casey Bodley [Fri, 15 Mar 2019 13:31:34 +0000 (09:31 -0400)]
Merge pull request #26971 from theanalyst/nautilus-rgw-enoent-mdlog

rgw_sync: drop ENOENT error logs from mdlog

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agomon: avoid using naked pointer 26958/head
Kefu Chai [Fri, 15 Mar 2019 03:27:53 +0000 (11:27 +0800)]
mon: avoid using naked pointer

to save our trouble to delete auth_handler in the error handling paths

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomsg/async: do not "return std::move(local_var)"
Kefu Chai [Fri, 15 Mar 2019 03:22:13 +0000 (11:22 +0800)]
msg/async: do not "return std::move(local_var)"

it prevents copy elision. and both GCC and Clang warn like

warning: moving a local object in a return statement prevents copy
elision [-Wpessimizing-move]

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomon: do not assert on bad auth payload
Sage Weil [Thu, 14 Mar 2019 21:46:21 +0000 (16:46 -0500)]
mon: do not assert on bad auth payload

If we get garbage, fail to authenticate--do not assert out and crash.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big 26965/head
Sage Weil [Fri, 15 Mar 2019 11:27:17 +0000 (06:27 -0500)]
ms/async/ProtocolV2: add ms_die_on_bug and assert rxbuf/txbuf don't get big

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomsg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state
Sage Weil [Fri, 15 Mar 2019 03:50:29 +0000 (22:50 -0500)]
msg/async/ProtocolV2: do not reenable pre_auth buffering on from reset_recv_state

This is specifically bad because we call reset_recv_state from
reuse_connection, which turns buffering back on on an already-authenticated
session.

Instead, reenable it only when we set the state to START_CONNECT.  (On
the accepting side, it is a fresh connection, so it starts out true.)
Also, we want to *disable* it on the connection we are reusing, which
might be in a pre-auth state, while we are in a post-auth state.

Fixes: http://tracker.ceph.com/issues/38746
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26738 from votdev/fix_docs
Lenz Grimmer [Fri, 15 Mar 2019 09:38:00 +0000 (10:38 +0100)]
Merge pull request #26738 from votdev/fix_docs

mgr/dashboard: Fix issues in controllers/docs

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tina Kallio <tina.kallio@gmail.com>
6 years agodoc: add cephfs scrub related admin document 26974/head
Venky Shankar [Fri, 15 Mar 2019 09:26:47 +0000 (14:56 +0530)]
doc: add cephfs scrub related admin document

Fixes: http://tracker.ceph.com/issues/38728
Signed-off-by: Venky Shankar <vshankar@redhat.com>
6 years agorgw_sync: drop ENOENT error logs from mdlog 26971/head
Abhishek Lekshmanan [Tue, 12 Mar 2019 10:09:03 +0000 (11:09 +0100)]
rgw_sync: drop ENOENT error logs from mdlog

Since this commonly occurs and isn't an error of concern at level 1.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit c246abb3935266f9335cab97e52ab489cc7ebfd6)

6 years agoMerge PR #26898 into nautilus
Sage Weil [Fri, 15 Mar 2019 03:37:18 +0000 (22:37 -0500)]
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>
6 years agomgr/crash: include entity (instead of daemon) in 'crash ls' 26959/head
Sage Weil [Thu, 14 Mar 2019 22:12:11 +0000 (17:12 -0500)]
mgr/crash: include entity (instead of daemon) in 'crash ls'

The daemon name is implied by the entity, and the entity is more useful.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoceph_release: nautilus is will be 'stable' for v14.2.0 26960/head
Sage Weil [Thu, 14 Mar 2019 22:54:28 +0000 (17:54 -0500)]
ceph_release: nautilus is will be 'stable' for v14.2.0

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26905 into nautilus
Sage Weil [Thu, 14 Mar 2019 22:17:25 +0000 (17:17 -0500)]
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>
6 years agoMerge PR #26875 into nautilus
Sage Weil [Thu, 14 Mar 2019 15:04:14 +0000 (10:04 -0500)]
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>
6 years agoMerge pull request #26918 from trociny/wip-rbd-bench-wait-on-interrupted
Jason Dillaman [Thu, 14 Mar 2019 14:27:03 +0000 (10:27 -0400)]
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>
6 years agomgr: Cleanup get_localized_module_option function 26905/head
Volker Theile [Tue, 12 Mar 2019 09:06:01 +0000 (10:06 +0100)]
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>
6 years agoMerge PR #26948 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:22:30 +0000 (07:22 -0500)]
Merge PR #26948 into nautilus

* refs/pull/26948/head:
rbd-nbd: fix segfault for list-mapped command

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26864 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:07:26 +0000 (07:07 -0500)]
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>
6 years agoMerge PR #26921 into nautilus
Sage Weil [Thu, 14 Mar 2019 12:01:46 +0000 (07:01 -0500)]
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>
6 years agoMerge PR #26924 into nautilus
Sage Weil [Thu, 14 Mar 2019 11:59:05 +0000 (06:59 -0500)]
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>
6 years agoMerge pull request #26951 from ricardoasmarques/validate-ceph-iscsi-config-version...
Lenz Grimmer [Thu, 14 Mar 2019 11:42:32 +0000 (12:42 +0100)]
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>
6 years agomgr/dashboard: Validate `ceph-iscsi` config version 26951/head
Ricardo Marques [Fri, 8 Mar 2019 12:11:54 +0000 (12:11 +0000)]
mgr/dashboard: Validate `ceph-iscsi` config version

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit b9b2b562ccf5dc6469d11912ee28dd2d932fdb48)

6 years agomgr/dashboard: add test_module_selftest to API tests 26949/head
alfonsomthd [Thu, 14 Mar 2019 08:28:49 +0000 (09:28 +0100)]
mgr/dashboard: add test_module_selftest to API tests

* This test suite helps to catch mgr module regressions introduced by
dashboard feature/bugfix.
* Fixed: 'ceph -w' now behaves properly for Python 3.

Fixes: https://tracker.ceph.com/issues/38394
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
6 years agorbd-nbd: fix segfault for list-mapped command 26948/head
Mykola Golub [Thu, 14 Mar 2019 07:47:34 +0000 (07:47 +0000)]
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 a92628f2857390460e35ae60b8e06f16296da481.

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #26935 into nautilus
Patrick Donnelly [Thu, 14 Mar 2019 03:37:03 +0000 (20:37 -0700)]
Merge PR #26935 into nautilus

* refs/pull/26935/head:
qa: extend MDS heartbeat grace for valgrind

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26916 into nautilus
Patrick Donnelly [Thu, 14 Mar 2019 03:31:01 +0000 (20:31 -0700)]
Merge PR #26916 into nautilus

* refs/pull/26916/head:
qa: ignore MON_DOWN for volume-client testing

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26894 into nautilus
Sage Weil [Thu, 14 Mar 2019 03:07:45 +0000 (22:07 -0500)]
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>
6 years agoMerge PR #26919 into nautilus
Patrick Donnelly [Wed, 13 Mar 2019 20:23:52 +0000 (13:23 -0700)]
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>
6 years agodoc: add CephFS notes for nautilus 26919/head
Patrick Donnelly [Tue, 12 Mar 2019 20:54:06 +0000 (13:54 -0700)]
doc: add CephFS notes for nautilus

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge remote-tracking branch 'gh/nautilus'
Sage Weil [Wed, 13 Mar 2019 18:31:03 +0000 (13:31 -0500)]
Merge remote-tracking branch 'gh/nautilus'

6 years agoqa/standalone/erasure-code/test-erasure-code: adjust test to avoid m=0 26894/head
Sage Weil [Wed, 13 Mar 2019 17:46:50 +0000 (12:46 -0500)]
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>
6 years agoqa: extend MDS heartbeat grace for valgrind 26935/head
Patrick Donnelly [Wed, 13 Mar 2019 16:13:02 +0000 (09:13 -0700)]
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>
6 years agoMerge pull request #26790 from ricardoasmarques/iscsi-passwords-with-slash
Lenz Grimmer [Wed, 13 Mar 2019 16:07:18 +0000 (17:07 +0100)]
Merge pull request #26790 from ricardoasmarques/iscsi-passwords-with-slash

mgr/dashboard: iSCSI - Support iSCSI passwords with '/'

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
6 years agomgr/telemetry: fix 'telemetry {on,off}' 26921/head
Sage Weil [Tue, 12 Mar 2019 22:07:56 +0000 (17:07 -0500)]
mgr/telemetry: fix 'telemetry {on,off}'

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agodoc/ceph-volume/lvm/batch: fix typos 26563/head
Alexandru Cucu [Wed, 13 Mar 2019 15:13:46 +0000 (17:13 +0200)]
doc/ceph-volume/lvm/batch: fix typos
Fix typos in ceph-volume lvm batch documentation
Signed-off-by: Alexandru Cucu <me@alexcucu.ro>
6 years agomgr/dashboard: Always get iSCSI passwords decrypted 26790/head
Ricardo Marques [Fri, 8 Mar 2019 14:45:09 +0000 (14:45 +0000)]
mgr/dashboard: Always get iSCSI passwords decrypted

Fixes: https://tracker.ceph.com/issues/38630
Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agomgr/dashboard: Support iSCSI password with '/'
Ricardo Marques [Wed, 6 Mar 2019 16:04:24 +0000 (16:04 +0000)]
mgr/dashboard: Support iSCSI password with '/'

Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #26765 from p-na/wip-pna-rbd-conf-table-search
Lenz Grimmer [Wed, 13 Mar 2019 14:37:28 +0000 (15:37 +0100)]
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>
6 years agoMerge pull request #26766 from p-na/wip-pna-fix-table-search
Lenz Grimmer [Wed, 13 Mar 2019 14:27:10 +0000 (15:27 +0100)]
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>
6 years agoMerge pull request #26800 from linuxbox2/wip-rgw-limitcheck-trunc
Casey Bodley [Wed, 13 Mar 2019 13:53:08 +0000 (09:53 -0400)]
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>
6 years agoMerge PR #26920 into master
Sage Weil [Wed, 13 Mar 2019 13:16:20 +0000 (08:16 -0500)]
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>
6 years agoMerge pull request #26756 from badone/wip-f28-broken-Cython-dep
Boris Ranto [Wed, 13 Mar 2019 12:31:15 +0000 (13:31 +0100)]
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>
6 years agoqa/tasks/mgr/test_module_selftest: fix localized value test 26920/head
Sage Weil [Wed, 13 Mar 2019 12:11:47 +0000 (07:11 -0500)]
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>
6 years agoMerge PR #26886 into master
Sage Weil [Wed, 13 Mar 2019 11:56:16 +0000 (06:56 -0500)]
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>
6 years agoMerge PR #26917 into master
Sage Weil [Wed, 13 Mar 2019 11:55:58 +0000 (06:55 -0500)]
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>
6 years agoauth/cephx: fix decode_encrypt error handling 26924/head
xie xingguo [Wed, 13 Mar 2019 09:21:24 +0000 (17:21 +0800)]
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>
6 years agoMerge pull request #26788 from ricardoasmarques/iscsi-docs-password
Ricardo Marques [Wed, 13 Mar 2019 09:20:09 +0000 (09:20 +0000)]
Merge pull request #26788 from ricardoasmarques/iscsi-docs-password

doc/rbd/iscsi-target-cli: Update auth command

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoauth/cephx: fix encode_encrypt error handling
xie xingguo [Wed, 13 Mar 2019 08:30:54 +0000 (16:30 +0800)]
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>
6 years agorpm: Install python2-Cython in python2 environment 26756/head
Brad Hubbard [Mon, 4 Mar 2019 02:38:25 +0000 (12:38 +1000)]
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>
6 years agocommon: implement HMACs on top of OpenSSL. 26875/head
Radoslaw Zarzynski [Mon, 11 Mar 2019 22:09:37 +0000 (23:09 +0100)]
common: implement HMACs on top of OpenSSL.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: switch the pre-auth mechanism to HMAC-SHA256.
Radoslaw Zarzynski [Sat, 9 Mar 2019 14:01:21 +0000 (15:01 +0100)]
msg/async, v2: switch the pre-auth mechanism to HMAC-SHA256.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoinclude/types: beef sha_digest_t up with encode and compare.
Radoslaw Zarzynski [Sat, 9 Mar 2019 13:57:04 +0000 (14:57 +0100)]
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>
6 years agoauth: add hmac_sha256() to CryptoKey.
Radoslaw Zarzynski [Sat, 9 Mar 2019 13:00:32 +0000 (14:00 +0100)]
auth: add hmac_sha256() to CryptoKey.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agomsg/async, v2: introduce pre_auth exchanges with CRC32.
Radoslaw Zarzynski [Sat, 9 Mar 2019 02:47:21 +0000 (03:47 +0100)]
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>
6 years agoMerge pull request #26880 from pcuzner/prom-add-recovery-metrics
Boris Ranto [Wed, 13 Mar 2019 00:07:09 +0000 (01:07 +0100)]
Merge pull request #26880 from pcuzner/prom-add-recovery-metrics

mgr/prometheus: Add recovery metrics

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agomgr/BaseMgrStandbyModule: parse prefix properly
Sage Weil [Tue, 12 Mar 2019 21:45:22 +0000 (16:45 -0500)]
mgr/BaseMgrStandbyModule: parse prefix properly

Fixes: http://tracker.ceph.com/issues/38705
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26712 from badone/wip-b64decode-decorator-traceback
Boris Ranto [Tue, 12 Mar 2019 19:46:59 +0000 (20:46 +0100)]
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>
6 years agoMerge pull request #26899 from dzafman/wip-38678
David Zafman [Tue, 12 Mar 2019 19:41:40 +0000 (12:41 -0700)]
Merge pull request #26899 from dzafman/wip-38678

Minor cleanups in tests and log output

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agorbd: wait for all io complete when bench is interrupted 26918/head
Mykola Golub [Tue, 12 Mar 2019 18:22:25 +0000 (18:22 +0000)]
rbd: wait for all io complete when bench is interrupted

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge PR #26890 into master
Sage Weil [Tue, 12 Mar 2019 18:15:32 +0000 (13:15 -0500)]
Merge PR #26890 into master

* refs/pull/26890/head:
ceph.spec.in: add libstoragemgmt to mgr package

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoerasure-code: ensure m >= 1
Sage Weil [Tue, 12 Mar 2019 13:57:21 +0000 (08:57 -0500)]
erasure-code: ensure m >= 1

Fixes: http://tracker.ceph.com/issues/38682
Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #26893 into master
Patrick Donnelly [Tue, 12 Mar 2019 17:47:53 +0000 (10:47 -0700)]
Merge PR #26893 into master

* refs/pull/26893/head:
qa: unmount clients prior to marking fs down

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoosd/osd_types: include omap and hit_set_archive bytes in pool usage 26917/head
Sage Weil [Tue, 12 Mar 2019 16:55:32 +0000 (11:55 -0500)]
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>
6 years agoqa: ignore MON_DOWN for volume-client testing 26916/head
Patrick Donnelly [Tue, 12 Mar 2019 17:38:55 +0000 (10:38 -0700)]
qa: ignore MON_DOWN for volume-client testing

The test restarts the monitors.

Fixes: http://tracker.ceph.com/issues/38704
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26892 into master
Patrick Donnelly [Tue, 12 Mar 2019 17:26:27 +0000 (10:26 -0700)]
Merge PR #26892 into master

* refs/pull/26892/head:
qa: stop testing simple messenger in CephFS suites

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #26503 from ricardoasmarques/iscsi-support-dots-in-name
Ricardo Dias [Tue, 12 Mar 2019 16:51:06 +0000 (16:51 +0000)]
Merge pull request #26503 from ricardoasmarques/iscsi-support-dots-in-name

mgr/dashboard: iSCSI - Adds support for pool/image names with dots

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agocrush/CrushWrapper: ensure crush_choose_arg_map.size == max_buckets 26886/head
Sage Weil [Fri, 8 Mar 2019 22:54:53 +0000 (16:54 -0600)]
crush/CrushWrapper: ensure crush_choose_arg_map.size == max_buckets

The crush/builder.c crush_add_bucket method resizes the max_buckets array
but a power of 2 when it has to expand, but the code in CrushWrapper was
assuming that if the array grew the pos for the new bucket would be the
last position in the new array.  This led to a situation where the
crush_choose_arg_map args array size didn't match max_buckets, and
eventually caused a crash.

Fixes: http://tracker.ceph.com/issues/38664
Signed-off-by: Sage Weil <sage@redhat.com>