]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoos/bluestore: do not set osd_memory_target default from cgroup limit 29745/head
Sage Weil [Fri, 9 Aug 2019 17:25:59 +0000 (12:25 -0500)]
os/bluestore: do not set osd_memory_target default from cgroup limit

On the aarch64 box I'm testing, this gives us a value of
7378697629483768832, which is not what we want.

I think we are better off relying on this limit being explicitly set via
environment variables (POD_* by kuberentes/rook) or via the command line.

This partially reverts 5c6b533697814af8acfd9e731a2599b2294687ef, but not
all of it, since we wan to keep the option itself, as it is now used by
common/config.cc when dealing with the POD_MEMORY_LIMIT env var.

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

5 years agoMerge pull request #29650 from pdvian/wip-40945-nautilus
Yuri Weinstein [Mon, 19 Aug 2019 16:14:00 +0000 (09:14 -0700)]
Merge pull request #29650 from pdvian/wip-40945-nautilus

nautilus: mgr/dashboard: RGW User quota validation is not working correctly

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge pull request #29678 from pdvian/wip-40948-nautilus
Yuri Weinstein [Mon, 19 Aug 2019 16:13:01 +0000 (09:13 -0700)]
Merge pull request #29678 from pdvian/wip-40948-nautilus

nautilus: core: Better default value for osd_snap_trim_sleep

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #27684 from liewegas/wip-rgw-pgs-nautilus
Casey Bodley [Mon, 19 Aug 2019 14:38:06 +0000 (10:38 -0400)]
Merge pull request #27684 from liewegas/wip-rgw-pgs-nautilus

nautilus: rgw: remove rgw_num_rados_handles; set autoscale parameters or rgw metadata pools

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29478 from xiaoxichen/wip-41002
Yuri Weinstein [Mon, 19 Aug 2019 14:37:47 +0000 (07:37 -0700)]
Merge pull request #29478 from xiaoxichen/wip-41002

nautilus: cephfs: client: unlink dentry for inode with llref=0

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29724 from dillaman/wip-40888-nautilus
Nathan Cutler [Mon, 19 Aug 2019 14:08:36 +0000 (16:08 +0200)]
Merge pull request #29724 from dillaman/wip-40888-nautilus

nautilus: doc/rbd: initial live-migration documentation

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agorgw: pass mostly_omap flag when opening/creating pools 27684/head
Sage Weil [Fri, 5 Apr 2019 22:37:57 +0000 (17:37 -0500)]
rgw: pass mostly_omap flag when opening/creating pools

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

5 years agorgw/rgw_rados: pass mostly_omap flag when opening/creating pools
Sage Weil [Thu, 4 Apr 2019 11:41:22 +0000 (06:41 -0500)]
rgw/rgw_rados: pass mostly_omap flag when opening/creating pools

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

5 years agorgw: move rgw_init_ioctx() to rgw_tools.cc
Abhishek Lekshmanan [Mon, 19 Aug 2019 10:50:37 +0000 (12:50 +0200)]
rgw: move rgw_init_ioctx() to rgw_tools.cc

move rgw_init_ioctx() out of rgw_rados.cc so that it doesn't need to be
duplicated by services/svc_rados.cc

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1cf90269057ed18636879edef28b6e038352e335)

 Conflicts:
src/rgw/rgw_gc.cc
include conflicts with scope_guard, added rgw_tools include as well which
introduces rgw_init_ioctx

5 years agorgw: Get rid of num_rados_handles infrastructure in RGWSI_RADOS
Adam C. Emerson [Wed, 30 Jan 2019 19:26:33 +0000 (14:26 -0500)]
rgw: Get rid of num_rados_handles infrastructure in RGWSI_RADOS

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 5666b4c41a70bac75e26b44a2cec1bd895d8375d)

5 years agorgw: Get rid of num_rados_handles infrastructure in RGWRados
Adam C. Emerson [Wed, 23 Jan 2019 21:01:40 +0000 (16:01 -0500)]
rgw: Get rid of num_rados_handles infrastructure in RGWRados

Since we aren't supporting multiple handles, don't have the overhead.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 042776bbf64c34dc817980d52cebdd069492b0e6)

5 years agorgw: Remove rgw_num_rados_handles option
Abhishek Lekshmanan [Thu, 15 Aug 2019 15:25:22 +0000 (17:25 +0200)]
rgw: Remove rgw_num_rados_handles option

