]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
6 years agoMerge pull request #27383 from tchaikov/wip-cmake-libpython3
Kefu Chai [Fri, 5 Apr 2019 03:30:13 +0000 (11:30 +0800)]
Merge pull request #27383 from tchaikov/wip-cmake-libpython3

cmake: check for MAJOR.MINOR version of python3

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorpm: install python%{python3_pkgversion}-devel on el7
Kefu Chai [Fri, 5 Apr 2019 02:16:23 +0000 (10:16 +0800)]
rpm: install python%{python3_pkgversion}-devel on el7

as RHEL 7.7 support a native python3.6, we cannot hardwire to python3.4
on RHEL7/CentOS7 anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: check for MAJOR.MINOR version of python3
Boris Ranto [Thu, 4 Apr 2019 20:00:55 +0000 (22:00 +0200)]
cmake: check for MAJOR.MINOR version of python3

We can only check for MAJOR.MINOR version of python3 since
FindPython3Libs does not support checking for MAJOR.MINOR.PATCH version
of python3. We also need to make sure we use the PYTHON3 versions of
these variables.

This should fix a regression introduced by c961e00.

Signed-off-by: Boris Ranto <branto@redhat.com>
6 years agoMerge PR #27266 into master
Patrick Donnelly [Thu, 4 Apr 2019 22:36:14 +0000 (15:36 -0700)]
Merge PR #27266 into master

* refs/pull/27266/head:
cephfs-shell: Fix hidden files and directories list by ls command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27380 from ricardoasmarques/fix-iscsi-target-submission
Ricardo Marques [Thu, 4 Apr 2019 22:35:14 +0000 (23:35 +0100)]
Merge pull request #27380 from ricardoasmarques/fix-iscsi-target-submission

mgr/dashboard: Fix iSCSI target submission

Reviewed-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge PR #27198 into master
Patrick Donnelly [Thu, 4 Apr 2019 21:24:38 +0000 (14:24 -0700)]
Merge PR #27198 into master

* refs/pull/27198/head:
vstart: generate environment script suitable for sourcing
cephfs-shell: fix mode of script in tree

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomgr/dashboard: Fix iSCSI target submission
Ricardo Marques [Fri, 29 Mar 2019 13:29:47 +0000 (13:29 +0000)]
mgr/dashboard: Fix iSCSI target submission

cdIsInGroup should not be included in the request
and username/password should be an empty string
(instead of null)

Fixes: https://tracker.ceph.com/issues/39110
Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge PR #27373 into master
Patrick Donnelly [Thu, 4 Apr 2019 19:52:55 +0000 (12:52 -0700)]
Merge PR #27373 into master

* refs/pull/27373/head:
doc: Add usage for shortcuts command in cephfs-shell

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #27303 into master
Patrick Donnelly [Thu, 4 Apr 2019 19:42:16 +0000 (12:42 -0700)]
Merge PR #27303 into master

* refs/pull/27303/head:
mds: add Octopus cephfs feature bit
mds: verify current release has a cephfs feature bit
mds: add cephfs feature bit for Nautilus
mon: generalize and refactor lambda use
qa: test featureful client with mimic base
qa: remove obsolete snap upgrade tests

Reviewed-by: Zheng Yan <zyan@redhat.com>
6 years agoMerge PR #27238 into master
Patrick Donnelly [Thu, 4 Apr 2019 19:40:27 +0000 (12:40 -0700)]
Merge PR #27238 into master

* refs/pull/27238/head:
mds: update projected_version when upgrading snaptable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26881 into master
Patrick Donnelly [Thu, 4 Apr 2019 19:39:08 +0000 (12:39 -0700)]
Merge PR #26881 into master

* refs/pull/26881/head:
mds: remove SimpleLock::replicate_relax()
mds: avoid check session connection's features when issuing caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27358 from tchaikov/wip-multi-python3
Kefu Chai [Thu, 4 Apr 2019 15:50:32 +0000 (23:50 +0800)]
Merge pull request #27358 from tchaikov/wip-multi-python3

rpm,cmake: use specified python3 version if any

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #27362 from ektich/ektich-patch-1
Kefu Chai [Thu, 4 Apr 2019 15:41:00 +0000 (23:41 +0800)]
Merge pull request #27362 from ektich/ektich-patch-1

