]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoMerge pull request #27555 from liewegas/wip-fix-object-stat-sum-nautilus
Yuri Weinstein [Mon, 15 Apr 2019 19:52:29 +0000 (12:52 -0700)]
Merge pull request #27555 from liewegas/wip-fix-object-stat-sum-nautilus

nautilus: osd/osd_types: fix object_stat_sum_t fast-path decode

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27559 from theanalyst/wip-nautilus-38883
Yuri Weinstein [Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)]
Merge pull request #27559 from theanalyst/wip-nautilus-38883

nautilus: rgw: LC: handle resharded buckets

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27560 from theanalyst/wip-nautilus-39181
Yuri Weinstein [Mon, 15 Apr 2019 19:50:44 +0000 (12:50 -0700)]
Merge pull request #27560 from theanalyst/wip-nautilus-39181

nautilus: orphans find perf improvements

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27561 from cbodley/wip-39280
Yuri Weinstein [Mon, 15 Apr 2019 19:49:24 +0000 (12:49 -0700)]
Merge pull request #27561 from cbodley/wip-39280

nautilus: rgw: don't recalculate etags for slo/dlo

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27562 from yuriw/wip-yuriw-38952-nautilus
Yuri Weinstein [Mon, 15 Apr 2019 19:47:50 +0000 (12:47 -0700)]
Merge pull request #27562 from yuriw/wip-yuriw-38952-nautilus

nautilus - qa/tests: removed some config settings

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoosd: Fix fast path to use version bumped value 27555/head
David Zafman [Fri, 12 Apr 2019 16:44:14 +0000 (09:44 -0700)]
osd: Fix fast path to use version bumped value

Fix the code so that the version is in one place
for both the slow and fast path.

Caused by: d2ca3d2feb442f97ca89023c7d01178d96f517a6

Fixes: http://tracker.ceph.com/issues/39281
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit a35f1a9ce1d8c3ed1889da5a8d20b1974b1e9684)

6 years agonautilus - qa/tests: removed some config settings 27562/head
Yuri Weinstein [Fri, 12 Apr 2019 16:30:06 +0000 (09:30 -0700)]
nautilus - qa/tests: removed some config settings

Fixes: http://tracker.ceph.com/issues/38952
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #27475 from pdvian/wip-38968-nautilus
Yuri Weinstein [Fri, 12 Apr 2019 20:12:18 +0000 (13:12 -0700)]
Merge pull request #27475 from pdvian/wip-38968-nautilus

nautilus: librbd: trash move return EBUSY instead of EINVAL for migrating image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27478 from pdvian/wip-38973-nautilus
Yuri Weinstein [Fri, 12 Apr 2019 20:11:39 +0000 (13:11 -0700)]
Merge pull request #27478 from pdvian/wip-38973-nautilus

nautilus: osd: process_copy_chunk remove obc ref before pg unlock

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agorgw: don't recalculate etags for slo/dlo 27561/head
Casey Bodley [Tue, 9 Apr 2019 19:26:08 +0000 (15:26 -0400)]
rgw: don't recalculate etags for slo/dlo

for slo, we've already calculated this as 'lo_etag' in get_params()
for dlo, the local 'etag' already contains the hash of an empty string

the calls to complete_etag() were calling hash.Final() a second time on
the same hash without a hash.Restart() in between. this apparently
worked fine with NSS, but with OpenSSL the second call to Final()
returns a different value

Fixes: https://tracker.ceph.com/issues/39160
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 4b849a49bd6c6b66f8185739ae21f0e6aa526a1a)

6 years agorgw_orphan: fix detailed mode flag 27560/head
Abhishek Lekshmanan [Mon, 18 Mar 2019 13:23:52 +0000 (14:23 +0100)]
rgw_orphan: fix detailed mode flag

to fix possible member var. hiding

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

6 years agorgw-admin: add a detailed mode
Abhishek Lekshmanan [Thu, 14 Feb 2019 16:40:44 +0000 (17:40 +0100)]
rgw-admin: add a detailed mode

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

6 years agorgw: orphans find: don't process stale bucket instances
Abhishek Lekshmanan [Wed, 13 Feb 2019 14:32:17 +0000 (15:32 +0100)]
rgw: orphans find: don't process stale bucket instances

As a large bucket might have resharded multiple times, check the cur bucket info
and ensure that no reshard is in progress before we attempt to log bucket index
entries. On a large sized bucket, since a bucket would have undergone reshard
multiple times, this avoids wasteful processing of stale bucket instance entries

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