This has been deprecated for some time and underlies much of the
complexity of the RADOS service.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 55180511e5e5a2d9965a1bad17218ee64e023484)

Conflicts:
PendingReleaseNotes
updated to reflect current nautilus status

5 years agodoc/rbd: initial live-migration documentation 29724/head
Jason Dillaman [Fri, 19 Jul 2019 15:20:38 +0000 (11:20 -0400)]
doc/rbd: initial live-migration documentation

Fixes: http://tracker.ceph.com/issues/40486
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 20c80dfd3fac134a1e897f17d7b2f2082024d9e9)

Conflicts:
doc/rbd/rbd-operations.rst: did not backport restructuring

5 years agoMerge pull request #29436 from wjwithagen/wip-41038-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:31:30 +0000 (08:31 -0700)]
Merge pull request #29436 from wjwithagen/wip-41038-nautilus

nautilus: cmake: update FindBoost.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #29454 from pdvian/wip-40734-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:31:07 +0000 (08:31 -0700)]
Merge pull request #29454 from pdvian/wip-40734-nautilus

nautilus: mgr/diskprediction_cloud: Service unavailable

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #29352 from Devp00l/wip-40658-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:26:16 +0000 (08:26 -0700)]
Merge pull request #29352 from Devp00l/wip-40658-nautilus

nautilus: mgr/dashboard: Pool graph/sparkline points do not display the correct values

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
5 years agoMerge pull request #29354 from Devp00l/wip-40982-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:25:14 +0000 (08:25 -0700)]
Merge pull request #29354 from Devp00l/wip-40982-nautilus

 nautilus: mgr/dashboard: Fix the table mouseenter event handling test

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

5 years agoMerge pull request #29524 from pdvian/wip-40846-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:23:53 +0000 (08:23 -0700)]
Merge pull request #29524 from pdvian/wip-40846-nautilus

nautilus: mgr/dashboard: controllers/grafana is not Python3 compatible

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #29566 from pdvian/wip-40885-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:22:33 +0000 (08:22 -0700)]
Merge pull request #29566 from pdvian/wip-40885-nautilus

nautilus: mon/MgrMonitor: fix null deref when invalid formatter is specified

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
5 years agoMerge pull request #29671 from neha-ojha/wip-40322-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:21:55 +0000 (08:21 -0700)]
Merge pull request #29671 from neha-ojha/wip-40322-nautilus

nautilus: mon/OSDMonitor: allow pg_num to increase when require_osd_release < N

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #29682 from b-ranto/wip-push-dash
Yuri Weinstein [Sun, 18 Aug 2019 15:21:06 +0000 (08:21 -0700)]
Merge pull request #29682 from b-ranto/wip-push-dash

nautilus: rpm: Require ceph-grafana-dashboards

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #29308 from smithfarm/wip-40518-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:18:30 +0000 (08:18 -0700)]
Merge pull request #29308 from smithfarm/wip-40518-nautilus

nautilus: rgw: RGWGC add perfcounter retire counter

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #29326 from smithfarm/wip-40540-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:17:56 +0000 (08:17 -0700)]
Merge pull request #29326 from smithfarm/wip-40540-nautilus

nautilus: rgw: multisite: 'radosgw-admin bilog trim' stops after 1000 entries

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29328 from smithfarm/wip-40237-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:17:29 +0000 (08:17 -0700)]
Merge pull request #29328 from smithfarm/wip-40237-nautilus

nautilus: rbd: profile rbd OSD cap should add class rbd metadata_list cap by default.

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #29329 from smithfarm/wip-40501-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:16:57 +0000 (08:16 -0700)]
Merge pull request #29329 from smithfarm/wip-40501-nautilus

nautilus: rbd: [cli] 'export' should handle concurrent IO completions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #29409 from pdvian/wip-40600-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:16:27 +0000 (08:16 -0700)]
Merge pull request #29409 from pdvian/wip-40600-nautilus

nautilus: rgw_file: fix readdir eof() calc--caller stop implies !eof

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #29410 from pdvian/wip-40627-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)]
Merge pull request #29410 from pdvian/wip-40627-nautilus

nautilus: rgw_file: advance_mtime() should consider namespace expiration

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #29499 from pdvian/wip-40848-nautilus
Yuri Weinstein [Sun, 18 Aug 2019 15:13:14 +0000 (08:13 -0700)]
Merge pull request #29499 from pdvian/wip-40848-nautilus

