]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomds/CInode: Optimize only pinned by subtrees check 36288/head
Mark Nelson [Fri, 24 Jul 2020 05:29:15 +0000 (05:29 +0000)]
mds/CInode: Optimize only pinned by subtrees check

Fixes: https://tracker.ceph.com/issues/46727
Signed-off-by: Mark Nelson <mnelson@redhat.com>
5 years agoMerge pull request #36256 from tchaikov/wip-ceph-debug-docker-crimson
Kefu Chai [Fri, 24 Jul 2020 02:11:02 +0000 (10:11 +0800)]
Merge pull request #36256 from tchaikov/wip-ceph-debug-docker-crimson

ceph-debug-docker: add --flavor option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-debug-docker: add --flavor option 36256/head
Kefu Chai [Thu, 23 Jul 2020 05:58:25 +0000 (13:58 +0800)]
ceph-debug-docker: add --flavor option

* add --flavor option, which is "default" by default, so one can, for
  example, pass "--flavor crimson" to ceph-debug-docker
* extract $repo_url to avoid repeating the shared bits between centos
  and debian derivatives envs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #36136 into master
Patrick Donnelly [Fri, 24 Jul 2020 00:12:43 +0000 (17:12 -0700)]
Merge PR #36136 into master

* refs/pull/36136/head:
qa/tasks/nfs:Add test for relative and just '/' pseudo path
mgr/nfs: Check if pseudo path is absolute path or just '/'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #36239 from sebastian-philipp/cephadm-parallel-hosts
Sebastian Wagner [Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)]
Merge pull request #36239 from sebastian-philipp/cephadm-parallel-hosts

mgr/cephadm: create OSDs in parallel

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #35839 from mgfritch/cephadm-ignore-mon-mgr-svc-id
Sebastian Wagner [Thu, 23 Jul 2020 15:52:49 +0000 (17:52 +0200)]
Merge pull request #35839 from mgfritch/cephadm-ignore-mon-mgr-svc-id

python-common: clean-up ServiceSpec.service_id handling

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #36251 from neha-ojha/wip-fix-43888
Neha Ojha [Thu, 23 Jul 2020 14:36:47 +0000 (07:36 -0700)]
Merge pull request #36251 from neha-ojha/wip-fix-43888

osd/OSD.cc: remove osd_lock for bench

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
5 years agoMerge pull request #36261 from tchaikov/wip-unforty-seastar
Kefu Chai [Thu, 23 Jul 2020 14:26:11 +0000 (22:26 +0800)]
Merge pull request #36261 from tchaikov/wip-unforty-seastar

ceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36252 from tchaikov/wip-doc-crimson
Kefu Chai [Thu, 23 Jul 2020 14:19:56 +0000 (22:19 +0800)]
Merge pull request #36252 from tchaikov/wip-doc-crimson

doc/dev/crimson: remove redundant options

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36263 from tchaikov/wip-more-log-for-dashboard-test
Kefu Chai [Thu, 23 Jul 2020 13:13:44 +0000 (21:13 +0800)]
Merge pull request #36263 from tchaikov/wip-more-log-for-dashboard-test

mgr/dashboard: print more osd log when backend-api-tests fails

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: print more log when backend-api-tests fails 36263/head
Kefu Chai [Thu, 23 Jul 2020 09:47:14 +0000 (17:47 +0800)]
mgr/dashboard: print more log when backend-api-tests fails

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36242 from dillaman/wip-46668
Mykola Golub [Thu, 23 Jul 2020 09:20:43 +0000 (12:20 +0300)]
Merge pull request #36242 from dillaman/wip-46668

librbd: flush all queued object IO from simple scheduler

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodoc/dev/crimson: add more examples for seastar-addr2line 36252/head
Kefu Chai [Thu, 23 Jul 2020 08:53:41 +0000 (16:53 +0800)]
doc/dev/crimson: add more examples for seastar-addr2line

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar 36261/head
Kefu Chai [Thu, 23 Jul 2020 08:03:06 +0000 (16:03 +0800)]
ceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar

seastar uses setjmp() and longjmp() to implement coroutine, but
longjmp() is defined as ____longjmp_chk() by GCC if _FORTIFY_SOURC is
defined. ____longjmp_chk() simply bails out with an error message if
the dest stack pointer is higher than the src stack pointer, or the dest
stack pointer is not in the sigaltstack. in the case of seastar, the dst
%sp is not necessarily higher than src stack pointer, and it's not
handling a signal for switching the thread context. that's why we have
the "longjmp causes uninitialized stack frame" error when running
crimson-osd on RHEL/CentOS 8 using the prebuilt rpm packages.

the optflags rpm macro adds -D_FORTIFY_SOURCE=2 to CFLAGS and CXXFLAGS,
so even seastar tries to pass -U_FORTIFY_SOURCE to GCC, there is chance
that cmake append CXXFLAGS at the end of the option list passed to GCC.
and this renders seastar's attempt to undefine _FORTIFY_SOURCE useless.

another way to address this issue is to undefine this macro in
seastar:src/core/thread.cc. but since seastar tries neutralize the macro
in its cmake script instead of source file, i assume they have their
considerations. let's drop it in the rpm recipe instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36225 from votdev/cephadm_fix_typos
Sebastian Wagner [Thu, 23 Jul 2020 08:01:39 +0000 (10:01 +0200)]
Merge pull request #36225 from votdev/cephadm_fix_typos

doc/cephadm: Fix typos in 'Cephadm Concepts' document.

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoqa/tasks/nfs:Add test for relative and just '/' pseudo path 36136/head
Varsha Rao [Tue, 21 Jul 2020 09:59:35 +0000 (15:29 +0530)]
qa/tasks/nfs:Add test for relative and just '/' pseudo path

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/nfs: Check if pseudo path is absolute path or just '/'
Varsha Rao [Thu, 16 Jul 2020 10:50:36 +0000 (16:20 +0530)]
mgr/nfs: Check if pseudo path is absolute path or just '/'

Fixes: https://tracker.ceph.com/issues/46565
Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #36158 from dillaman/wip-45169
Mykola Golub [Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)]
Merge pull request #36158 from dillaman/wip-45169

immutable-object-cache: fixed crashes on start up

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #36240 from tchaikov/wip-ceph-debug-docker-el8
Kefu Chai [Thu, 23 Jul 2020 03:54:26 +0000 (11:54 +0800)]
Merge pull request #36240 from tchaikov/wip-ceph-debug-docker-el8

ceph-debug-docker: support centos 8

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #36203 into master
Patrick Donnelly [Thu, 23 Jul 2020 01:49:08 +0000 (18:49 -0700)]
Merge PR #36203 into master

* refs/pull/36203/head:
client: cleanup the fuse client code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agodoc/dev/crimson: remove redundant options
Kefu Chai [Thu, 23 Jul 2020 01:39:30 +0000 (09:39 +0800)]
doc/dev/crimson: remove redundant options

`--smp` and `--cpuset` have been passed to crimson-osd by vstart.sh, so
no need to pass them when launching vstart.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/mgr/orchestrator: add missing OSD service_id 35839/head
Michael Fritch [Wed, 22 Jul 2020 22:35:32 +0000 (16:35 -0600)]
doc/mgr/orchestrator: add missing OSD service_id

example for deploying multiple specs via yaml was missing the service_id

Fixes: https://tracker.ceph.com/issues/46377
Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agopython-common: clean-up ServiceSpec.service_id handling
Michael Fritch [Tue, 30 Jun 2020 22:06:20 +0000 (16:06 -0600)]
python-common: clean-up ServiceSpec.service_id handling

service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

Fixes: https://tracker.ceph.com/issues/46175
Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoosd/OSD.cc: remove osd_lock for bench 36251/head
Neha Ojha [Fri, 17 Jul 2020 16:52:56 +0000 (16:52 +0000)]
osd/OSD.cc: remove osd_lock for bench

8987f94416f453829eae6dda08837ef5a42531c6 introduced the osd_lock for the
bench command. Taking the osd_lock in bench can lead to deadlocks, causing the
command to hang as seen in https://tracker.ceph.com/issues/43888.