6 years agorgw: orphan: introduce a detailed mode (off by default)
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:45:47 +0000 (13:45 +0100)]
rgw: orphan: introduce a detailed mode (off by default)

We currently stat objects that fit in a head as well and also log them, since we
skip head objects anyway in the rados list output this commit avoids logging
these objects if the object size itself is less than the manifest head size.

Additionally we avoid the stat call itself from the list object output when the
object fits within the chunk size. This behaviour can be unset by setting the
detailed mode which can help in older clusters where the head used to have a
different size.

The old behaviour in both the cases can be turned on by setting the detailed
flag which can be passed on from rgw-admin. Avoiding stat calls and not logging
the head objects significantly reduces the IO activity on clusters which have a
huge percentage of objects that fit in a head.

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

6 years agorgw: orphan: flush bucket index entries only after map is full
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:32:43 +0000 (13:32 +0100)]
rgw: orphan: flush bucket index entries only after map is full

We otherwise may flush more regularly while we don't have enough entries in the
map

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

6 years agorgw: orphans tool: align with rgw list bucket min readahead
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:15:02 +0000 (13:15 +0100)]
rgw: orphans tool: align with rgw list bucket min readahead

At rgw::rados layer we read upto `min readahead` entries anyway and then pass on
only the requested amount to the caller. Since this translates down to a cls
call requesting a 1000 omap keys by default, it makes sense not to waste the
entries, and process them

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

6 years agocls_rgw: fix issue with gc code using the wrong name 27559/head
Abhishek Lekshmanan [Thu, 14 Mar 2019 21:26:32 +0000 (22:26 +0100)]
cls_rgw: fix issue with gc code using the wrong name

Also use the correct ptr notation

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

6 years agodoc: add troubleshooting notes on reshard admin clis
Abhishek Lekshmanan [Fri, 8 Mar 2019 15:57:28 +0000 (16:57 +0100)]
doc: add troubleshooting notes on reshard admin clis

Adding a note on LC fixes and reshard stale instance fixes

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

6 years agorgw: lc fix: protect list_keys and formatter with a scope_guard
Abhishek Lekshmanan [Fri, 8 Mar 2019 11:10:30 +0000 (12:10 +0100)]
rgw: lc fix: protect list_keys and formatter with a scope_guard

raii for fun and profit!

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

6 years agorgw admin: use the new AdminOp to fix lc shards
Abhishek Lekshmanan [Thu, 7 Mar 2019 13:44:27 +0000 (14:44 +0100)]
rgw admin: use the new AdminOp to fix lc shards

Since it can iterate over a list of buckets, also rename the command to lc
reshard fix

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

6 years agorgw: add a fix_lc_shards AdminOp that can fix lc shards for all the buckets
Abhishek Lekshmanan [Thu, 7 Mar 2019 13:12:49 +0000 (14:12 +0100)]
rgw: add a fix_lc_shards AdminOp that can fix lc shards for all the buckets

The output would be a list of bucket names and their fix status, currently
buckets which do not need a fix will also be logged with a status of 0.

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

6 years agorgw admin: implement a lc fix option
Abhishek Lekshmanan [Mon, 4 Mar 2019 18:10:45 +0000 (19:10 +0100)]
rgw admin: implement a lc fix option

An radosgw-admin lc fix --bucket <> option is added which checks if the bucket
entry exists in the corresponding lc shard and creates it if not. In case of
resharded buckets not running a fixed rgw that writes/compares the marker this
would write a new entry with the marker as the old entry would've already been
deleted by a LC process. We currently don't cleanup the stale entry as it is
assumed this would be picked up by the LC processor already or would be picked
up in the next cycle.

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

6 years agocls rgw: implement a method to get a single LC entry
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:37:00 +0000 (13:37 +0100)]
cls rgw: implement a method to get a single LC entry

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

6 years agocls_rgw: alias the LC entries as rgw_lc_entry_t
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:35:50 +0000 (13:35 +0100)]
cls_rgw: alias the LC entries as  rgw_lc_entry_t

instead of a naked std::pair<std::string, int> everywhere

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

6 years agocls_rgw: implement a read_omap_entry method
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:34:05 +0000 (13:34 +0100)]
cls_rgw: implement a read_omap_entry method

Also refactor other methods that just read a single omap entry to use this
method instead

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

6 years agorgw lc: use marker for the shard id
Abhishek Lekshmanan [Tue, 5 Mar 2019 09:46:23 +0000 (10:46 +0100)]
rgw lc: use marker for the shard id