nautilus: rgw: Don't crash on copy when metadata directive not supplied

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #29697 from pdvian/wip-41084-nautilus
Neha Ojha [Fri, 16 Aug 2019 16:31:11 +0000 (09:31 -0700)]
Merge pull request #29697 from pdvian/wip-41084-nautilus

nautilus: core: Change default for bluestore_fsck_on_mount_deep as false

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29660 from jan--f/wip-41248-nautilus
Alfredo Deza [Fri, 16 Aug 2019 13:55:08 +0000 (09:55 -0400)]
Merge pull request #29660 from jan--f/wip-41248-nautilus

nautilus: ceph-volume: simple functional tests drop test for lvm zap

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoceph-volume: don't try to test lvm zap on simple tests 29660/head
Jan Fajerski [Wed, 14 Aug 2019 12:36:58 +0000 (14:36 +0200)]
ceph-volume: don't try to test lvm zap on simple tests

Fixes: https://tracker.ceph.com/issues/41245
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 081109859a06f1b2ff6652dce07da4ddf6fb258e)

5 years agoMerge pull request #29702 from jan--f/wip-41308-nautilus
Alfredo Deza [Fri, 16 Aug 2019 11:45:06 +0000 (07:45 -0400)]
Merge pull request #29702 from jan--f/wip-41308-nautilus

nautilus: ceph-volume: [filestore,bluestore] single type strategies fail after tracking devices as sets

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #29689 from jan--f/wip-41299-nautilus
Alfredo Deza [Fri, 16 Aug 2019 11:43:52 +0000 (07:43 -0400)]
Merge pull request #29689 from jan--f/wip-41299-nautilus

nautilus: batch functional idempotency test fails since message is now on stderr

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #29455 from pdvian/wip-40672-nautilus
Nathan Cutler [Fri, 16 Aug 2019 09:15:20 +0000 (11:15 +0200)]
Merge pull request #29455 from pdvian/wip-40672-nautilus

nautilus: doc: fix rgw ldap username token

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoceph-volume: fix batch functional tests, idempotent test must check stderr 29689/head
Jan Fajerski [Thu, 15 Aug 2019 11:28:42 +0000 (13:28 +0200)]
ceph-volume: fix batch functional tests, idempotent test must check stderr

Fixes: https://tracker.ceph.com/issues/41295
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 88807110f3014e7a2a39c37ae5c64bb3ab107d80)

5 years agoceph-volume: don't keep device lists as sets 29702/head
Jan Fajerski [Thu, 15 Aug 2019 10:20:00 +0000 (12:20 +0200)]
ceph-volume: don't keep device lists as sets

This was introduced by #27754. The explicit device lists were cast to
sets but other parts of the code where not updated accordingly. To avoid
touching all code places, only cast to sets for disjoint test and keep
lists otherwise.

Fixes: https://tracker.ceph.com/issues/41292
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 0534cf188a671096d5ddb9d48cdae3dccc6c0b18)

5 years agoMerge pull request #29690 from jan--f/wip-41082-nautilus
Jan Fajerski [Fri, 16 Aug 2019 08:28:08 +0000 (10:28 +0200)]
Merge pull request #29690 from jan--f/wip-41082-nautilus

nautilus: ceph-volume: batch gets confused when the same device is passed in two device lists

5 years agocommon/options.cc: common/options.cc: change default value of bluestore_fsck_on_umoun... 29697/head
Neha Ojha [Wed, 31 Jul 2019 20:08:24 +0000 (13:08 -0700)]
common/options.cc: common/options.cc: change default value of bluestore_fsck_on_umount_deep to false

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 8c86c3a5b4bdca258016019f63359f52aa8cd84b)

5 years agocommon/options.cc: change default value of bluestore_fsck_on_mount_deep to false
Neha Ojha [Wed, 31 Jul 2019 00:05:18 +0000 (17:05 -0700)]
common/options.cc: change default value of bluestore_fsck_on_mount_deep to false

Fixes: https://tracker.ceph.com/issues/41017
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 7c03f088f1004d4e26b6bdea8fa58f8455f1d6a2)

5 years agoMerge pull request #29645 from yuriw/wip-yuriw-upgrade-rbd-nautilus
Yuri Weinstein [Thu, 15 Aug 2019 20:04:32 +0000 (13:04 -0700)]
Merge pull request #29645 from yuriw/wip-yuriw-upgrade-rbd-nautilus

qa/tests: added rbd_fsx tests to the tests mix