Fixes: https://tracker.ceph.com/issues/43888
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #35667 from jschmid1/cephadm_deterministic_simplescheduler
Sebastian Wagner [Wed, 22 Jul 2020 20:12:00 +0000 (22:12 +0200)]
Merge pull request #35667 from jschmid1/cephadm_deterministic_simplescheduler

mgr/cephadm: rework --dry-run/previews

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agolibrbd: flush all queued object IO from simple scheduler 36242/head
Jason Dillaman [Wed, 22 Jul 2020 15:25:56 +0000 (11:25 -0400)]
librbd: flush all queued object IO from simple scheduler

Normally IO is tracked via the AioCompletion's async_op but the
scheduler will "complete" writes while the IO might be still
executing. Therefore, prior to shutting down this dispatch layer
we need to wait for all IO to complete.

Fixes: https://tracker.ceph.com/issues/46668
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36216 from sebastian-philipp/cephadm-fix-undefined-container_path
Sebastian Wagner [Wed, 22 Jul 2020 15:52:37 +0000 (17:52 +0200)]
Merge pull request #36216 from sebastian-philipp/cephadm-fix-undefined-container_path

cephadm: fix UnboundLocalError: `container_path`

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-debug-docker: support centos 8 36240/head
Kefu Chai [Wed, 22 Jul 2020 13:41:41 +0000 (21:41 +0800)]
ceph-debug-docker: support centos 8

* default to centos:8, as we've moved to centos:8 now
* do not assume that the base image is centos:7, use centos:8 if it is
  specified.
* install python3-* packages for centos:8 and install python36-*
  packages for centos:7. as el8 is now a python3 distro, and
  centos:7 now has python36.
* s/screen/tmux/. because screen is now offered by EPEL, while tmux
  is in BaseOS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #35694 from rhcs-dashboard/wip-45901-master
Laura Paduano [Wed, 22 Jul 2020 14:58:44 +0000 (16:58 +0200)]
Merge pull request #35694 from rhcs-dashboard/wip-45901-master

mgr/dashboard: increase API test coverage in API controllers

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc: add notes about --dry-run 35667/head
Joshua Schmid [Mon, 6 Jul 2020 09:59:49 +0000 (11:59 +0200)]
doc: add notes about --dry-run

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/cephadm: rework --dry-run/previews
Joshua Schmid [Wed, 10 Jun 2020 08:33:36 +0000 (10:33 +0200)]
mgr/cephadm: rework --dry-run/previews

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoclient: cleanup the fuse client code 36203/head
Xiubo Li [Wed, 22 Jul 2020 00:25:29 +0000 (08:25 +0800)]
client: cleanup the fuse client code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agomgr/cephadm: create OSDs in parallel 36239/head
Sebastian Wagner [Wed, 22 Jul 2020 12:45:09 +0000 (14:45 +0200)]
mgr/cephadm: create OSDs in parallel

Should speedup day 1 OSD creation by something like factor 10

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: move `forall_hosts()` to utils module
Sebastian Wagner [Wed, 22 Jul 2020 12:39:26 +0000 (14:39 +0200)]
mgr/cephadm: move `forall_hosts()` to utils module

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #35866 from tchaikov/wip-qa-tempest-pin-openstackclients
Kefu Chai [Wed, 22 Jul 2020 12:38:54 +0000 (20:38 +0800)]
Merge pull request #35866 from tchaikov/wip-qa-tempest-pin-openstackclients

qa/keystone: pin python-openstackclient

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36005 from p-se/log-prometheus-metric-gathering
Kefu Chai [Wed, 22 Jul 2020 11:52:12 +0000 (19:52 +0800)]
Merge pull request #36005 from p-se/log-prometheus-metric-gathering

mgr/prometheus: log time it takes to collect metrics

Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoqa/keystone: pin python-openstackclient and osc-lib 35866/head
Kefu Chai [Wed, 1 Jul 2020 08:32:33 +0000 (16:32 +0800)]
qa/keystone: pin python-openstackclient and osc-lib

keystone's dependencies are installed using its tox.ini,
which in turn uses a constraints file of
https://releases.openstack.org/constraints/upper/ussuri,
and it pins cliff to 3.1.0, which is not able to fulfill the requirement
of osc-lib 2.2.0. as it needs needs cliff>=3.2.0. per
https://releases.openstack.org/ussuri/, the latest osc-lib for
ussuri is 2.0.0. and osc-lib>=2.0.0 is required by
python-openstackclient 2.5.1, so let's use it instead of using the latest
one.