Since buckets can undergo resharding which changes the bucket id, using the
bucket marker in the shard id can help prevent the need to rewrite the entry as
the buckets get resharded. This also helps detect the exit criteria when the
bucket gets deleted.

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

6 years agorgw: drop entries only if the markers do not match.
Abhishek Lekshmanan [Tue, 5 Mar 2019 08:30:57 +0000 (09:30 +0100)]
rgw: drop entries only if the markers do not match.

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

6 years agoMerge pull request #27549 from smithfarm/wip-38867-nautilus
Nathan Cutler [Fri, 12 Apr 2019 15:09:36 +0000 (17:09 +0200)]
Merge pull request #27549 from smithfarm/wip-38867-nautilus

nautilus: doc: rgw: Added library/package for Golang

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27544 from tchaikov/nautilus-39164
Kefu Chai [Fri, 12 Apr 2019 12:35:18 +0000 (20:35 +0800)]
Merge pull request #27544 from tchaikov/nautilus-39164

nautilus: install-deps.sh: install '*rpm-macros'

Reviewed-by: Boris Ranto <branto@redhat.com>
6 years agodoc: add package for Golang 27549/head
IrekFasikhov [Fri, 15 Mar 2019 05:42:57 +0000 (08:42 +0300)]
doc: add package for Golang

Fixes: http://tracker.ceph.com/issues/38730
Signed-off-by: Irek Fasikhov <malmyzh@gmail.com>
(cherry picked from commit 76e94f88483864ab345818b9fc31fae908ce70fd)

6 years agoinstall-deps.sh: install '*rpm-macros' 27544/head
Kefu Chai [Thu, 11 Apr 2019 16:11:42 +0000 (00:11 +0800)]
install-deps.sh: install '*rpm-macros'

so `yum-builddep` can have access to the latest macros for preparing the
build dependencies

Fixes: http://tracker.ceph.com/issues/39164
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 087ea813a061a1d6858aeae57950e90965f4ae15)

6 years agoMerge pull request #27450 from ricardoasmarques/wip-39112-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:52:50 +0000 (11:52 -0700)]
Merge pull request #27450 from ricardoasmarques/wip-39112-nautilus

nautilus: mgr/dashboard: Display the number of active sessions for each iSCSI target

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27454 from pdvian/wip-38964-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:52:18 +0000 (11:52 -0700)]
Merge pull request #27454 from pdvian/wip-38964-nautilus

nautilus: mgr/DaemonServer: handle_conf_change - fix broken locking

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #27457 from ricardoasmarques/wip-39113-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:51:51 +0000 (11:51 -0700)]
Merge pull request #27457 from ricardoasmarques/wip-39113-nautilus

nautilus: mgr/dashboard: Check if gateway is in use before allowing the deletion via `iscsi-gateway-rm` command

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27461 from ricardoasmarques/wip-39119-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:51:17 +0000 (11:51 -0700)]
Merge pull request #27461 from ricardoasmarques/wip-39119-nautilus

 nautilus: mgr/dashboard: Error on iSCSI target submission

Reviewed-by:  Tiago Melo <tmelo@suse.com>

6 years agoMerge pull request #27486 from sebastian-philipp/wip-39167-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:50:38 +0000 (11:50 -0700)]
Merge pull request #27486 from sebastian-philipp/wip-39167-nautilus

nautilus: Rook: Fix creation of Bluestore OSDs

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
6 years agoMerge pull request #27492 from rhcs-dashboard/wip-39003-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 18:48:16 +0000 (11:48 -0700)]
Merge pull request #27492 from rhcs-dashboard/wip-39003-nautilus

nautilus: mgr/dashboard: unify button/URL actions naming + bugfix (add whitelist to guard)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #27505 from tchaikov/nautilus-39164
Yuri Weinstein [Thu, 11 Apr 2019 16:53:35 +0000 (09:53 -0700)]
Merge pull request #27505 from tchaikov/nautilus-39164

nautilus: qa,rpm,cmake: switch over to python3.6

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #27329 from pdvian/wip-38921-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:52:22 +0000 (07:52 -0700)]
Merge pull request #27329 from pdvian/wip-38921-nautilus

nautilus: rgw: don't crash on missing /etc/mime.types

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27331 from pdvian/wip-38923-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:51:56 +0000 (07:51 -0700)]
Merge pull request #27331 from pdvian/wip-38923-nautilus

nautilus: rgw: Fix S3 compatibility bug when CORS is not found

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27306 from pdvian/wip-38909-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:49:56 +0000 (07:49 -0700)]
Merge pull request #27306 from pdvian/wip-38909-nautilus