5 years agoMerge pull request #29065 from s0nea/wip-40786-nautilus
Yuri Weinstein [Thu, 15 Aug 2019 20:00:17 +0000 (13:00 -0700)]
Merge pull request #29065 from s0nea/wip-40786-nautilus

nautilus: mgr/dashboard: SSL certificate upload command throws deprecation warning

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
5 years agoMerge pull request #29372 from pdvian/wip-40537-nautilus
Yuri Weinstein [Thu, 15 Aug 2019 19:59:32 +0000 (12:59 -0700)]
Merge pull request #29372 from pdvian/wip-40537-nautilus

nautilus: osd/PG: do not queue scrub if PG is not active when unblock

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29373 from pdvian/wip-40542-nautilus
Yuri Weinstein [Thu, 15 Aug 2019 19:58:55 +0000 (12:58 -0700)]
Merge pull request #29373 from pdvian/wip-40542-nautilus

nautilus: mon: take the mon lock in handle_conf_change

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29562 from liewegas/wip-41037-nautilus
Yuri Weinstein [Thu, 15 Aug 2019 19:58:18 +0000 (12:58 -0700)]
Merge pull request #29562 from liewegas/wip-41037-nautilus

nautilus: common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29694 from jan--f/c-v-no-dashboard-test-nautilus
Jan Fajerski [Thu, 15 Aug 2019 17:10:34 +0000 (19:10 +0200)]
Merge pull request #29694 from jan--f/c-v-no-dashboard-test-nautilus

nautilus: ceph-volume: run functional tests without dashboard

5 years agoMerge pull request #29484 from pdvian/wip-40737-nautilus
Nathan Cutler [Thu, 15 Aug 2019 15:45:47 +0000 (17:45 +0200)]
Merge pull request #29484 from pdvian/wip-40737-nautilus

nautilus: doc/rgw: document use of 'realm pull' instead of 'period pull'

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #29444 from ricardoasmarques/fix-ceph-iscsi-required-version-nautilus
Nathan Cutler [Thu, 15 Aug 2019 15:32:29 +0000 (17:32 +0200)]
Merge pull request #29444 from ricardoasmarques/fix-ceph-iscsi-required-version-nautilus

nautilus: doc: Update 'ceph-iscsi' min version

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-volume: when testing disable the dashboard 29694/head
Andrew Schoen [Mon, 29 Jul 2019 20:25:19 +0000 (15:25 -0500)]
ceph-volume: when testing disable the dashboard

ceph-ansible has started enabling the dashboard by
default as of https://github.com/ceph/ceph-ansible/pull/4268

Disabling the dashboard gets us around needing to run
the grafana_server role which is required for the dashboard
and not needed for ceph-volume functional tests.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 7b7ff0d530c5f28e933602505b66efc4df24e62e)

5 years agoMerge pull request #29306 from smithfarm/wip-40498-nautilus
Nathan Cutler [Thu, 15 Aug 2019 15:22:36 +0000 (17:22 +0200)]
Merge pull request #29306 from smithfarm/wip-40498-nautilus

nautilus: doc: Object Gateway multisite document read-only argument error

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoceph-volume: batch ensure device lists are disjoint 29690/head
Jan Fajerski [Thu, 11 Apr 2019 14:58:32 +0000 (16:58 +0200)]
ceph-volume: batch ensure device lists are disjoint

Fixes: https://tracker.ceph.com/issues/41018
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8fcdb4d628f3a55e4783f0a3df7ac7c0a36eaa43)

5 years agorpm: Require ceph-grafana-dashboards 29682/head
Boris Ranto [Thu, 11 Jul 2019 15:21:53 +0000 (17:21 +0200)]
rpm: Require ceph-grafana-dashboards

The recently introduced 'dashboard grafana dashboards update' command
requires the grafana dashboards for it to work properly. Adding the
dependency.

Signed-off-by: Boris Ranto <branto@redhat.com>
5 years agocommon/options.cc, doc: osd_snap_trim_sleep overrides other variants 29678/head
Neha Ojha [Fri, 28 Jun 2019 16:53:01 +0000 (09:53 -0700)]
common/options.cc, doc: osd_snap_trim_sleep overrides other variants

A value > 0 for osd_snap_trim_sleep, will override the backend specific
variants of osd_snap_trim_sleep.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 733df09fe5111e7beca75f8be0afb8669ef9a625)

5 years agodoc/rados/configuration/osd-config-ref.rst: document snap trim sleep
Neha Ojha [Thu, 27 Jun 2019 19:33:46 +0000 (12:33 -0700)]
doc/rados/configuration/osd-config-ref.rst: document snap trim sleep

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit accf95e9dea257c3aaa64b7a36d077468d7c86ec)