doc/rados/configuration: fix typo in mon-lookup-dns

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27338 from tchaikov/wip-crimson-wait-for-active
Kefu Chai [Thu, 4 Apr 2019 15:27:05 +0000 (23:27 +0800)]
Merge pull request #27338 from tchaikov/wip-crimson-wait-for-active

crimson/osd: lower debug level on i/o path

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #27378 from ricardoasmarques/fix-iscsi-disk-diff
Ricardo Marques [Thu, 4 Apr 2019 14:04:39 +0000 (15:04 +0100)]
Merge pull request #27378 from ricardoasmarques/fix-iscsi-disk-diff

mgr/dashboard: Fix iSCSI disk diff calculation

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27262 from ricardoasmarques/check-gateway-in-use
Ricardo Marques [Thu, 4 Apr 2019 14:02:26 +0000 (15:02 +0100)]
Merge pull request #27262 from ricardoasmarques/check-gateway-in-use

mgr/dashboard: Check if gateway is in use before deletion

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27248 from ricardoasmarques/display-target-sessions
Ricardo Marques [Thu, 4 Apr 2019 13:58:53 +0000 (14:58 +0100)]
Merge pull request #27248 from ricardoasmarques/display-target-sessions

mgr/dashboard: Display the number of iSCSI active sessions

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agomgr/dashboard: Fix iSCSI disk diff calculation
Ricardo Marques [Fri, 29 Mar 2019 13:33:19 +0000 (13:33 +0000)]
mgr/dashboard: Fix iSCSI disk diff calculation

The separator is now a '/' instead of '.'

Fixes: https://tracker.ceph.com/issues/39109
Signed-off-by: Ricardo Marques <rimarques@suse.com>
6 years agodoc/rados/configuration/mon-lookup-dns: fix typo
Vanush "Misha" Paturyan [Thu, 4 Apr 2019 08:57:41 +0000 (09:57 +0100)]
doc/rados/configuration/mon-lookup-dns: fix typo

Signed-off-by: Vanush "Misha" Paturyan <ektich@gmail.com>
6 years agodoc: Add usage for shortcuts command in cephfs-shell
Varsha Rao [Thu, 4 Apr 2019 10:23:41 +0000 (15:53 +0530)]
doc: Add usage for shortcuts command in cephfs-shell

Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agoMerge pull request #27350 from tspmelo/wip-fix-nfs-transport
Ricardo Marques [Thu, 4 Apr 2019 08:03:48 +0000 (09:03 +0100)]
Merge pull request #27350 from tspmelo/wip-fix-nfs-transport

mgr/dashboard: Fix deletion of NFS transports properties

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27326 from dillaman/wip-librados-unitest-logging
Mykola Golub [Thu, 4 Apr 2019 07:25:42 +0000 (10:25 +0300)]
Merge pull request #27326 from dillaman/wip-librados-unitest-logging

test/librados_test_stub: ensure the log flusher thread is started

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #26016 from falcon78921/wip-doc-37957
Kefu Chai [Thu, 4 Apr 2019 06:33:24 +0000 (14:33 +0800)]
Merge pull request #26016 from falcon78921/wip-doc-37957

doc: added section on creating RESTful API user

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agorpm: pass %{python3_version} to cmake
Kefu Chai [Thu, 4 Apr 2019 04:07:25 +0000 (12:07 +0800)]
rpm: pass %{python3_version} to cmake

to force cmake to use the python3 and python3 modules for building
python3 bindings

on the debian side, it's okay to continue using "-DWITH_PYTHON3=ON", as

- cmake does normalize "ON" to 3
- debian's cmake extension lives on /usr/lib/python3/dist-packages/
  not in a specific /usr/lib/python3.x/dist-packages directory

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: check for libpython of the same version of interpreter
Kefu Chai [Thu, 4 Apr 2019 03:44:56 +0000 (11:44 +0800)]
cmake: check for libpython of the same version of interpreter

actually cython or python3-cython's dependencies should take care of it.
but we should at least get it right on our side if we check it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocmake: use specified python3 version if any
Kefu Chai [Thu, 4 Apr 2019 03:37:00 +0000 (11:37 +0800)]
cmake: use specified python3 version if any