if we install cliff==3.1.0 along with python-openstackclient==5.2.1,
we will have following error, as `CommandManager.add_command_group()`
method was added to cliff in 3.2.0. see
https://opendev.org/openstack/cliff/commit/8477c4dbd0cf651b9b4ba4a4934de69d5942bfc2,
so cliff failed to work with the latest openstackclient, like:

2020-06-29T17:26:23.402 INFO:teuthology.orchestra.run.smithi039.stderr:'CommandManager' object has no attribute 'add_command_group'
2020-06-29T17:26:23.402 INFO:teuthology.orchestra.run.smithi039.stderr:Traceback (most recent call last):
2020-06-29T17:26:23.403 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/cliff/app.py", line 264, in run
2020-06-29T17:26:23.403 INFO:teuthology.orchestra.run.smithi039.stderr:    self.initialize_app(remainder)
2020-06-29T17:26:23.403 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/openstackclient/shell.py", line 133, in
initialize_app
2020-06-29T17:26:23.403 INFO:teuthology.orchestra.run.smithi039.stderr:    super(OpenStackShell, self).initialize_app(argv)
2020-06-29T17:26:23.403 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/osc_lib/shell.py", line 442, in initialize_app
2020-06-29T17:26:23.404 INFO:teuthology.orchestra.run.smithi039.stderr:    self._load_plugins()
2020-06-29T17:26:23.404 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/openstackclient/shell.py", line 104, in
_load_plugins
2020-06-29T17:26:23.404 INFO:teuthology.orchestra.run.smithi039.stderr:    self.command_manager.add_command_group(cmd_group)
2020-06-29T17:26:23.404 INFO:teuthology.orchestra.run.smithi039.stderr:AttributeError: 'CommandManager' object has no attribute 'add_command_group'
2020-06-29T17:26:23.404 INFO:teuthology.orchestra.run.smithi039.stderr:Traceback (most recent call last):
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/osc_lib/shell.py", line 134, in run
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:    ret_val = super(OpenStackShell, self).run(argv)
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/cliff/app.py", line 264, in run
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:    self.initialize_app(remainder)
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/openstackclient/shell.py", line 133, in
initialize_app
2020-06-29T17:26:23.405 INFO:teuthology.orchestra.run.smithi039.stderr:    super(OpenStackShell, self).initialize_app(argv)
2020-06-29T17:26:23.406 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/osc_lib/shell.py", line 442, in initialize_app
2020-06-29T17:26:23.406 INFO:teuthology.orchestra.run.smithi039.stderr:    self._load_plugins()
2020-06-29T17:26:23.406 INFO:teuthology.orchestra.run.smithi039.stderr:  File "/home/ubuntu/cephtest/keystone/.tox/venv/lib/python3.6/site-packages/openstackclient/shell.py", line 104, in
_load_plugins
2020-06-29T17:26:23.406 INFO:teuthology.orchestra.run.smithi039.stderr:    self.command_manager.add_command_group(cmd_group)
2020-06-29T17:26:23.406 INFO:teuthology.orchestra.run.smithi039.stderr:AttributeError: 'CommandManager' object has no attribute 'add_command_group'

in this change the openstackclients version is pin'ed to the
latest stable of 5.2.1. will have a separated PR to bump up
the cliff version on teuthology side.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36094 from varshar16/wip-vstart-cephadm-rm-stale-image
Sebastian Wagner [Wed, 22 Jul 2020 10:28:11 +0000 (12:28 +0200)]
Merge pull request #36094 from varshar16/wip-vstart-cephadm-rm-stale-image

vstart: Remove old ceph images if new cluster is deployed

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #36198 from tchaikov/wip-test-drop-py2
Kefu Chai [Wed, 22 Jul 2020 09:38:01 +0000 (17:38 +0800)]
Merge pull request #36198 from tchaikov/wip-test-drop-py2