5 years agoosd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep
Neha Ojha [Wed, 26 Jun 2019 01:43:05 +0000 (18:43 -0700)]
osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

This is better than the earlier default, which was set to 0.

Fixes: https://tracker.ceph.com/issues/40528
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 560fca12e695a817e1b7e46d365838ed871b64bd)

Conflicts:
src/osd/OSD.cc : Resolved for get_osd_snap_trim_sleep

5 years agomon/OSDMonitor.cc: use CEPH_RELEASE_LUMINOUS instead of ceph_release_t::nautilus 29671/head
Neha Ojha [Thu, 15 Aug 2019 00:21:48 +0000 (17:21 -0700)]
mon/OSDMonitor.cc: use CEPH_RELEASE_LUMINOUS instead of ceph_release_t::nautilus

This commit is specific to nautilus, since cherry-pick of
7e7134aa9317a0d64503edb20b9ea1f4035c7e9e and
d2c591a142479cf5dd58da599da8d7212f5c5701, did not result in conflicts.

Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #29442 from pdvian/wip-40659-nautilus
Yuri Weinstein [Wed, 14 Aug 2019 23:08:39 +0000 (16:08 -0700)]
Merge pull request #29442 from pdvian/wip-40659-nautilus

nautilus: mgr/dashboard: Interlock `fast-diff` and `object-map`

5 years agomon/OSDMonitor: require nautilus to set pg_autoscale_mode
Sage Weil [Tue, 7 May 2019 16:05:30 +0000 (11:05 -0500)]
mon/OSDMonitor: require nautilus to set pg_autoscale_mode

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

5 years agomon/OSDMonitor: allow pg_num to increase when require_osd_release < N
Sage Weil [Thu, 2 May 2019 16:18:17 +0000 (11:18 -0500)]
mon/OSDMonitor: allow pg_num to increase when require_osd_release < N

Setting pg_num_target has no effect when we encode our OSDMap with mimic
or luminous features.  Fall back to the pre-nautilus behavior of directly
setting pg_num.

Fixes: http://tracker.ceph.com/issues/39570
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7e7134aa9317a0d64503edb20b9ea1f4035c7e9e)

5 years agoMerge pull request #29617 from pdvian/wip-40942-nautilus
Neha Ojha [Wed, 14 Aug 2019 17:39:07 +0000 (10:39 -0700)]
Merge pull request #29617 from pdvian/wip-40942-nautilus

nautilus: mon/OSDMonitor.cc: better error message about min_size

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomgr/dashboard: RGW User quota validation is not working correctly 29650/head
Volker Theile [Fri, 19 Jul 2019 12:20:17 +0000 (14:20 +0200)]
mgr/dashboard: RGW User quota validation is not working correctly

Fixes: https://tracker.ceph.com/issues/40829
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 06b654274dc309109c29f62ffc8df52636f6a146)

5 years agoqa/tests: added rbd_fsx tests to the tests mix 29645/head
Yuri Weinstein [Tue, 13 Aug 2019 20:16:23 +0000 (13:16 -0700)]
qa/tests: added rbd_fsx tests to the tests mix

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agomgr/dashboard: Pool list shows current r/w byte usage in graph 29352/head
Stephan Müller [Mon, 27 May 2019 13:10:58 +0000 (15:10 +0200)]
mgr/dashboard: Pool list shows current r/w byte usage in graph

Now the pool list will show the current read and write byte usage in the
sparkline graph like it is already done in the OSD listing.

Fixes: https://tracker.ceph.com/issues/39650
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 2f18cf577033f8a4f3e0115b1eb86240c084fc98)

 Conflicts (trivial):
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts

5 years agoMerge pull request #29600 from jan--f/wip-41203-nautilus
Alfredo Deza [Tue, 13 Aug 2019 13:33:29 +0000 (09:33 -0400)]
Merge pull request #29600 from jan--f/wip-41203-nautilus

nautilus: ceph-volume prints log messages to stdout

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agomon/OSDMonitor.cc: better error message about min_size 29617/head
Neha Ojha [Tue, 23 Jul 2019 00:50:31 +0000 (17:50 -0700)]
mon/OSDMonitor.cc: better error message about min_size

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit ce25ac0a9196f90acef82915f122c5a06277993a)