use might have multiple python3 installed, some of them has/have all
dependencies installed and is good enough for building Ceph. we should
not always use the latest python installed in the system and complain that
there is missing dependencies, even if user has installed all the
python3 dependencies for the older python3.

put in other words, if user only installs cython module for python3.4, but
she has both python3.6 and python3.4 in her system. we should not force
her to uninstall python3.6 for installing Ceph.

this change also aligns with MGR_PYTHON_VERSION. i am not applying the
same change to WITH_PYTHON2, because python2 is already stablized. and distros
are not likely to release new python2 releases.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomds: add Octopus cephfs feature bit
Patrick Donnelly [Tue, 2 Apr 2019 00:03:45 +0000 (17:03 -0700)]
mds: add Octopus cephfs feature bit

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomds: verify current release has a cephfs feature bit
Patrick Donnelly [Mon, 1 Apr 2019 23:52:34 +0000 (16:52 -0700)]
mds: verify current release has a cephfs feature bit

Fixes: http://tracker.ceph.com/issues/39077
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomds: add cephfs feature bit for Nautilus
Patrick Donnelly [Mon, 1 Apr 2019 23:50:43 +0000 (16:50 -0700)]
mds: add cephfs feature bit for Nautilus

Fixes: http://tracker.ceph.com/issues/39078
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agomon: generalize and refactor lambda use
Patrick Donnelly [Mon, 1 Apr 2019 23:37:56 +0000 (16:37 -0700)]
mon: generalize and refactor lambda use

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: test featureful client with mimic base
Patrick Donnelly [Mon, 1 Apr 2019 23:35:59 +0000 (16:35 -0700)]
qa: test featureful client with mimic base

Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoqa: remove obsolete snap upgrade tests
Patrick Donnelly [Mon, 1 Apr 2019 23:13:36 +0000 (16:13 -0700)]
qa: remove obsolete snap upgrade tests

Direct upgrades from Luminous to Octopus are not supported. These snap format
upgrade tests are now only going to be run in the mimic/nautilus branches.

Fixes: http://tracker.ceph.com/issues/39020
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #27353 into master
Sage Weil [Wed, 3 Apr 2019 21:07:19 +0000 (16:07 -0500)]
Merge PR #27353 into master

* refs/pull/27353/head:
include/ceph_features: fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
6 years agoMerge pull request #27293 from tspmelo/wip-nfsv4
Ricardo Marques [Wed, 3 Apr 2019 20:39:37 +0000 (21:39 +0100)]
Merge pull request #27293 from tspmelo/wip-nfsv4

mgr/dashboard: Fix NFS pseudo validation

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #26439 from taoCH/wip-fix-librgw-empty-etag
J. Eric Ivancich [Wed, 3 Apr 2019 20:11:38 +0000 (16:11 -0400)]
Merge pull request #26439 from taoCH/wip-fix-librgw-empty-etag

rgw_file: save etag and acl info in setattr

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoinclude/ceph_features: fix typo
Sage Weil [Wed, 3 Apr 2019 19:59:47 +0000 (14:59 -0500)]
include/ceph_features: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27141 into master v15.0.0
Sage Weil [Wed, 3 Apr 2019 19:59:03 +0000 (14:59 -0500)]
Merge PR #27141 into master

* refs/pull/27141/head:
mon/OSDMonitor: fix osd boot feature vs require_osd_release check
include/ceph_features: retire 7 other old features
include/ceph_features: retire ERASURE_CODE_PLUGINS_V2
include/ceph_features: retire OSD_ERASURE_CODES
include/ceph_features: update comment to align with N+2 upgrades
include/ceph_features: adjust whitespace for retired and now usable features
mon: remove check for jewel mons
mds/FSMap: remove support for encoding jewel FSMap
include/ceph_features: enable SERVER_OCTOPUS
test/cli/osdmaptool/feature-set-unset-list: add octopus to output
test/cli/osdmaptool/feature-set-unset-list: change unknown feature bit
qa/releases/octopus.yaml: add octopus upgrade final step
osd/OSDMap: octopus encoding features
mon/OSDMonitor: add mon_debug_no_require_octopus
mon/OSDMonitor: allow 'osd require-osd-release octopus'
mon: add ondisk incompat octopus feature
mon/mon_types: add mon feature for octopus
include/ceph_features: SERVER_O -> SERVER_OCTOPUS

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agomgr/dashboard: Fix NFS pseudo validation
Tiago Melo [Mon, 1 Apr 2019 14:13:37 +0000 (14:13 +0000)]
mgr/dashboard: Fix NFS pseudo validation