rpm,deb,qa,python-common,test: drop python2 support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #35579 from pcuzner/wip-prometheus-diskinfo
Boris Ranto [Wed, 22 Jul 2020 08:27:41 +0000 (10:27 +0200)]
Merge pull request #35579 from pcuzner/wip-prometheus-diskinfo

mgr/prometheus: add disk metadata to occupation metric

Signed-off-by: Boris Ranto <branto@redhat.com>
5 years agoMerge pull request #36117 from tspmelo/wip-angular-10
Laura Paduano [Wed, 22 Jul 2020 08:00:54 +0000 (10:00 +0200)]
Merge pull request #36117 from tspmelo/wip-angular-10

mgr/dashboard: Update Angular v10

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc/cephadm: Fix typos in 'Cephadm Concepts' document. 36225/head
Volker Theile [Wed, 22 Jul 2020 08:00:18 +0000 (10:00 +0200)]
doc/cephadm: Fix typos in 'Cephadm Concepts' document.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36098 from s0nea/wip-doc-dashboard-nfs-issue
Laura Paduano [Wed, 22 Jul 2020 07:59:11 +0000 (09:59 +0200)]
Merge pull request #36098 from s0nea/wip-doc-dashboard-nfs-issue

doc/mgr/dashboard: add note about known NFS issue

Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36205 from ceph/navbar-padding
Laura Paduano [Wed, 22 Jul 2020 07:52:31 +0000 (09:52 +0200)]
Merge pull request #36205 from ceph/navbar-padding

mgr/dashboard: fix navigation sidebar elements alignment

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36194 from wjwithagen/wjw-fix-preforker
Kefu Chai [Wed, 22 Jul 2020 07:27:18 +0000 (15:27 +0800)]
Merge pull request #36194 from wjwithagen/wjw-fix-preforker

common: include <signal.h> in Preforker.h

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agorpm,deb: drop python3-six dependency 36198/head
Kefu Chai [Sun, 19 Jul 2020 09:45:58 +0000 (17:45 +0800)]
rpm,deb: drop python3-six dependency

it's not used anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopython-common: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:41:22 +0000 (17:41 +0800)]
python-common: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/test_orchestrator: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:41:09 +0000 (17:41 +0800)]
pybind/mgr/test_orchestrator: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/rook: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:40:48 +0000 (17:40 +0800)]
pybind/mgr/rook: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/orchestrator: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:40:36 +0000 (17:40 +0800)]
pybind/mgr/orchestrator: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/k8sevents: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:40:24 +0000 (17:40 +0800)]
pybind/mgr/k8sevents: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agopybind/mgr/cephadm: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:40:12 +0000 (17:40 +0800)]
pybind/mgr/cephadm: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks: drop python2 support from rgw related tests
Kefu Chai [Sun, 19 Jul 2020 09:39:11 +0000 (17:39 +0800)]
qa/tasks: drop python2 support from rgw related tests

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/samba: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:38:09 +0000 (17:38 +0800)]
qa/tasks/samba: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/rbd: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:37:57 +0000 (17:37 +0800)]
qa/tasks/rbd: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/mgr/dashboard: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:36:52 +0000 (17:36 +0800)]
qa/tasks/mgr/dashboard: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/dashboard: Update Angular v10 36117/head
Tiago Melo [Tue, 7 Jul 2020 22:12:09 +0000 (22:12 +0000)]
mgr/dashboard: Update Angular v10

Fixes: https://tracker.ceph.com/issues/46509
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #35981 from trociny/wip-45268
Jason Dillaman [Tue, 21 Jul 2020 19:29:22 +0000 (15:29 -0400)]
Merge pull request #35981 from trociny/wip-45268

librbd: don't resend async_complete if watcher is unregistered

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36149 from adamemerson/wip-warn-more
Adam C. Emerson [Tue, 21 Jul 2020 16:39:02 +0000 (12:39 -0400)]
Merge pull request #36149 from adamemerson/wip-warn-more

Warning Cleanup

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <jdillaman@redhat.com>
5 years agoMerge pull request #36206 from idryomov/wip-read-from-replica-log-msgs
Ilya Dryomov [Tue, 21 Jul 2020 13:11:58 +0000 (15:11 +0200)]
Merge pull request #36206 from idryomov/wip-read-from-replica-log-msgs