5 years agoMerge pull request #29440 from neha-ojha/wip-40940-nautilus 29589/head
Yuri Weinstein [Mon, 12 Aug 2019 22:30:37 +0000 (15:30 -0700)]
Merge pull request #29440 from neha-ojha/wip-40940-nautilus

nautilus: rocksdb: Updated to v6.1.2

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
5 years agoMerge pull request #29439 from neha-ojha/wip-40969-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 22:29:25 +0000 (15:29 -0700)]
Merge pull request #29439 from neha-ojha/wip-40969-nautilus

nautilus: rocksdb: rocksdb_rmrange related improvements

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #28833 from s0nea/wip-40616-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 21:05:42 +0000 (14:05 -0700)]
Merge pull request #28833 from s0nea/wip-40616-nautilus

nautilus: mgr/dashboard: notify the user about unset 'mon_allow_pool_delete' flag beforehand

Reviewed-by:  Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #28889 from bk201/wip-40661-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 21:04:28 +0000 (14:04 -0700)]
Merge pull request #28889 from bk201/wip-40661-nautilus

nautilus: mgr/dashboard: cephfs multimds graphs stack together

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge pull request #28912 from bk201/wip-40685-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 21:04:04 +0000 (14:04 -0700)]
Merge pull request #28912 from bk201/wip-40685-nautilus

nautilus: mgr/dashboard: Dentries value of MDS daemon in Filesystems page is inconsistent with ceph fs status output

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge pull request #28938 from Exotelis/i18n-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 21:03:23 +0000 (14:03 -0700)]
Merge pull request #28938 from Exotelis/i18n-nautilus

nautilus: mgr/dashboard: Add, update and remove translations

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

5 years agoMerge pull request #28968 from Devp00l/wip-40699-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 21:00:09 +0000 (14:00 -0700)]
Merge pull request #28968 from Devp00l/wip-40699-nautilus

nautilus: mgr/dashboard: Silence Alertmanager alerts

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

5 years agoMerge pull request #28974 from ricardoasmarques/wip-40723-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 20:59:26 +0000 (13:59 -0700)]
Merge pull request #28974 from ricardoasmarques/wip-40723-nautilus

nautilus: mgr/dashboard: Upgrade to ceph-iscsi config v10

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #28992 from smithfarm/wip-40691-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 20:58:54 +0000 (13:58 -0700)]
Merge pull request #28992 from smithfarm/wip-40691-nautilus

nautilus: build/ops: Module 'dashboard' has failed: No module named routes

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge pull request #29044 from s0nea/wip-40656-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 20:58:21 +0000 (13:58 -0700)]
Merge pull request #29044 from s0nea/wip-40656-nautilus

nautilus: mgr/dashboard: Changing rgw-api-host does not get effective without disable/enable dashboard mgr module

Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #29045 from s0nea/wip-40657-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 20:56:48 +0000 (13:56 -0700)]
Merge pull request #29045 from s0nea/wip-40657-nautilus

nautilus: mgr/dashboard: Display logged in information for each iSCSI client

Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge pull request #29061 from s0nea/wip-40279-nautilus
Yuri Weinstein [Mon, 12 Aug 2019 20:55:57 +0000 (13:55 -0700)]
Merge pull request #29061 from s0nea/wip-40279-nautilus

nautilus: mgr/dashboard: Optimize the calculation of portal IPs

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-volume: never log to stdout, use stderr instead 29600/head
Jan Fajerski [Thu, 8 Aug 2019 08:42:37 +0000 (10:42 +0200)]
ceph-volume: never log to stdout, use stderr instead

We should never print log messages to stdout, as this should be reserved
for output of ceph-volume.

Fixes: https://tracker.ceph.com/issues/41158
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b8d6dcbe9f803c96c0af68da54f1262e9b6a9e77)

5 years agoceph-volume: terminal: encode unicode when writing to stdout
Kefu Chai [Sun, 24 Mar 2019 09:11:31 +0000 (17:11 +0800)]
ceph-volume: terminal: encode unicode when writing to stdout

python determins the encoding of stdout and stderr based on the LC_CTYPE
and PYTHONIOENCODING env variable, by default, python3's sys.stdout uses
'utf-8' as its encoding, so it will be able to write unicode string even
the stdout is not attached to a tty device. but when it comes to
python2, it will default to ascii if neither of these variabls is set.
so, if we are writing unicode using `_Write` in an environment where
LC_CTYPE and/or PYTHONIOENCODING are using non UTF-8 encoding, it chokes
by raising `UnicodeEncodeError` exception.