Fixes: http://tracker.ceph.com/issues/39063
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge PR #27291 into master
Sage Weil [Wed, 3 Apr 2019 19:07:27 +0000 (14:07 -0500)]
Merge PR #27291 into master

* refs/pull/27291/head:
qa/suites/upgrade/nautilus-x-singleton: upgrade mgrs early
qa/suites/upgrade/mimic-x-singleton: upgrade mgrs later
qa/suites: add upgrade/nautilus-x-singleton and symlink from rados/upgrade
qa/suites: move rados/upgrade/mimic-x-singleton to upgrade/ and symlink

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: Fix deletion of NFS transports properties
Tiago Melo [Wed, 3 Apr 2019 18:52:07 +0000 (18:52 +0000)]
mgr/dashboard: Fix deletion of NFS transports properties

Fixes: http://tracker.ceph.com/issues/39090
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge PR #27146 into master
Sage Weil [Wed, 3 Apr 2019 18:49:19 +0000 (13:49 -0500)]
Merge PR #27146 into master

* refs/pull/27146/head:
mon/MonMap: add min_quorum_size() helper
mon/MDSMonitor: add 'mds ok-to-stop' command
mon: add 'mon ok-to-{stop,add-offline,rm}' commands

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #26572 from rhcs-dashboard/wip-37337-master
Ricardo Marques [Wed, 3 Apr 2019 18:46:38 +0000 (19:46 +0100)]
Merge pull request #26572 from rhcs-dashboard/wip-37337-master

mgr/dashboard: unify button/URL actions naming

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #26183 from letterwuyu/wip-rgw-get-detail-user-info
J. Eric Ivancich [Wed, 3 Apr 2019 16:36:23 +0000 (12:36 -0400)]
Merge pull request #26183 from letterwuyu/wip-rgw-get-detail-user-info

rgw: Make rgw admin ops api get user info consistent with the command line

6 years agoMerge pull request #26412 from theanalyst/rgw-orphan-fixes
J. Eric Ivancich [Wed, 3 Apr 2019 16:34:20 +0000 (12:34 -0400)]
Merge pull request #26412 from theanalyst/rgw-orphan-fixes

rgw: orphan fixes

6 years agoMerge PR #27343 into master
Sage Weil [Wed, 3 Apr 2019 14:22:19 +0000 (09:22 -0500)]
Merge PR #27343 into master

* refs/pull/27343/head:
mon/LogMonitor: add mon_cluster_log_to_file bool option

Reviewed-by: Sébastien Han <seb@redhat.com>
6 years agomgr/dashboard: add wording section to hacking.rst
Ernesto Puerta [Fri, 29 Mar 2019 17:07:20 +0000 (18:07 +0100)]
mgr/dashboard: add wording section to hacking.rst

Fixes: http://tracker.ceph.com/issues/37337
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
6 years agomgr/dashboard: unify button/URL actions naming
Ernesto Puerta [Tue, 26 Mar 2019 18:01:01 +0000 (19:01 +0100)]
mgr/dashboard: unify button/URL actions naming

- Mappings (actually an Enum) created for actions (buttons and other UI elements) and URLs: ActionLabels and URLVerbs.
  - An alternative would be to fix/improve the current i18n-polyfill, which only works with literal strings (not even with 'const enums' which become literals after Typescript transpiling).
  - Additionally having a predefined file with some strings to translate (actions, verbs, etc) could improve on the 1st of the 2-stage i18n process (as extraction tool has a lot of limitations).
- A corresponding ActionLabelsI18n service with translated labels (it's a service as I haven't found the way to either translate no-const strings (ngx-translate/AST parser failure) or get a static translator).
  - This services could/should be extended to cover all strings that are defined in static/globally scoped objects before any I18n provider has been initialized.