osd/PrimaryLogPG: fix up replica read log messages

Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
5 years agoqa/tasks/fs: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:36:29 +0000 (17:36 +0800)]
qa/tasks/fs: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:35:16 +0000 (17:35 +0800)]
qa/tasks: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/cephfs: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:35:47 +0000 (17:35 +0800)]
qa/tasks/cephfs: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/cephadm: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 09:35:30 +0000 (17:35 +0800)]
qa/tasks/cephadm: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/rgw/rgw_multi: drop python2 support
Kefu Chai [Sun, 19 Jul 2020 08:50:44 +0000 (16:50 +0800)]
test/rgw/rgw_multi: drop python2 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34059 from Songweibin/wip-objectmap-invalid
Jason Dillaman [Tue, 21 Jul 2020 11:38:06 +0000 (07:38 -0400)]
Merge pull request #34059 from Songweibin/wip-objectmap-invalid

librbd: don't set objectmap invalid when load objectmap timed out

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36212 from tspmelo/wip-cypress-gpu
Laura Paduano [Tue, 21 Jul 2020 09:20:34 +0000 (11:20 +0200)]
Merge pull request #36212 from tspmelo/wip-cypress-gpu

mgr/dashboard: E2E: Fix random failures

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36153 from votdev/increase_icon_border
Laura Paduano [Tue, 21 Jul 2020 08:49:48 +0000 (10:49 +0200)]
Merge pull request #36153 from votdev/increase_icon_border

mgr/dashboard: Display cluster status in favicon

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #35850 from sebastian-philipp/cephadm-set-paused-health
Sebastian Wagner [Tue, 21 Jul 2020 08:43:41 +0000 (10:43 +0200)]
Merge pull request #35850 from sebastian-philipp/cephadm-set-paused-health

mgr/cephadm: Add CEPHADM_PAUSED to test_cli

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #36147 from mgfritch/cephadm-service-fixup-mypy
Sebastian Wagner [Tue, 21 Jul 2020 08:21:23 +0000 (10:21 +0200)]
Merge pull request #36147 from mgfritch/cephadm-service-fixup-mypy

mgr/cephadm: clean-up service module type checking

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/dashboard: fix navigation sidebar elements alignment 36205/head
Nizamudeen A [Mon, 20 Jul 2020 06:53:27 +0000 (12:23 +0530)]
mgr/dashboard: fix navigation sidebar elements alignment

Currently the navigation sidebar elements are not aligned properly with the three bars for opening and closing the sidebar. This PR address that minor cleanup.

Fixes: https://tracker.ceph.com/issues/46621
Signed-off-by: Nizamudeen A <nia@redhat.com>
5 years agolibrbd: propagate an error back when failed to invalidating 34059/head
songweibin [Tue, 24 Mar 2020 14:14:42 +0000 (22:14 +0800)]
librbd: propagate an error back when failed to invalidating

Signed-off-by: songweibin <song.weibin@zte.com.cn>
5 years agolibrbd: don't set objectmap invalid when load objectmap timed out
songweibin [Thu, 19 Mar 2020 12:51:59 +0000 (20:51 +0800)]
librbd: don't set objectmap invalid when load objectmap timed out

Add a new configuration option of `rbd_invalidate_object_map_on_timeout`,
if disabled and timed out to open/update object map, donot invalidating
object map and return -ETIMEDOUT to APP.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
5 years agoMerge pull request #35509 from zdover23/wip-doc-cephadm-adoption-step-9
Sebastian Wagner [Mon, 20 Jul 2020 19:33:27 +0000 (21:33 +0200)]
Merge pull request #35509 from zdover23/wip-doc-cephadm-adoption-step-9

doc/cephadm: remove confusing fragment from cephadm adoption step 9

Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agodoc/rbd: add note for the immutable-object-cache domain socket 36158/head
Jason Dillaman [Fri, 17 Jul 2020 14:27:14 +0000 (10:27 -0400)]
doc/rbd: add note for the immutable-object-cache domain socket

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agocommon/options: changed default immutable object cache path
Jason Dillaman [Mon, 20 Jul 2020 16:57:57 +0000 (12:57 -0400)]
common/options: changed default immutable object cache path