in this change, we add a wrapper around `_Write._writer` so it is able
to write unicode string in such a non-unicode-friendly environment.

for more info related the encoding of stdout and stderr, see
https://docs.python.org/3/using/cmdline.html#envvar-PYTHONIOENCODING .

Signed-off-by: Alfredo Deza <adeza@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 77912c0c71874a23785d3bdd109ad61e4f4c0e28)

5 years agoMerge pull request #29491 from tspmelo/wip-41075-nautilus
Yuri Weinstein [Fri, 9 Aug 2019 16:01:03 +0000 (09:01 -0700)]
Merge pull request #29491 from tspmelo/wip-41075-nautilus

nautilus: mgr/dashboard: Fix e2e failures caused by webdriver version

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agomon/MgrMonitor: fix null deref when invalid formatter is specified 29566/head
Sage Weil [Wed, 17 Jul 2019 14:44:49 +0000 (09:44 -0500)]
mon/MgrMonitor: fix null deref when invalid formatter is specified

Fixes: https://tracker.ceph.com/issues/40804
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b3cc451fc299c7d377196aaa9058026dad231721)

5 years agocommon/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars 29562/head
Sage Weil [Tue, 6 Aug 2019 16:12:43 +0000 (11:12 -0500)]
common/config: respect POD_MEMORY_REQUEST *and* POD_MEMORY_LIMIT env vars

If a kubernetes pod spec specifies a limit of X, then the pod gets both
the limits.memory and requests.memory resource fields set, and rook passes
those as POD_MEMORY_LIMIT and POD_MEMORY_REQUEST environment variables.

This is a problem if only the limit is set, because we will end up
setting our osd_memory_target (and, in the future, other *_memory_targets)
to the hard limit, and the daemon will inevitably reach that threshold
and get killed.

Fix this by also looking at the POD_MEMORY_LIMIT value, and applying the
ratio (default: .8) to it, and setting our actual target to the min of
that and the POD_MEMORY_REQUEST.

Also, set the "default" target to ratio*limit, so that it will apply in
general when no request is specified.

When both request and limit are 10M, we then see

        "osd_memory_target": {
            "default": "800000000000",
            "env": "800000000000",
            "final": "800000000000"
        },

In a more "normal" situation where limit is 10M and request is 5M, we get

        "osd_memory_target": {
            "default": "800000000000",
            "env": "500000000000",
            "final": "500000000000"
        },

If only limit is specified (to 10M), we get

        "osd_memory_target": {
            "default": "800000000000",
            "final": "800000000000"
        },

Fixes: https://tracker.ceph.com/issues/41037
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 25f28e610fe674f24eaa0a66c9ccc91b03fdcc92)

5 years agocommon: add comment about pod memory requests/limits
Patrick Donnelly [Thu, 25 Jul 2019 19:12:35 +0000 (12:12 -0700)]
common: add comment about pod memory requests/limits

Written in private correspondence by Travis Nielson.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 94bcc45561c78f40e2fcd95aef9543029ddcc7ad)

5 years agocommon/config: let diff show non-build defaults
Sage Weil [Tue, 6 Aug 2019 15:53:06 +0000 (10:53 -0500)]
common/config: let diff show non-build defaults

Notably, this includes things from set_val_default(), which may be set
at runtime.

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

5 years agocommon/config: do no include multiple 'default' values
Sage Weil [Tue, 6 Aug 2019 15:47:04 +0000 (10:47 -0500)]
common/config: do no include multiple 'default' values

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

5 years agoMerge PR #29490 into nautilus
Patrick Donnelly [Wed, 7 Aug 2019 20:02:11 +0000 (13:02 -0700)]
Merge PR #29490 into nautilus

* refs/pull/29490/head:
mgr/volumes: set uid/gid of FS client's mount as 0/0
mgr/volumes: add `ceph fs subvolumegroup getpath` command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #29513 into nautilus
Sage Weil [Wed, 7 Aug 2019 18:25:12 +0000 (13:25 -0500)]
Merge PR #29513 into nautilus

* refs/pull/29513/head:
qa/tasks/ceph_deploy: assume systemd and simplify shutdown wonkiness
qa/tasks/ceph_deploy: do not rely on ceph-create-keys

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
5 years agoMerge pull request #29506 from jan--f/wip-41137-nautilus
Jan Fajerski [Wed, 7 Aug 2019 06:08:12 +0000 (08:08 +0200)]
Merge pull request #29506 from jan--f/wip-41137-nautilus