- Breadcrumbs are not translated (neither were they before this change). This part remains untackled: using 'proxy' static objects and performing live translation could deal with the issue.
- New URLBuilder service created (following a established pattern in the Java/.NET world) . This should avoid the need of messing with literal URLs and string composition/parsing, and while the front-end is not meant to be consumed by anyone, Angular does not provide any other way for the app to navigate between components, so the URLs are a de-facto interface contract. Unlike this approach is not flawless, it's easier to enforce, while issues coming from free-from strings are really hard to catch.
  - This could be further improved by using a router registry/dynamic routing. Most of the routes are trivial.
- As a side effect of these changes, routing module has been refactored and some routes moved to their specific modules (pool, rbd, rgw), via loadChildren and routes.forChild() magic. Now the above mentioned components are lazy-loaded/pre-loaded (it means right after the main code is loaded). This should also decrease the loading time (though probably this is not biggest time eater here).
  - As now modules can be loaded multiple times, not only from App module by means of lazy loading, but also from other ones (as PoolModule loads BlockModule to get QoS widgets in Pool windows), now lazy loaded modules include 2 NgModules (one with imports: RouterModule.forChild(routes), meant for lazy-loading, and another without routes).
- Caveat: Some parts might not be (fully) translated (NFS, iSCSI, mirroring), as there's been ongoing work on them and it's hard to keep up with the new code.
These changes will be a waste of time if the new code does not take benefit from/adheres to it, so I'm still figuring out how to spread this (nothing really fancy to demo). Maybe adding some checks/harnessing to enforce the new naming convention (ideas greatly welcome here).

Fixes: http://tracker.ceph.com/issues/37337
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
6 years agomon/LogMonitor: add mon_cluster_log_to_file bool option
Sage Weil [Wed, 3 Apr 2019 12:18:50 +0000 (07:18 -0500)]
mon/LogMonitor: add mon_cluster_log_to_file bool option

Allow cluster logging to a file to be disabled via a boolean.  Default
to true to avoid any change in behavior.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27280 from xiexingguo/wip-39039
Kefu Chai [Wed, 3 Apr 2019 10:53:55 +0000 (18:53 +0800)]
Merge pull request #27280 from xiexingguo/wip-39039

mgr: more GIL fixes

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27245 from tspmelo/wip-nfs-typo
Ricardo Marques [Wed, 3 Apr 2019 08:44:24 +0000 (09:44 +0100)]
Merge pull request #27245 from tspmelo/wip-nfs-typo

mgr/dashboard: Fix typo in NFS form

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agocrimson/osd: lower debug level on i/o path
Kefu Chai [Wed, 3 Apr 2019 08:10:23 +0000 (16:10 +0800)]
crimson/osd: lower debug level on i/o path

hopefully it can reduce the contribution of cpu cycles of
PG::wait_for_active()

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27333 from tchaikov/wip-rpm-devtoolsset-8-on-aarch64
Kefu Chai [Wed, 3 Apr 2019 05:29:33 +0000 (13:29 +0800)]
Merge pull request #27333 from tchaikov/wip-rpm-devtoolsset-8-on-aarch64

rpm: enable devtoolset-8 on aarch64 also

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoinstall-deps,rpm: enable devtoolset-8 on aarch64 also
Kefu Chai [Wed, 3 Apr 2019 03:08:04 +0000 (11:08 +0800)]
install-deps,rpm: enable devtoolset-8 on aarch64 also

in 5ae3b06e, we left aarch64 with devtoolset-7, but aarch64 builders are
also suffering from http://tracker.ceph.com/issues/38892. so i installed
devtoolset-8 on all aarch64 builders manually from the rpm packages
downloaded from koji builder:

- https://cbs.centos.org/koji/buildinfo?buildID=24923
- https://cbs.centos.org/koji/buildinfo?buildID=24931

libasan5, libubsan1 are not installed.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #27328 into master
Patrick Donnelly [Wed, 3 Apr 2019 01:28:09 +0000 (18:28 -0700)]
Merge PR #27328 into master

* refs/pull/27328/head:
qa/tests: reduce number of jobs for `kcephfs`

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #27310 from tchaikov/wip-crimson-cache-ss-oi
Kefu Chai [Wed, 3 Apr 2019 01:24:05 +0000 (09:24 +0800)]
Merge pull request #27310 from tchaikov/wip-crimson-cache-ss-oi