Switch the default path for the immutable object cache from "/tmp" to
"/tmp/ceph_immutable_object_cache" to prevent the deletion of all
files in the "/tmp" directory and sub-directories for unconfigured
daemons.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoimmutable-object-cache: fix error handling during start up
Jason Dillaman [Fri, 17 Jul 2020 14:25:20 +0000 (10:25 -0400)]
immutable-object-cache: fix error handling during start up

Previously the daemon would crash if it couldn't remove all the
files from the specified cache directory. It would also crash if
it could not access its specified domain socket file.

Fixes: https://tracker.ceph.com/issues/45169
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/dashboard: E2E: Increase defaultCommandTimeout 36212/head
Tiago Melo [Mon, 20 Jul 2020 16:54:12 +0000 (16:54 +0000)]
mgr/dashboard: E2E: Increase defaultCommandTimeout

Fixes: https://tracker.ceph.com/issues/46623
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: E2E: Disable GPU for Chrome Headless
Tiago Melo [Mon, 20 Jul 2020 10:47:08 +0000 (10:47 +0000)]
mgr/dashboard: E2E: Disable GPU for Chrome Headless

Fixes: https://tracker.ceph.com/issues/46624
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #35916 from jschmid1/drivegroup_extension
Sebastian Wagner [Mon, 20 Jul 2020 14:40:47 +0000 (16:40 +0200)]
Merge pull request #35916 from jschmid1/drivegroup_extension

python-common/drivegroups: implement option to change filter_logic

5 years agoMerge pull request #35946 from jschmid1/extend_device_ls
Sebastian Wagner [Mon, 20 Jul 2020 14:40:05 +0000 (16:40 +0200)]
Merge pull request #35946 from jschmid1/extend_device_ls

mgr/cephadm: also list vendor/model/rotational in `device ls`

5 years agoMerge pull request #35961 from p-se/cephadm-custom-image-fix
Sebastian Wagner [Mon, 20 Jul 2020 14:39:24 +0000 (16:39 +0200)]
Merge pull request #35961 from p-se/cephadm-custom-image-fix

cephadm: fix usage of custom Prometheus image

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #36157 from rhcs-dashboard/fix-46601-master
Laura Paduano [Mon, 20 Jul 2020 13:48:21 +0000 (15:48 +0200)]
Merge pull request #36157 from rhcs-dashboard/fix-46601-master

mgr/dashboard/api: increase API health timeout

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agocephadm: fix UnboundLocalError: `container_path` 36216/head
Sebastian Wagner [Mon, 20 Jul 2020 11:51:14 +0000 (13:51 +0200)]
cephadm: fix UnboundLocalError: `container_path`

Fixes: https://tracker.ceph.com/issues/46098
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #36164 from dsavineau/cephadm_remove_ktdreyer_copr_repo
Sebastian Wagner [Mon, 20 Jul 2020 08:23:39 +0000 (10:23 +0200)]
Merge pull request #36164 from dsavineau/cephadm_remove_ktdreyer_copr_repo

cephadm: remove ktdreyer's copr repository

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoosd/PrimaryLogPG: fix up replica read log messages 36206/head
Ilya Dryomov [Mon, 20 Jul 2020 08:19:54 +0000 (10:19 +0200)]
osd/PrimaryLogPG: fix up replica read log messages

Add missing spaces and don't repeat oid twice.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoMerge pull request #36129 from matthewoliver/ipv6_cephadm_route_expiry
Sebastian Wagner [Mon, 20 Jul 2020 08:13:41 +0000 (10:13 +0200)]
Merge pull request #36129 from matthewoliver/ipv6_cephadm_route_expiry

cephadm: Fix ipv6 network regex to support routes with expiry

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge PR #36196 into master
Patrick Donnelly [Mon, 20 Jul 2020 00:29:57 +0000 (17:29 -0700)]
Merge PR #36196 into master

* refs/pull/36196/head:
mds/MDSRank: fix typo in "unrecognized"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds/MDSRank: fix typo in "unrecognized" 36196/head
Nathan Cutler [Sun, 19 Jul 2020 06:40:21 +0000 (08:40 +0200)]
mds/MDSRank: fix typo in "unrecognized"