nautilus: ceph-volume prints errors to stdout with --format json

5 years agomgr/dashboard: controllers/grafana is not Python3 compatible 29524/head
Patrick Nawracay [Wed, 10 Jul 2019 10:48:46 +0000 (10:48 +0000)]
mgr/dashboard: controllers/grafana is not Python3 compatible

Fixes: http://tracker.ceph.com/issues/40428
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
(cherry picked from commit 2e0b8ff2133495806e75eedb07658f442b400994)

5 years agoqa/tasks/ceph_deploy: assume systemd and simplify shutdown wonkiness 29513/head
Sage Weil [Fri, 12 Jul 2019 19:06:10 +0000 (14:06 -0500)]
qa/tasks/ceph_deploy: assume systemd and simplify shutdown wonkiness

The 'service' command was succeeding but not actually stopping ceph.  But
we can safely assume systemd now so get rid of the weirdness here.

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

5 years agoqa/tasks/ceph_deploy: do not rely on ceph-create-keys
Sage Weil [Thu, 11 Jul 2019 16:15:55 +0000 (11:15 -0500)]
qa/tasks/ceph_deploy: do not rely on ceph-create-keys

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

5 years agoceph-volume: print most logging messages to stderr 29506/head
Jan Fajerski [Mon, 4 Mar 2019 10:28:13 +0000 (11:28 +0100)]
ceph-volume: print most logging messages to stderr

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
Fixes: http://tracker.ceph.com/issues/38548
(cherry picked from commit 1f8f1e95dee88b4bab2d6931e720ed83584d2887)

5 years agoMerge pull request #29416 from jan--f/wip-41021-nautilus
Jan Fajerski [Tue, 6 Aug 2019 11:36:19 +0000 (13:36 +0200)]
Merge pull request #29416 from jan--f/wip-41021-nautilus

nautilus: simple: when 'type' file is not present activate fails

5 years agorgw: Don't crash on copy when metadata directive not supplied 29499/head
Adam C. Emerson [Tue, 9 Jul 2019 21:34:51 +0000 (17:34 -0400)]
rgw: Don't crash on copy when metadata directive not supplied

Fixes: http://tracker.ceph.com/issues/40416
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit d5a85e681f05f2b680bfe771ac16704b374218c7)

5 years agoMerge pull request #28583 from ukernel/nautilus-40326
Yuri Weinstein [Mon, 5 Aug 2019 16:04:53 +0000 (09:04 -0700)]
Merge pull request #28583 from ukernel/nautilus-40326

nautilus:  mds: change how mds revoke stale caps

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #28609 from batrick/i40324
Yuri Weinstein [Mon, 5 Aug 2019 16:04:04 +0000 (09:04 -0700)]
Merge pull request #28609 from batrick/i40324

nautilus: cephfs: ceph_volume_client: d_name needs to be converted to string before using

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29156 from smithfarm/wip-40839-nautilus
Yuri Weinstein [Mon, 5 Aug 2019 16:03:30 +0000 (09:03 -0700)]
Merge pull request #29156 from smithfarm/wip-40839-nautilus

nautilus: cephfs-shell: TypeError in poutput

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29157 from smithfarm/wip-40842-nautilus
Yuri Weinstein [Mon, 5 Aug 2019 16:03:01 +0000 (09:03 -0700)]
Merge pull request #29157 from smithfarm/wip-40842-nautilus

nautilus: cephfs: ceph-fuse: mount does not support the fallocate()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29158 from smithfarm/wip-40843-nautilus
Yuri Weinstein [Mon, 5 Aug 2019 16:02:33 +0000 (09:02 -0700)]
Merge pull request #29158 from smithfarm/wip-40843-nautilus

nautilus: cephfs-shell: name 'files' is not defined error in do_rm()

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29186 from xiaoxichen/wip-40874-nautilus
Yuri Weinstein [Mon, 5 Aug 2019 16:01:57 +0000 (09:01 -0700)]
Merge pull request #29186 from xiaoxichen/wip-40874-nautilus

nautilus: cephfs: client: bump ll_ref from int32 to uint64_t

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #29209 from smithfarm/wip-40316-nautilus
Yuri Weinstein [Mon, 5 Aug 2019 16:01:33 +0000 (09:01 -0700)]
Merge pull request #29209 from smithfarm/wip-40316-nautilus

nautilus: tests: test_volume_client: print python version correctly

Reviewed-by: Venky Shankar <vshankar@redhat.com>