crimson/osd: cache object_info and snapset in PGBackend

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #27307 from tchaikov/wip-crimson-osd-hb
Kefu Chai [Wed, 3 Apr 2019 01:14:37 +0000 (09:14 +0800)]
Merge pull request #27307 from tchaikov/wip-crimson-osd-hb

crimson/osd: do not add whoami as hb peer and cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoqa/tests: reduce number of jobs for `kcephfs`
Yuri Weinstein [Tue, 2 Apr 2019 22:38:55 +0000 (15:38 -0700)]
qa/tests: reduce number of jobs for `kcephfs`

we need it on `master` as well
see https://github.com/ceph/ceph/pull/27165

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoqa/suites/upgrade/nautilus-x-singleton: upgrade mgrs early
Sage Weil [Tue, 2 Apr 2019 21:41:15 +0000 (16:41 -0500)]
qa/suites/upgrade/nautilus-x-singleton: upgrade mgrs early

The mgrmap may change when the mons upgrade, causing the mgr daemons to
respawn.  Restart mgr daemons before mons to avoid a mismatch between
the running version and the ondisk binary.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites/upgrade/mimic-x-singleton: upgrade mgrs later
Sage Weil [Tue, 2 Apr 2019 21:39:58 +0000 (16:39 -0500)]
qa/suites/upgrade/mimic-x-singleton: upgrade mgrs later

The mgrmap may change when the mons upgrade, causing the mgr daemons to
respawn.  Delay the upgrade until later so that the ondisk binary does
not change out from underneath them.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites: add upgrade/nautilus-x-singleton and symlink from rados/upgrade
Sage Weil [Tue, 2 Apr 2019 21:34:02 +0000 (16:34 -0500)]
qa/suites: add upgrade/nautilus-x-singleton and symlink from rados/upgrade

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/suites: move rados/upgrade/mimic-x-singleton to upgrade/ and symlink
Sage Weil [Tue, 2 Apr 2019 21:33:38 +0000 (16:33 -0500)]
qa/suites: move rados/upgrade/mimic-x-singleton to upgrade/ and symlink

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27316 into master
Sage Weil [Tue, 2 Apr 2019 21:24:52 +0000 (16:24 -0500)]
Merge PR #27316 into master

* refs/pull/27316/head:
doc/rados/operations: document BLUEFS_SPILLOVER

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agomon/OSDMonitor: fix osd boot feature vs require_osd_release check
Sage Weil [Tue, 2 Apr 2019 14:28:25 +0000 (09:28 -0500)]
mon/OSDMonitor: fix osd boot feature vs require_osd_release check

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: retire 7 other old features
Sage Weil [Sat, 23 Mar 2019 07:19:53 +0000 (02:19 -0500)]
include/ceph_features: retire 7 other old features

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: retire ERASURE_CODE_PLUGINS_V2
Sage Weil [Sat, 23 Mar 2019 07:17:48 +0000 (02:17 -0500)]
include/ceph_features: retire ERASURE_CODE_PLUGINS_V2

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: retire OSD_ERASURE_CODES
Sage Weil [Sat, 23 Mar 2019 07:17:03 +0000 (02:17 -0500)]
include/ceph_features: retire OSD_ERASURE_CODES

We can use this again in Q.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: update comment to align with N+2 upgrades
Sage Weil [Sat, 23 Mar 2019 07:15:14 +0000 (02:15 -0500)]
include/ceph_features: update comment to align with N+2 upgrades

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: adjust whitespace for retired and now usable features
Sage Weil [Sat, 23 Mar 2019 07:10:29 +0000 (02:10 -0500)]
include/ceph_features: adjust whitespace for retired and now usable features

The blank line suggests that the feature is now reusable.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon: remove check for jewel mons
Sage Weil [Sat, 23 Mar 2019 07:00:40 +0000 (02:00 -0500)]
mon: remove check for jewel mons

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomds/FSMap: remove support for encoding jewel FSMap
Sage Weil [Sat, 23 Mar 2019 07:00:25 +0000 (02:00 -0500)]
mds/FSMap: remove support for encoding jewel FSMap

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoinclude/ceph_features: enable SERVER_OCTOPUS
Sage Weil [Tue, 26 Mar 2019 18:21:33 +0000 (13:21 -0500)]
include/ceph_features: enable SERVER_OCTOPUS

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agotest/cli/osdmaptool/feature-set-unset-list: add octopus to output
Sage Weil [Mon, 25 Mar 2019 11:22:44 +0000 (06:22 -0500)]
test/cli/osdmaptool/feature-set-unset-list: add octopus to output

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agotest/cli/osdmaptool/feature-set-unset-list: change unknown feature bit
Sage Weil [Mon, 25 Mar 2019 11:17:58 +0000 (06:17 -0500)]
test/cli/osdmaptool/feature-set-unset-list: change unknown feature bit