Fixes: beb12fa25315153e1a06a0104883de89776438a6
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #36081 from winndows/superfluous_break4
Kefu Chai [Sun, 19 Jul 2020 06:37:13 +0000 (14:37 +0800)]
Merge pull request #36081 from winndows/superfluous_break4

osd/OSDMap: Remove the superfluous break

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36083 from winndows/superfluous_break8
Kefu Chai [Sun, 19 Jul 2020 06:28:59 +0000 (14:28 +0800)]
Merge pull request #36083 from winndows/superfluous_break8

key_value_store: Remove superfluous breaks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36080 from winndows/superfluous_break5
Kefu Chai [Sun, 19 Jul 2020 06:11:32 +0000 (14:11 +0800)]
Merge pull request #36080 from winndows/superfluous_break5

osd/PGBackend: Remove superfluous breaks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36067 from winndows/superfluous_break1
Kefu Chai [Sun, 19 Jul 2020 06:00:05 +0000 (14:00 +0800)]
Merge pull request #36067 from winndows/superfluous_break1

mon/OSDMonitor: Remove the superfluous break

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36068 from winndows/superfluous_break2
Kefu Chai [Sun, 19 Jul 2020 05:59:07 +0000 (13:59 +0800)]
Merge pull request #36068 from winndows/superfluous_break2

common: Remove the superfluous break

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36078 from winndows/superfluous_break7
Kefu Chai [Sun, 19 Jul 2020 05:58:05 +0000 (13:58 +0800)]
Merge pull request #36078 from winndows/superfluous_break7

mgr: Remove the superfluous break

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #35994 from jschmid1/osd_support_reweight
Kefu Chai [Sun, 19 Jul 2020 05:54:47 +0000 (13:54 +0800)]
Merge pull request #35994 from jschmid1/osd_support_reweight

mgr/osd_support: add unittests

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #35836 from mgfritch/vstart-out-dir-logs
Kefu Chai [Sun, 19 Jul 2020 05:52:37 +0000 (13:52 +0800)]
Merge pull request #35836 from mgfritch/vstart-out-dir-logs

vstart: out dir can contain a large number of files

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36152 from sebastian-philipp/ceph-tell-cephadm
Kefu Chai [Sun, 19 Jul 2020 05:50:55 +0000 (13:50 +0800)]
Merge pull request #36152 from sebastian-philipp/ceph-tell-cephadm

ceph: Fix `tell` for cephadm

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agocommon: include <signal.h> in Preforker.h 36194/head
Willem Jan Withagen [Sat, 18 Jul 2020 23:39:30 +0000 (23:39 +0000)]
common: include <signal.h> in Preforker.h

Since it does use functions declared by signal.h

/home/jenkins/workspace/ceph-master/src/common/Preforker.h:50:5: error: use of undeclared identifier                                             'sigemptyset'
    sigemptyset(&sa.sa_mask);
    ^
/home/jenkins/workspace/ceph-master/src/common/Preforker.h:52:9: error: no matching constructor for                                             initialization of 'sigaction'
    if (sigaction(SIGHUP, &sa, nullptr) != 0) {
        ^         ~~~~~~~~~~~~~~~~~~~~
/usr/include/sys/signal.h:366:8: note: candidate constructor (the implicit copy constructor) not via                                            ble: requires 1 argument, but 3 were provided
struct sigaction {
       ^
/usr/include/sys/signal.h:366:8: note: candidate constructor (the implicit move constructor) not via                                            ble: requires 1 argument, but 3 were provided
/usr/include/sys/signal.h:366:8: note: candidate constructor (the implicit default constructor) not                                             viable: requires 0 arguments, but 3 were provided
2 errors generated.

fixes: https://github.com/ceph/ceph/pull/35844
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge pull request #35629 from dillaman/wip-librbd-asio-2
Mykola Golub [Sat, 18 Jul 2020 16:42:00 +0000 (19:42 +0300)]
Merge pull request #35629 from dillaman/wip-librbd-asio-2

librbd: switch IO path to use new librados asio API

Reviewed-by: Mykola Golub <mgolub@suse.com>