nautilus: rgw: fix read not exists null version return wrong

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27355 from pdvian/wip-38926-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:48:59 +0000 (07:48 -0700)]
Merge pull request #27355 from pdvian/wip-38926-nautilus

nautilus: rgw: Adding tcp_nodelay option to Beast

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27423 from pdvian/wip-38961-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:48:18 +0000 (07:48 -0700)]
Merge pull request #27423 from pdvian/wip-38961-nautilus

nautilus: librbd: look for pool metadata in default namespace

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27390 from pdvian/wip-38957-nautilus
Yuri Weinstein [Thu, 11 Apr 2019 14:47:21 +0000 (07:47 -0700)]
Merge pull request #27390 from pdvian/wip-38957-nautilus

nautilus: mgr/devicehealth: Fix python 3 incompatiblity

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoqa/tasks/ceph_deploy: install python3.6 instead of python3.4 for py3 tests 27505/head
Kefu Chai [Thu, 11 Apr 2019 02:02:32 +0000 (10:02 +0800)]
qa/tasks/ceph_deploy: install python3.6 instead of python3.4 for py3 tests

EPEL7 has switched over to python3.6 as the main python3. and we started
packaging python bindings for python3.6 since
https://github.com/ceph/ceph-build/pull/1283

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 42167b87909c20c9bb4d32bac02b1e01ec94af13)

6 years agoPendingReleaseNotes: note on python3.6 changes
Kefu Chai [Wed, 10 Apr 2019 10:08:04 +0000 (18:08 +0800)]
PendingReleaseNotes: note on python3.6 changes

Fixes: http://tracker.ceph.com/issues/39164
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 77c5ee06311d610f9accd94edf14becdf5820542)

6 years agorpm: add "Provides: python3-*" for python packages
Kefu Chai [Tue, 9 Apr 2019 15:22:57 +0000 (23:22 +0800)]
rpm: add "Provides: python3-*" for python packages

so user can install python3-rados, instead of python36-rados, without
specifying the minor version of python. also, we should not break our
teuthology tests with this naming scheme change. for instance, our
cephfs qa suite installs `python3-cephfs` for testing the `cephfs-shell`

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8ae1947728837bf4a4bcc8e9325aea69ff14b706)

6 years agorpm: always use 3 as the default python3_{pkgversion,version}
Kefu Chai [Tue, 9 Apr 2019 15:15:16 +0000 (23:15 +0800)]
rpm: always use 3 as the default python3_{pkgversion,version}

as we have the rpm macros installed in
https://github.com/ceph/ceph-build/pull/1283 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 11f0b8d5a8951cb50437f5e87055f3b9405f4556)

6 years agorpm: use python 3.6 as the default python3
Kefu Chai [Sun, 7 Apr 2019 00:43:59 +0000 (08:43 +0800)]
rpm: use python 3.6 as the default python3

some of our centos7 jenkins builders are failing to build ceph master and
nautilus branches. because EPEL7 recently switched from python3.4 to
python3.6 as the native python3. see
https://lists.fedoraproject.org/archives/list/epel-announce@lists.fedoraproject.org/message/EGUMKAIMPK2UD5VSHXM53BH2MBDGDWMO/

and one of our BuildRequires, cmake3,
was offered by EPEL7. it also followed the python3.6 switch-over to
rebuild against python3.6. as a result, the cmake3-data-3.13.4-2.el7
started to depend on /usr/bin/python3.6, which is in turn offered by
python36 package. after installing python36 as a dependency of the
updated cmake3. but in cmake, we originally checks for the latest
python3 interpreter if WITH_PYTHON3 is enabled, that's why these
builders which happen to install these updated packages started to fail
when detecting the existence of python3.6 related build dependencies.

as a fix, in d1e83082,
python%{python3_pkgversion}-{devel,setuptools,Cython} are listed as
BuildRequires to reflect this change in EPEL7. before d1e83082, we
hardwired them to python34-*.

but as following analysis puts, there are cases where `yum-builddep`
is inconsistent with `rpmbuild`. as `yum-builddep` changes the how
`python3_pkgversion` and `python3_version` macros are expanded:

- none of the packages installed by `yum-builddep` installs the python3
  related rpm macros, so the system stays with whatever python3 it was
  using. in this case, `rpmbuild` won't complain, as the
  `python3_pkgversion` and `python_version` are consistent before and
  after `yum-builddep`.
- system has python3.4 installed before `yum-builddep`. but
  `yum-builddep` installed python3.6 and also the updated
  `python-rpm-macros` packages, which points `python3_version` and
  `python3_pkgversion` to 3.6 and 36 respectively. in this case,
  `rpmbuild` will complain, because when we run `yum-builddep`,
  `python3_version` was still "3.4".