Use something we won't consume anytime soon.

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoqa/releases/octopus.yaml: add octopus upgrade final step
Sage Weil [Fri, 22 Mar 2019 22:34:57 +0000 (17:34 -0500)]
qa/releases/octopus.yaml: add octopus upgrade final step

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoosd/OSDMap: octopus encoding features
Sage Weil [Fri, 22 Mar 2019 22:33:02 +0000 (17:33 -0500)]
osd/OSDMap: octopus encoding features

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: add mon_debug_no_require_octopus
Sage Weil [Fri, 22 Mar 2019 22:33:39 +0000 (17:33 -0500)]
mon/OSDMonitor: add mon_debug_no_require_octopus

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomon/OSDMonitor: allow 'osd require-osd-release octopus'
Sage Weil [Fri, 22 Mar 2019 22:30:11 +0000 (17:30 -0500)]
mon/OSDMonitor: allow 'osd require-osd-release octopus'

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agotest/librados_test_stub: ensure the log flusher thread is started
Jason Dillaman [Tue, 2 Apr 2019 20:34:56 +0000 (16:34 -0400)]
test/librados_test_stub: ensure the log flusher thread is started

Recent changes merged in cd6a5b9c40779956629803f222c365bdb291a169
resulted in the logger flusher thread never being started for
librados_test_stub-derived unit tests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27223 from ivancich/wip-fix-resharding-issue
J. Eric Ivancich [Tue, 2 Apr 2019 20:24:36 +0000 (16:24 -0400)]
Merge pull request #27223 from ivancich/wip-fix-resharding-issue

rgw: race condition between resharding and ops waiting on resharding

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agodoc/rados/operations: document BLUEFS_SPILLOVER
Sage Weil [Tue, 2 Apr 2019 14:19:04 +0000 (09:19 -0500)]
doc/rados/operations: document BLUEFS_SPILLOVER

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agomgr/dashboard: Fix typo in NFS form
Tiago Melo [Thu, 28 Mar 2019 14:27:51 +0000 (13:27 -0100)]
mgr/dashboard: Fix typo in NFS form

Fixes: http://tracker.ceph.com/issues/39067
Signed-off-by: Tiago Melo <tmelo@suse.com>
6 years agoMerge PR #27265 into master
Sage Weil [Tue, 2 Apr 2019 15:52:14 +0000 (10:52 -0500)]
Merge PR #27265 into master

* refs/pull/27265/head:
valgrind.supp: add clauses for uninitialised gcm.Xi in OpenSSL.
src/valgrind.supp: replace with the teuthology's whitelist.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge PR #27313 into master
Sage Weil [Tue, 2 Apr 2019 15:07:57 +0000 (10:07 -0500)]
Merge PR #27313 into master

* refs/pull/27313/head:
mon: quiet devname log noise

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #26966 from SUSE/wip-orchestrator-deepsea-fix-device-ls
Sebastian Wagner [Tue, 2 Apr 2019 14:16:23 +0000 (16:16 +0200)]
Merge pull request #26966 from SUSE/wip-orchestrator-deepsea-fix-device-ls

mgr/deepsea: use ceph_volume output in get_inventory()

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agomon: quiet devname log noise
Sage Weil [Tue, 2 Apr 2019 13:49:01 +0000 (08:49 -0500)]
mon: quiet devname log noise

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27308 from tchaikov/wip-init-ceph-patience-is-a-virtue
Kefu Chai [Tue, 2 Apr 2019 13:35:38 +0000 (21:35 +0800)]
Merge pull request #27308 from tchaikov/wip-init-ceph-patience-is-a-virtue

init-ceph: wait longer before resending $signal

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27255 from adamemerson/wip-names-common-through-objecter
Kefu Chai [Tue, 2 Apr 2019 11:31:36 +0000 (19:31 +0800)]
Merge pull request #27255 from adamemerson/wip-names-common-through-objecter