- system does not have python3 installed before `yum-builddep`. so
  it was using python34 for preparing the "BuildRequires". but some
  of the packages installed by `yum-builddep` installs python36, and
  also the updated `python-rpm-macros` packages, which points
  `python3_version` and `python3_pkgversion` to 3.6 and 36 respectively.
  in this case, `rpmbuild` will complain, because the python36 related
  dependencies are missing. what the system has is python34
  dependencies.
- system does not have python3 installed before `yum-builddep`. so
  it was using python34 for preparing the "BuildRequires". but some
  of the packages installed by `yum-builddep` installs python34, and
  also the updated `python-rpm-macros` packages, which points
  `python3_version` and `python3_pkgversion` to 3.4 and 34 respectively.
  in this case, `rpmbuild` won't complain, as the
  `python3_pkgversion` and `python_version` are also consistent before and
  after `yum-builddep`.

as we cannot tell if the system has python3 or what the python3 version
the system has before `yum-builddep`, so what we can do is to ensure
`rpmbuild` has what it needs to build Ceph. so let's just stick with
python3.6.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 658ca2b0d79022edbc6cb1e488b243844e87bfbe)

6 years agocmake: should PYTHON3_VERSION_STRING of libpython3
Kefu Chai [Fri, 5 Apr 2019 17:54:15 +0000 (01:54 +0800)]
cmake: should PYTHON3_VERSION_STRING of libpython3

and make sure the version matches exactly the requested one

in future, we should use FindPython.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7b15b682b1201929e0ba9efc332ebb8652be40a8)

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>
(cherry picked from commit d1e83082b42f784d83b2342bb953d3931a940173)

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>
(cherry picked from commit 8b3f0d5bcce8a5c8ddff0a362fbccb05d18335f6)

6 years agorpm: use python3.4 on RHEL7 by default
Kefu Chai [Thu, 4 Apr 2019 18:46:40 +0000 (02:46 +0800)]
rpm: use python3.4 on RHEL7 by default

python3.4 is the native python3 before 7.6

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cea9d18ced929a330f2299681ef93768449a05ed)

6 years agoMerge PR #27387 into nautilus
Sage Weil [Wed, 10 Apr 2019 21:49:17 +0000 (16:49 -0500)]
Merge PR #27387 into nautilus

* refs/pull/27387/head:
mgr/pg_autoscaler: apply bias to pg_num selection
mgr/pg_autoscaler: include pg_autoscale_bias in autoscale-status table
osd/osd_types,mon: add pg_autoscale_bias pool property

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge PR #27399 into nautilus
Sage Weil [Wed, 10 Apr 2019 21:48:57 +0000 (16:48 -0500)]
Merge PR #27399 into nautilus

* refs/pull/27399/head:
mon/MonmapMonitor: clean up empty created stamp in monmap

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #27402 into nautilus
Sage Weil [Wed, 10 Apr 2019 21:48:41 +0000 (16:48 -0500)]
Merge PR #27402 into nautilus

* refs/pull/27402/head:
OSD: OSDMapRef access by multiple threads is unsafe

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge PR #27440 into nautilus
Sage Weil [Wed, 10 Apr 2019 21:48:16 +0000 (16:48 -0500)]
Merge PR #27440 into nautilus

* refs/pull/27440/head:
os/filestore/FileJournal: note EIO events
os/filestore: make note of EIO errors when we see them
os/filestore: note devname for later use
global/signal_handler: avoid core dump on EIO
os/bluestore/KernelDevice: note EIO metadata on aio EIO
global: add hook to annotate crash report with EIO information

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge PR #27487 into nautilus
Sage Weil [Wed, 10 Apr 2019 15:28:35 +0000 (10:28 -0500)]
Merge PR #27487 into nautilus

* refs/pull/27487/head:
doc/orchestrator: Fix broken bullet points

6 years agomgr/dashboard: Add whitelist to guard 27492/head
Ernesto Puerta [Fri, 5 Apr 2019 16:22:30 +0000 (18:22 +0200)]
mgr/dashboard: Add whitelist to guard

After PR https://github.com/ceph/ceph/pull/26572, when RGW is not
  configured, accessing /rgw drop-down (daemons, users or buckets)
  results in nothing apparently happening (not even an error).

  Under the curtains, what is happening is that the ModuleStatusGuard
  has redirected the route to the rgw/501, but as this route is now
  under parent rgw route handler, which sets CanActivateChild guards,
  this results in a new ModuleStatusGuard invokation, a subsequent
  failure and a new redirection to rgw/501.

  Several approaches could be taken here:
  - Remove error pages from lazy-loaded modules. Probably it does not
  make sense to have a 501 page per component.
  - Add some whitelist to avoid this kind of loop (e.g.: 501, or any
      error page).
  - Set a max number of redirections (cautionary measure).

Fixes: https://tracker.ceph.com/issues/39125
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit c64b815386d9b7b89c69fb7e8387c7b7b7cf408c)
Signed-off-by: Ernesto Puerta <epuertat@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>
(cherry picked from commit b8dc3b5c8ab826f926197cd3cd0a597cb43e0a52)
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>
(cherry picked from commit 33466883948a4155ee2f7716effe1d1f5aa00cc6)
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
6 years agodoc/orchestrator: Fix broken bullet points 27487/head
Sebastian Wagner [Fri, 22 Mar 2019 13:11:05 +0000 (14:11 +0100)]
doc/orchestrator: Fix broken bullet points

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

6 years agomgr/rook: Fix creation of bluestore OSDs: 27486/head
Sebastian Wagner [Mon, 1 Apr 2019 13:22:58 +0000 (15:22 +0200)]
mgr/rook: Fix creation of bluestore OSDs:

See https://rook.io/docs/rook/v0.9/ceph-cluster-crd.html
    Storage Configuration: Specific devices

Fixes http://tracker.ceph.com/issues/39062

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

6 years agoosd: process_copy_chunk remove obc ref before pg unlock 27478/head
Zengran Zhang [Mon, 25 Mar 2019 08:54:54 +0000 (16:54 +0800)]
osd: process_copy_chunk remove obc ref before pg unlock

drop the obc ref when pg locked is more safer, if not, on_change
may failed to clear it, and on_flushed may find leak.

Fixes: http://tracker.ceph.com/issues/38842
Signed-off-by: Kefu Chai kchai@redhat.com
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit 70874399da47411e1e07824ef50dd82c4ebb6922)

6 years agolibrbd: trash move return EBUSY instead of EINVAL for migrating image 27475/head
Mykola Golub [Mon, 25 Mar 2019 07:38:53 +0000 (07:38 +0000)]
librbd: trash move return EBUSY instead of EINVAL for migrating image

Fixes: https://tracker.ceph.com/issues/38895
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit d5b52eaef3626730002792b782cba2db50680d8d)

6 years agoMerge pull request #27388 from liewegas/wip-deferred-log-start-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 23:49:55 +0000 (16:49 -0700)]
Merge pull request #27388 from liewegas/wip-deferred-log-start-nautilus

nautilus: common: fix deferred log starting

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #27449 from ricardoasmarques/wip-39108-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 23:49:04 +0000 (16:49 -0700)]
Merge pull request #27449 from ricardoasmarques/wip-39108-nautilus

nautilus: mgr/dashboard: Typo in "CephFS Name" field on NFS form

Reviewed-by:  Tiago Melo <tmelo@suse.com>

6 years agoMerge pull request #27460 from ricardoasmarques/wip-39114-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 23:48:16 +0000 (16:48 -0700)]
Merge pull request #27460 from ricardoasmarques/wip-39114-nautilus

nautilus: mgr/dashboard: Error on iSCSI disk diff

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #27125 from smithfarm/wip-38863-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 14:38:56 +0000 (07:38 -0700)]
Merge pull request #27125 from smithfarm/wip-38863-nautilus

nautilus: build/ops: ceph-mgr-diskprediction-local requires numpy and scipy on SUSE, but these packages do not exist on SUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27208 from pdvian/wip-38773-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 14:38:23 +0000 (07:38 -0700)]
Merge pull request #27208 from pdvian/wip-38773-nautilus

nautilus: rgw: nfs: skip empty (non-POSIX) path segments

Reviewed-by: Adam Emerson <aemerson@redhat.com>
6 years agoMerge pull request #27232 from pdvian/wip-38774-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 14:37:45 +0000 (07:37 -0700)]
Merge pull request #27232 from pdvian/wip-38774-nautilus

nautilus: rgw: nfs: svc-enable RGWLib

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #27239 from smithfarm/wip-38956-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 14:37:16 +0000 (07:37 -0700)]
Merge pull request #27239 from smithfarm/wip-38956-nautilus

nautilus: backport krbd discard qa fixes to stable branches

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agoMerge pull request #27127 from smithfarm/wip-38862-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 14:36:39 +0000 (07:36 -0700)]
Merge pull request #27127 from smithfarm/wip-38862-nautilus