Remove dependence on `using namespace`: Build of 'common' through osdc/Objecter.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: cache object_info and snapset in PGBackend
Kefu Chai [Tue, 2 Apr 2019 08:55:50 +0000 (16:55 +0800)]
crimson/osd: cache object_info and snapset in PGBackend

for better performance

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoinit-ceph: wait longer before resending $signal
Kefu Chai [Tue, 2 Apr 2019 06:31:05 +0000 (14:31 +0800)]
init-ceph: wait longer before resending $signal

if ceph-osd takes longer than 1 seconds to unmount the objectstore, it
won't get a chance to fully persist all of its stuff to disk before
init-ceph kills it again.

in my case, `MemStore::_save()` fails to write $path/collections before
it gets killed, if it has more than 512 PGs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: do not add whoami as hb peer
Kefu Chai [Tue, 2 Apr 2019 06:23:55 +0000 (14:23 +0800)]
crimson/osd: do not add whoami as hb peer

it does not make sense to say hello to myself.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: do not store whoami or nonce in Heartbeat
Kefu Chai [Tue, 2 Apr 2019 06:21:38 +0000 (14:21 +0800)]
crimson/osd: do not store whoami or nonce in Heartbeat

we don't create messengers in the class which consumes them anymore, so
no need to have these member variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/os: lower debug level of i/o to "debug"
Kefu Chai [Tue, 2 Apr 2019 06:21:05 +0000 (14:21 +0800)]
crimson/os: lower debug level of i/o to "debug"

for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/deepsea: use ceph_volume output in get_inventory()
Tim Serong [Fri, 15 Mar 2019 04:52:23 +0000 (15:52 +1100)]
mgr/deepsea: use ceph_volume output in get_inventory()

DeepSea is being updated to use ceph_volume internally (see
https://github.com/SUSE/DeepSea/pull/1517).  Once this is done,
the mgr_orch.get_inventory runner will just be returning the
raw ceph_volume output, so this commit updates the DeepSea mgr
module to match.

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agomgr/deepsea: log salt job failures
Tim Serong [Thu, 14 Mar 2019 11:48:44 +0000 (22:48 +1100)]
mgr/deepsea: log salt job failures

If a request to salt succeeds, but the event comes back with some internal
failure (e.g.: an exception was thrown inside the salt runner), we need to
log this so the admin can find out what on earth went wrong.

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agomgr/deepsea: use empty strings rather than None for option defaults
Tim Serong [Thu, 14 Mar 2019 10:10:38 +0000 (21:10 +1100)]
mgr/deepsea: use empty strings rather than None for option defaults

This makes the _config_valid() function work properly; the option
defaults are being strinified somewhere, so we need to use empty
strings rather than None (which becomes "None"), in order to check
if they're set or not.

Signed-off-by: Tim Serong <tserong@suse.com>
6 years agoMerge PR #27301 into master
Sage Weil [Tue, 2 Apr 2019 01:54:36 +0000 (20:54 -0500)]
Merge PR #27301 into master

* refs/pull/27301/head:
qa: remove requirement on simple msgr

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoqa: remove requirement on simple msgr
Patrick Donnelly [Sat, 30 Mar 2019 04:57:33 +0000 (21:57 -0700)]
qa: remove requirement on simple msgr

Fixes: http://tracker.ceph.com/issues/39079
Introduced-by: 28b4392a7191c5ed59c03cdd113050107a8109fc
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26970 into master
Patrick Donnelly [Mon, 1 Apr 2019 22:06:06 +0000 (15:06 -0700)]
Merge PR #26970 into master

* refs/pull/26970/head:
mds: initialize cap_revoke_eviction_timeout with conf

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge PR #26992 into master
Patrick Donnelly [Mon, 1 Apr 2019 22:04:50 +0000 (15:04 -0700)]
Merge PR #26992 into master

* refs/pull/26992/head:
mount.ceph.c: do not pass nofail to the kernel

Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge PR #27087 into master
Patrick Donnelly [Mon, 1 Apr 2019 22:02:51 +0000 (15:02 -0700)]
Merge PR #27087 into master

* refs/pull/27087/head:
mds: remove duplicated check on balance amount

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>