nautilus: build/ops: Running ceph under Pacemaker control not supported by SUSE Linux Enterprise

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/dashboard: Fix iSCSI target submission 27461/head
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>
(cherry picked from commit d63f206310c974441d45669ea4b668b6d17df5db)

6 years agomgr/dashboard: Fix iSCSI disk diff calculation 27460/head
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>
(cherry picked from commit 78595acff63817f793e4ec013ed85f4a9f4d612d)

6 years agomgr/dashboard: Check if gateway is in use before deletion 27457/head
Ricardo Marques [Fri, 29 Mar 2019 09:28:56 +0000 (09:28 +0000)]
mgr/dashboard: Check if gateway is in use before deletion

Fixes: https://tracker.ceph.com/issues/39029
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 0e357ca70679a67155e54cd2cf804f1819d23d69)

6 years agoMerge pull request #27394 from s0nea/wip-39124-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 02:09:13 +0000 (19:09 -0700)]
Merge pull request #27394 from s0nea/wip-39124-nautilus

nautilus: mgr/dashboard: update vstart to use new ssl_server_port

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agoMerge pull request #27398 from Devp00l/wip-39041-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 02:08:29 +0000 (19:08 -0700)]
Merge pull request #27398 from Devp00l/wip-39041-nautilus

nautilus: mgr/dashboard: FixtureHelper

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #27405 from Devp00l/wip-39058-nautilus
Yuri Weinstein [Tue, 9 Apr 2019 02:07:54 +0000 (19:07 -0700)]
Merge pull request #27405 from Devp00l/wip-39058-nautilus

nautilus: mgr/dashboard: Back button component

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
6 years agomgr/DaemonServer: handle_conf_change - fix broken locking 27454/head
xie xingguo [Tue, 26 Mar 2019 08:08:43 +0000 (16:08 +0800)]
mgr/DaemonServer: handle_conf_change - fix broken locking

The is_locked_by_me() is only meant to be safe if you know
you hold the lock. It's meant to be used in an assertion.

Fixes: http://tracker.ceph.com/issues/38899
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit a929a5a01508e661fc7f3cea52822320d39983d2)

6 years agomgr/dashboard: Display the number of iSCSI active sessions 27450/head
Ricardo Marques [Thu, 28 Mar 2019 14:54:23 +0000 (14:54 +0000)]
mgr/dashboard: Display the number of iSCSI active sessions

Fixes: https://tracker.ceph.com/issues/38989
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 74e12be82b7b47f7880ac6cb8209898c3a80601f)

6 years agomgr/dashboard: Fix typo in NFS form 27449/head
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>
(cherry picked from commit 6c5ed447161b9815671c3237610464262764f146)

6 years agoMerge pull request #27283 from pdvian/wip-38878-nautilus
Yuri Weinstein [Mon, 8 Apr 2019 16:38:35 +0000 (09:38 -0700)]
Merge pull request #27283 from pdvian/wip-38878-nautilus

nautilus: mgr/dashboard: Add date range and log search functionality

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agoMerge pull request #27389 from ricardoasmarques/wip-38984-nautilus
Yuri Weinstein [Mon, 8 Apr 2019 16:38:07 +0000 (09:38 -0700)]
Merge pull request #27389 from ricardoasmarques/wip-38984-nautilus

nautilus: mgr/dashboard: PreventDefault isn't working on 400 errors

Reviewed-by: Stephan Müller <smueller@suse.com>
6 years agoMerge pull request #27393 from s0nea/wip-39001-nautilus
Yuri Weinstein [Mon, 8 Apr 2019 16:37:10 +0000 (09:37 -0700)]
Merge pull request #27393 from s0nea/wip-39001-nautilus

nautilus: mgr/dashboard: Add separate option to config SSL port

Reviewed-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #27395 from Devp00l/wip-issue-38960
Yuri Weinstein [Mon, 8 Apr 2019 16:36:34 +0000 (09:36 -0700)]
Merge pull request #27395 from Devp00l/wip-issue-38960

nautilus: mgr/dashboard: Fixes tooltip behavior

Reviewed-by: Ricardo Marques <rimarques@suse.com>
6 years agocommon: add --log-early command line option 27388/head
Sage Weil [Sun, 7 Apr 2019 18:54:59 +0000 (13:54 -0500)]
common: add --log-early command line option

Sometime it is important and useful to see the logs from the bootstrap
phase where we are getting the initial configs from the monitors.  Add
a command-line option --log-early to do that.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 933d5084cb66f299a7bf60f0a2a6382c0bd3cb2f)

6 years agoos/filestore/FileJournal: note EIO events 27440/head
Sage Weil [Thu, 4 Apr 2019 20:49:11 +0000 (15:49 -0500)]
os/filestore/FileJournal: note EIO events

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 614fb4631a8909d97ea82ae657361017816b6a65)

6 years agoos/filestore: make note of EIO errors when we see them
Sage Weil [Thu, 4 Apr 2019 20:48:40 +0000 (15:48 -0500)]
os/filestore: make note of EIO errors when we see them

This is imprecise, since we can't (easily) map an EIO back to a specific
part of the device, or even (easily) tell whether it was a read or write
error.  It's enough to mark a crash dump as an EIO event, though, and to
include the name of the (primary) filestore device.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8827250d5ae2ba5dc18c28d11c986c80d888489a)

6 years agoos/filestore: note devname for later use
Sage Weil [Thu, 4 Apr 2019 20:09:15 +0000 (15:09 -0500)]
os/filestore: note devname for later use

This will generally happen early, before we see an EIO error and need it.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cef94b72b2f66346b51759ce07afed072e25582f)

6 years agoglobal/signal_handler: avoid core dump on EIO
Sage Weil [Thu, 4 Apr 2019 19:51:21 +0000 (14:51 -0500)]
global/signal_handler: avoid core dump on EIO

Generating a core dump is overkill if we hit an EIO error from the
hardware.  Exit with an error code instead.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e3464df47b2e83ee160362a897adc1191a922ce9)

6 years agoos/bluestore/KernelDevice: note EIO metadata on aio EIO
Sage Weil [Thu, 4 Apr 2019 19:47:17 +0000 (14:47 -0500)]
os/bluestore/KernelDevice: note EIO metadata on aio EIO

Note that we only do this if we're about to induce a crash.  If we can
pass EIO up the stack, it's up to the upper layer to handle it or trigger
its own crash if it can't.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 145333576c49eb591af7aef954d4039dcde471e4)

6 years agoglobal: add hook to annotate crash report with EIO information
Sage Weil [Thu, 4 Apr 2019 19:45:52 +0000 (14:45 -0500)]
global: add hook to annotate crash report with EIO information

If the global g_eio* fields are populated, include them in the crash
report, similar to how we populate assertion metadata.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7f9df6158dca9da40cff3e9f18009169044312b4)

6 years agolibrbd: look for pool metadata in default namespace 27423/head
Mykola Golub [Mon, 25 Mar 2019 06:54:46 +0000 (06:54 +0000)]
librbd: look for pool metadata in default namespace

when applying pool level config overrides

Fixes: https://tracker.ceph.com/issues/38928
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 1729f149375420058c6628eb079cdc0c5ae92899)

6 years agoMerge pull request #27128 from smithfarm/wip-38865-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:05:59 +0000 (13:05 -0700)]
Merge pull request #27128 from smithfarm/wip-38865-nautilus

nautilus: ceph-mgr:  ImportError: Interpreter change detected - this module can only be loaded into one interprer per process.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #27227 from pdvian/wip-38855-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:05:29 +0000 (13:05 -0700)]
Merge pull request #27227 from pdvian/wip-38855-nautilus

nautilus: mgr/balancer: Python 3 compatibility fix

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #27302 from pdvian/wip-38906-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:04:29 +0000 (13:04 -0700)]
Merge pull request #27302 from pdvian/wip-38906-nautilus

nautilus: osd/PGLog.h: print olog_can_rollback_to before deciding to rollback

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27319 from sebastian-philipp/wip-39083-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:03:48 +0000 (13:03 -0700)]
Merge pull request #27319 from sebastian-philipp/wip-39083-nautilus

nautilus: mgr/deepsea: use ceph_volume output in get_inventory()

Reviewed-by: Tim Serong <tserong@suse.com>
6 years agoMerge pull request #27346 from liewegas/wip-cluster-log-to-file-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:03:04 +0000 (13:03 -0700)]
Merge pull request #27346 from liewegas/wip-cluster-log-to-file-nautilus

nautilus: mon: add cluster log to file option

6 years agoMerge pull request #27347 from liewegas/wip-ok-to-stop-nautilus
Yuri Weinstein [Fri, 5 Apr 2019 20:02:09 +0000 (13:02 -0700)]
Merge pull request #27347 from liewegas/wip-ok-to-stop-nautilus

nautilus: mon: ok-to-stop commands for mon and mds

Reviewed-by: Kefu Chai <kchai@redhat.com>