]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoceph-daemon: Use `shutil` to move/copy files 31331/head
Michael Fritch [Mon, 4 Nov 2019 05:45:20 +0000 (22:45 -0700)]
ceph-daemon: Use `shutil` to move/copy files

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/dashboard: Automatically use correct chromedriver version (#31352)
Lenz Grimmer [Mon, 4 Nov 2019 14:31:37 +0000 (14:31 +0000)]
mgr/dashboard: Automatically use correct chromedriver version (#31352)

mgr/dashboard: Automatically use correct chromedriver version

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31292 into master
Sage Weil [Mon, 4 Nov 2019 14:17:16 +0000 (08:17 -0600)]
Merge PR #31292 into master

* refs/pull/31292/head:
mgr/ssh: fix remove_mds exception
doc/mgr/orchestrator_cli: remove extra characters after checkmarks
doc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs
mgr/ssh: add 'redeploy' operation
ceph-daemon: stop + reset-failed existing unit on daemon deploy
ceph-daemon: make second call arg optional
ceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist
mgr/ssh,orchestrator_cli: add 'restart' service action
mgr/ssh: service[-instance] [start|stop]
mgr/ssh: simplify get_services call for 'mds update'
mgr/ssh: make _get_services take service *id* or service *name*
mgr/ssh: fix 'service ls' on stopped services
mgr/ssh: move some code around
doc/mgr/orchestrator_cli: 'service ls' works for ssh
doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/ssh: fix remove_mds exception 31292/head
Sage Weil [Mon, 4 Nov 2019 14:02:01 +0000 (08:02 -0600)]
mgr/ssh: fix remove_mds exception

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: remove extra characters after checkmarks
Sage Weil [Thu, 31 Oct 2019 15:36:46 +0000 (10:36 -0500)]
doc/mgr/orchestrator_cli: remove extra characters after checkmarks

Not sure what those were.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs
Sage Weil [Thu, 31 Oct 2019 15:34:10 +0000 (10:34 -0500)]
doc/mgr/orchestrator_cli: no {stop,start,restart} for all the random svcs

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: add 'redeploy' operation
Sage Weil [Thu, 31 Oct 2019 15:25:40 +0000 (10:25 -0500)]
mgr/ssh: add 'redeploy' operation

This will stop, reprovision container, and restart. For most daemons, that
means we can

 - change the container image
 - refresh the config
 - refresh the keyring

For OSDs, it means we also re-run ceph-volume activate.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: stop + reset-failed existing unit on daemon deploy
Sage Weil [Thu, 31 Oct 2019 15:22:35 +0000 (10:22 -0500)]
ceph-daemon: stop + reset-failed existing unit on daemon deploy

Normally it won't exist, but it will on a re-deploy.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make second call arg optional
Sage Weil [Thu, 31 Oct 2019 15:22:09 +0000 (10:22 -0500)]
ceph-daemon: make second call arg optional

If not specified, pull it from command[0].

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist
Sage Weil [Thu, 31 Oct 2019 15:14:51 +0000 (10:14 -0500)]
ceph-daemon: make 'deploy' on mon only to mkfs step is mon doesn't yet exist

This allows us to (re)deploy a mon container like the other daemon types,
which means rewriting the config, keyring, and systemd unit(s).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh,orchestrator_cli: add 'restart' service action
Sage Weil [Thu, 31 Oct 2019 14:39:30 +0000 (09:39 -0500)]
mgr/ssh,orchestrator_cli: add 'restart' service action

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: service[-instance] [start|stop]
Sage Weil [Thu, 31 Oct 2019 19:26:05 +0000 (14:26 -0500)]
mgr/ssh: service[-instance] [start|stop]

Note that 'reload' is meaningless for ssh orch...

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31266 from rhcs-dashboard/wip-42565-master
Lenz Grimmer [Mon, 4 Nov 2019 14:00:04 +0000 (14:00 +0000)]
Merge pull request #31266 from rhcs-dashboard/wip-42565-master

mgr/dashboard: fix LazyUUID4 not serializable

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: CephFS directory component (#30047)
Lenz Grimmer [Mon, 4 Nov 2019 13:24:51 +0000 (13:24 +0000)]
mgr/dashboard: CephFS directory component (#30047)

mgr/dashboard: CephFS directory component

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Automatically use correct chromedriver version 31352/head
Tiago Melo [Mon, 4 Nov 2019 11:27:46 +0000 (10:27 -0100)]
mgr/dashboard: Automatically use correct chromedriver version

Every Chrome version requires a corresponding chromedriver version for the e2e
test to work.
Since we were using a fixed chromedriver version, each time chrome was updated
the e2e scripts stopped working.
With this new script we will check which version of Chrome is installed and
update chromedriver to the correct version.

Fixes: https://tracker.ceph.com/issues/42607
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #31191 from sebastian-philipp/ceph-volume-pr-template
Sebastian Wagner [Mon, 4 Nov 2019 08:41:28 +0000 (09:41 +0100)]
Merge pull request #31191 from sebastian-philipp/ceph-volume-pr-template

github: Add ceph-volume to list of jenkins commands

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31326 from cbodley/wip-cmake-mgr-cap
Kefu Chai [Sun, 3 Nov 2019 20:55:21 +0000 (12:55 -0800)]
Merge pull request #31326 from cbodley/wip-cmake-mgr-cap

cmake: define mgr_cap_obj library when WITH_MGR=OFF

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31015 into master
Sage Weil [Sun, 3 Nov 2019 19:42:48 +0000 (13:42 -0600)]
Merge PR #31015 into master

* refs/pull/31015/head:
mgr/orchestrator: Fix raise_if_exception for Python 3

Reviewed-by: Tim Serong <tserong@suse.com>
5 years agoMerge PR #31337 into master
Sage Weil [Sun, 3 Nov 2019 15:44:44 +0000 (09:44 -0600)]
Merge PR #31337 into master

* refs/pull/31337/head:
Fixing typo in ceph-daemon script for the output_pub_ssh_key argument

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoFixing typo in ceph-daemon script for the output_pub_ssh_key argument 31337/head
John McGowan [Sat, 2 Nov 2019 21:33:59 +0000 (15:33 -0600)]
Fixing typo in ceph-daemon script for the output_pub_ssh_key argument

Signed-off-by: John McGowan <john@steakfest.com>
5 years agoMerge pull request #31335 from wjwithagen/wjw-fix-objecstore-bluestore
Kefu Chai [Sun, 3 Nov 2019 12:56:17 +0000 (04:56 -0800)]
Merge pull request #31335 from wjwithagen/wjw-fix-objecstore-bluestore

test: move bluestore dependent code under WITH_BLUESTORE

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31312 from changchengx/qa
Kefu Chai [Sun, 3 Nov 2019 12:50:51 +0000 (04:50 -0800)]
Merge pull request #31312 from changchengx/qa

qa: correct zap disk with ceph-deploy tool

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30791 from kshtsk/wip-python3-no-iteritems-ceph-deploy
Kefu Chai [Sun, 3 Nov 2019 12:49:08 +0000 (04:49 -0800)]
Merge pull request #30791 from kshtsk/wip-python3-no-iteritems-ceph-deploy

tasks/ceph_deploy: get rid of iteritems for python3

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31209 from wjwithagen/wjw-fix-snprintf
Kefu Chai [Sun, 3 Nov 2019 12:44:52 +0000 (04:44 -0800)]
Merge pull request #31209 from wjwithagen/wjw-fix-snprintf

common: fix missing <stdio.h> include

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31184 from pdvian/wip-fix-sign-compare-warning
Kefu Chai [Sun, 3 Nov 2019 12:43:38 +0000 (04:43 -0800)]
Merge pull request #31184 from pdvian/wip-fix-sign-compare-warning

crush/CrushWrapper.cc: Fix sign compare compiler warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31306 from wjwithagen/wjw-fix-src_test_objectstore_CMakeLists.txt
Kefu Chai [Sun, 3 Nov 2019 12:42:59 +0000 (04:42 -0800)]
Merge pull request #31306 from wjwithagen/wjw-fix-src_test_objectstore_CMakeLists.txt

test: only compile ceph_test_bmap_alloc_replay WITH_BLUESTORE

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31313 from tchaikov/wip/debian/rules/ceph-daemon
Kefu Chai [Sun, 3 Nov 2019 12:42:28 +0000 (04:42 -0800)]
Merge pull request #31313 from tchaikov/wip/debian/rules/ceph-daemon

debian/rules: run dh_python2 with ceph-daemon

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31238 from tchaikov/wip/install-deps/el8
Kefu Chai [Sun, 3 Nov 2019 12:41:55 +0000 (04:41 -0800)]
Merge pull request #31238 from tchaikov/wip/install-deps/el8

install-deps.sh: use sepia/lab-extra/8

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
5 years agoMerge PR #30751 into master
Patrick Donnelly [Sun, 3 Nov 2019 08:38:27 +0000 (01:38 -0700)]
Merge PR #30751 into master

* refs/pull/30751/head:
doc: Document Export Process during Subtree Migrations

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30749 into master
Patrick Donnelly [Sun, 3 Nov 2019 08:03:22 +0000 (01:03 -0700)]
Merge PR #30749 into master

* refs/pull/30749/head:
doc: document mds journal event types

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
5 years agotest: move bluestore dependant code under WITH_BLUESTORE 31335/head
Willem Jan Withagen [Sat, 2 Nov 2019 19:47:14 +0000 (20:47 +0100)]
test: move bluestore dependant code under WITH_BLUESTORE

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge pull request #31152 from LongDuncan/feature/mgr_restful_rquest_api_support_mult...
Boris Ranto [Sat, 2 Nov 2019 09:30:43 +0000 (10:30 +0100)]
Merge pull request #31152 from LongDuncan/feature/mgr_restful_rquest_api_support_multicommand

mgr/restful: requests api adds support multiple commands

Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoMerge PR #30938 into master
Patrick Donnelly [Fri, 1 Nov 2019 23:05:42 +0000 (16:05 -0700)]
Merge PR #30938 into master

* refs/pull/30938/head:
mds: Reorganize class members in MDSCacheObject header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #28077 into master
Patrick Donnelly [Fri, 1 Nov 2019 23:03:12 +0000 (16:03 -0700)]
Merge PR #28077 into master

* refs/pull/28077/head:
client: optimize rename operation under different quota root

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30365 into master
Patrick Donnelly [Fri, 1 Nov 2019 23:00:27 +0000 (16:00 -0700)]
Merge PR #30365 into master

* refs/pull/30365/head:
cephfs-shell: get rid of "return" at the end of the method
pybind/cephfs.pyx: add NotDirectory exception
cephfs-shell: don't expect both Error and OSEror together
cephfs-shell: print built-in error messages for exceptions
cephfs-shell: use poutput defined with the module
cephfs-shell: use perror() defined within the module
cephfs-shell: don't pass default values in calls to perror
cephfs-shell: align perror's signature with cmd2.Cmd.perror
pybind/cephfs: make actual error message part of strerror of OSError

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge PR #30054 into master
Patrick Donnelly [Fri, 1 Nov 2019 22:57:28 +0000 (15:57 -0700)]
Merge PR #30054 into master

* refs/pull/30054/head:
doc: fs subvolume resize command
qa/tasks: tests for resize subvolume
mgr/volumes: fs subvolume resize command

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30402 into master
Patrick Donnelly [Fri, 1 Nov 2019 22:52:25 +0000 (15:52 -0700)]
Merge PR #30402 into master

* refs/pull/30402/head:
client: add warning when cap != in->auth_cap.

Reviewed-by: Zheng Yan <zyan@redhat.com>
5 years agoMerge PR #30990 into master
Patrick Donnelly [Fri, 1 Nov 2019 22:50:20 +0000 (15:50 -0700)]
Merge PR #30990 into master

* refs/pull/30990/head:
mds: Reorganize class members in MDSDaemon header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31207 into master
Patrick Donnelly [Fri, 1 Nov 2019 22:37:12 +0000 (15:37 -0700)]
Merge PR #31207 into master

* refs/pull/31207/head:
qa/tasks: Better handling of thrasher names and __init__ calls

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31137 into master
Patrick Donnelly [Fri, 1 Nov 2019 22:34:41 +0000 (15:34 -0700)]
Merge PR #31137 into master

* refs/pull/31137/head:
msg/DispatchQueue: Set throttle stamp for local_delivery

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31319 into master
Sage Weil [Fri, 1 Nov 2019 21:43:42 +0000 (16:43 -0500)]
Merge PR #31319 into master

* refs/pull/31319/head:
ceph-daemon: absolute path for /bin/install
ceph-daemon: ExecStart=/bin/bash script

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agocmake: define mgr_cap_obj library when WITH_MGR=OFF 31326/head
Casey Bodley [Fri, 1 Nov 2019 20:04:37 +0000 (16:04 -0400)]
cmake: define mgr_cap_obj library when WITH_MGR=OFF

resolves the cmake error when WITH_MGR=OFF:

  Error evaluating generator expression:

    $<TARGET_OBJECTS:mgr_cap_obj>

  Objects of target "mgr_cap_obj" referenced but no such target exists.
Call Stack (most recent call first):
  src/mon/CMakeLists.txt:34 (add_library)

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge PR #31318 into master
Sage Weil [Fri, 1 Nov 2019 18:44:32 +0000 (13:44 -0500)]
Merge PR #31318 into master

* refs/pull/31318/head:
ceph.spec.in: run pathfix.py
ceph-daemon: use /usr/bin/python, not /usr/bin/env python

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31226 into master
Sage Weil [Fri, 1 Nov 2019 17:03:38 +0000 (12:03 -0500)]
Merge PR #31226 into master

* refs/pull/31226/head:
mgr/telemetry: add stats about crush map
mgr/telemetry: add rgw metadata
mgr/telemetry: include fs size (files, bytes, snaps)
mds: report r{files,bytes,snaps} via perfcounters
mgr/telemetry: mds cache stats
mgr/telemetry: add some rbd metadata
mgr/telemetry: note whether osd cluster_network is in use
mgr/telemetry: add host counts
mgr/telemetry: add more pool metadata
mgr/telemetry: remove crush rule name
mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
mgr/telemetry: add CephFS metadata

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #25374 into master
Sage Weil [Fri, 1 Nov 2019 16:58:11 +0000 (11:58 -0500)]
Merge PR #25374 into master

* refs/pull/25374/head:
osd: add flag to prevent truncate_seq copy in copy-from operation

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31256 into master
Sage Weil [Fri, 1 Nov 2019 16:57:03 +0000 (11:57 -0500)]
Merge PR #31256 into master

* refs/pull/31256/head:
mgr/MgrClient: fix open condition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/dashboard: AttributeError: 'NoneType' object has no attrib… (#31078)
Lenz Grimmer [Fri, 1 Nov 2019 15:44:33 +0000 (15:44 +0000)]
mgr/dashboard: AttributeError: 'NoneType' object has no attrib… (#31078)

mgr/dashboard: Fixed AttributeError: 'NoneType' in smart data integration

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoceph.spec.in: run pathfix.py 31318/head
Kefu Chai [Fri, 1 Nov 2019 15:18:23 +0000 (10:18 -0500)]
ceph.spec.in: run pathfix.py

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: absolute path for /bin/install 31319/head
Sage Weil [Fri, 1 Nov 2019 15:22:50 +0000 (10:22 -0500)]
ceph-daemon: absolute path for /bin/install

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31320 into master
Sage Weil [Fri, 1 Nov 2019 14:10:28 +0000 (09:10 -0500)]
Merge PR #31320 into master

* refs/pull/31320/head:
ceph-daemon: fix os.mkdir call

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-daemon: fix os.mkdir call 31320/head
Sage Weil [Fri, 1 Nov 2019 14:05:49 +0000 (09:05 -0500)]
ceph-daemon: fix os.mkdir call

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31314 into master
Sage Weil [Fri, 1 Nov 2019 13:57:33 +0000 (08:57 -0500)]
Merge PR #31314 into master

* refs/pull/31314/head:
mgr/orchestrator_cli: pass default value to "req=False" params

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31315 into master
Sage Weil [Fri, 1 Nov 2019 13:56:36 +0000 (08:56 -0500)]
Merge PR #31315 into master

* refs/pull/31315/head:
ceph-daemon: create ~/.ssh if not exist

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: ExecStart=/bin/bash script
Sage Weil [Fri, 1 Nov 2019 13:53:29 +0000 (08:53 -0500)]
ceph-daemon: ExecStart=/bin/bash script

Not sure why this matters, but it doesn't work on centos7 without the
/bin/bash part.

https://stackoverflow.com/questions/45776003/fixing-a-systemd-service-203-exec-failure-no-such-file-or-directory

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: create ~/.ssh if not exist 31315/head
Kefu Chai [Fri, 1 Nov 2019 09:39:35 +0000 (17:39 +0800)]
ceph-daemon: create ~/.ssh if not exist

there is chance that /root/.ssh does not exist yet, when we are trying
to add key to authorized_keys.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/telemetry: add stats about crush map 31226/head
Sage Weil [Fri, 1 Nov 2019 12:58:54 +0000 (07:58 -0500)]
mgr/telemetry: add stats about crush map

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: use /usr/bin/python, not /usr/bin/env python
Sage Weil [Fri, 1 Nov 2019 12:19:20 +0000 (07:19 -0500)]
ceph-daemon: use /usr/bin/python, not /usr/bin/env python

This works around noise from the rpm build:

*** ERROR: ambiguous python shebang in /usr/sbin/ceph-daemon: #!/usr/bin/env python. Change it to python3 (or python2) explicitly.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31045 from tchaikov/wip/librados/no-more-ack-commit
Kefu Chai [Fri, 1 Nov 2019 12:06:20 +0000 (20:06 +0800)]
Merge pull request #31045 from tchaikov/wip/librados/no-more-ack-commit

librados,test,rgw: cleanups to deprecate safe_cb related functions

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31311 from tchaikov/wip/rbd/cleanup
Jason Dillaman [Fri, 1 Nov 2019 11:47:26 +0000 (07:47 -0400)]
Merge pull request #31311 from tchaikov/wip/rbd/cleanup

librbd: always initialize local variables

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30912 from dillaman/wip-42265
Mykola Golub [Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)]
Merge pull request #30912 from dillaman/wip-42265

mgr: add 'rbd' profiles to support 'rbd_support' module commands

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31244 from changchengx/deploy_doc
Kefu Chai [Fri, 1 Nov 2019 10:15:15 +0000 (18:15 +0800)]
Merge pull request #31244 from changchengx/deploy_doc

doc: update with osd addition

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31196 from liewegas/wip-osdmon-iec
Kefu Chai [Fri, 1 Nov 2019 10:00:38 +0000 (18:00 +0800)]
Merge pull request #31196 from liewegas/wip-osdmon-iec

mon/OSDMonitor: expand iec_options for 'osd pool set'

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: use new aio_create_completion() 31045/head
Kefu Chai [Fri, 1 Nov 2019 02:17:05 +0000 (10:17 +0800)]
rgw: use new aio_create_completion()

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agojournal: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 17:35:35 +0000 (01:35 +0800)]
journal: use new aio_create_completion()

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/librados_test_stub: implement aio_create_completion2() and friends
Kefu Chai [Tue, 29 Oct 2019 17:14:39 +0000 (01:14 +0800)]
test/librados_test_stub: implement aio_create_completion2() and friends

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrbd: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 07:08:57 +0000 (15:08 +0800)]
librbd: use new aio_create_completion()

to silence warnings like:

src/librbd/Utils.h:139:48: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is deprecated
[-Wdeprecated-declarations]
   return librados::Rados::aio_create_completion(
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
     obj, &detail::rados_callback<T, MF>, nullptr);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/libradosstriper: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 12:12:42 +0000 (20:12 +0800)]
test/libradosstriper: use new aio_create_completion()

to silence -Wdeprecated-declarations warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocls/journal: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 11:20:10 +0000 (19:20 +0800)]
cls/journal: s/create_completion/create_completion2/

src/cls/journal/cls_journal_client.cc:154:72: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is
deprecated [-Wdeprecated-declarations]
       librados::Rados::aio_create_completion(this, rados_callback, NULL);
                                                                        ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 11:14:16 +0000 (19:14 +0800)]
rgw: s/create_completion/create_completion2/

to silence the warnings like

s_user_client.cc:151:77: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is deprecated
[-Wdeprecated-declarations]
   AioCompletion *c = librados::Rados::aio_create_completion(NULL, NULL, NULL);
                                                                             ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: s/aio_create_completion/aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 08:03:41 +0000 (16:03 +0800)]
librados: s/aio_create_completion/aio_create_completion2/

the former is deprecated

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibradosstriper: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 08:03:21 +0000 (16:03 +0800)]
libradosstriper: s/create_completion/create_completion2/

replace `librados::Rados::aio_create_completion(arg, complete_cb,
safe_cb)` with `librados::Rados::aio_create_completion(arg,
complete_cb)`

the former is deprecated

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotools: s/rados_aio_create_completion/rados_aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 07:35:51 +0000 (15:35 +0800)]
tools: s/rados_aio_create_completion/rados_aio_create_completion2/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest: s/rados_aio_create_completion/rados_aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 07:32:37 +0000 (15:32 +0800)]
test: s/rados_aio_create_completion/rados_aio_create_completion2/

the former is deprecated and replaced with the latter

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:08:07 +0000 (15:08 +0800)]
test: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:07:35 +0000 (15:07 +0800)]
rgw: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:06:57 +0000 (15:06 +0800)]
librados: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/ceph_kvstorebench: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:06:35 +0000 (15:06 +0800)]
test/ceph_kvstorebench: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotools/rados: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 06:53:59 +0000 (14:53 +0800)]
tools/rados: s/wait_for_safe/wait_for_complete/

wait_for_safe() and friend are deprecated, so use wait_for_complete()
instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orchestrator_cli: pass default value to "req=False" params 31314/head
Kefu Chai [Fri, 1 Nov 2019 09:22:25 +0000 (17:22 +0800)]
mgr/orchestrator_cli: pass default value to "req=False" params

in mds_add() command, both "num" and "hosts" are optional, so they
should have default values of "None". this change was introduced in
c35db383.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodebian/rules: run dh_python2 with ceph-daemon 31313/head
Kefu Chai [Fri, 1 Nov 2019 07:01:16 +0000 (15:01 +0800)]
debian/rules: run dh_python2 with ceph-daemon

to set substitute variable of `${python:Depends}` for this package

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa: correct zap disk with ceph-deploy tool 31312/head
Changcheng Liu [Fri, 1 Nov 2019 06:01:52 +0000 (14:01 +0800)]
qa: correct zap disk with ceph-deploy tool

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
Signed-off-by: Alfredo Deza <adeza@redhat.com>
5 years agodoc: update with osd addition 31244/head
Changcheng Liu [Wed, 30 Oct 2019 09:07:01 +0000 (17:07 +0800)]
doc: update with osd addition

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agocrush/CrushWrapper.cc: Fix sign compare compiler warning 31184/head
Prashant D [Mon, 28 Oct 2019 06:03:21 +0000 (02:03 -0400)]
crush/CrushWrapper.cc: Fix sign compare compiler warning

introduced by 712a39e5c9d

Signed-off-by: Prashant D <pdhange@redhat.com>
5 years agolibrbd: always initialize local variables 31311/head
Kefu Chai [Fri, 1 Nov 2019 05:32:24 +0000 (13:32 +0800)]
librbd: always initialize local variables

silence warnings like:

src/librbd/io/ImageRequestWQ.cc:576:7: warning: 'length' may be used uninitialized in this function [-Wmaybe-uninitialized]
       if (block_overlapping_io(&m_in_flight_extents, offset, length)) {
       ^~
...
src/librbd/io/ImageRequestWQ.cc:935:12: note: 'length' was declared here
   uint64_t length;
            ^~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31225 into master
Sage Weil [Fri, 1 Nov 2019 02:49:46 +0000 (21:49 -0500)]
Merge PR #31225 into master

* refs/pull/31225/head:
mgr/telemetry: send device telemetry via per-host POST to device endpoint

Reviewed-by: Dan Mick <dmick@redhat.com>
5 years agopybind/rados: do not use wait_for_safe() anymore
Kefu Chai [Tue, 22 Oct 2019 06:18:10 +0000 (14:18 +0800)]
pybind/rados: do not use wait_for_safe() anymore

in librados, wait_for_safe() is an alias of wait_for_complete(). so in
this change, wait_for_safe() calls wait_for_complete(), and the callers
of wait_for_safe() will just call wait_for_complete(), instead of
calling both of them.

also, rados_aio_create_completion() is replaced with
rados_aio_create_completion2().

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: add Rados::aio_create_completion(arg, cb)
Kefu Chai [Tue, 22 Oct 2019 07:34:08 +0000 (15:34 +0800)]
librados: add Rados::aio_create_completion(arg, cb)

which does not take safe_cb, and will take the place of
Rados::aio_create_completion(arg, cb_complete, cb_safe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: add rados_aio_create_completion2()
Kefu Chai [Tue, 22 Oct 2019 06:15:58 +0000 (14:15 +0800)]
librados: add rados_aio_create_completion2()

rados_aio_create_completion2() is almost identical to
rados_aio_create_completion(). the only difference is that the former
does not accept the `safe` callback. as it's an alias of `complete`
callback since af01db76f63a22178509b402776da54164af1eb0

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: mark wait_for_safe() functions deprecated
Kefu Chai [Tue, 22 Oct 2019 06:10:16 +0000 (14:10 +0800)]
librados: mark wait_for_safe() functions deprecated

safe is an alias of completed since
af01db76f63a22178509b402776da54164af1eb0. there is no need to have
two callbacks for tracking the state of an async operation anymore.

in this change, wait_for_safe() and friends are marked "deprecated"

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31046 into master
Patrick Donnelly [Thu, 31 Oct 2019 23:42:18 +0000 (16:42 -0700)]
Merge PR #31046 into master

* refs/pull/31046/head:
doc: hide page contents for Ceph Internals

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
5 years agotest: only compile ceph_test_bmap_alloc_replay WITH_BLUESTORE 31306/head
Willem Jan Withagen [Thu, 31 Oct 2019 21:05:40 +0000 (22:05 +0100)]
test: only compile ceph_test_bmap_alloc_replay WITH_BLUESTORE

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge PR #31206 into master
Patrick Donnelly [Thu, 31 Oct 2019 20:08:34 +0000 (13:08 -0700)]
Merge PR #31206 into master

* refs/pull/31206/head:
qa: test fs:upgrade when running upgrade suite

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/ssh: simplify get_services call for 'mds update'
Sage Weil [Thu, 31 Oct 2019 19:15:14 +0000 (14:15 -0500)]
mgr/ssh: simplify get_services call for 'mds update'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: make _get_services take service *id* or service *name*
Sage Weil [Thu, 31 Oct 2019 14:37:27 +0000 (09:37 -0500)]
mgr/ssh: make _get_services take service *id* or service *name*

Name is the group, id is the instance.  A bit confusing, but this is what
orchestrator.py uses.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: fix 'service ls' on stopped services
Sage Weil [Thu, 31 Oct 2019 14:32:48 +0000 (09:32 -0500)]
mgr/ssh: fix 'service ls' on stopped services

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: move some code around
Sage Weil [Thu, 31 Oct 2019 14:01:30 +0000 (09:01 -0500)]
mgr/ssh: move some code around

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: 'service ls' works for ssh
Sage Weil [Thu, 31 Oct 2019 15:29:57 +0000 (10:29 -0500)]
doc/mgr/orchestrator_cli: 'service ls' works for ssh

See 7fc78b63425abd192a82f812958349f2bf079dea merge commit.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh
Sage Weil [Thu, 31 Oct 2019 15:27:27 +0000 (10:27 -0500)]
doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh

See f5bc2bd74a05bb486fbbca2de4dbe9a1cacd605c merge.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31270 into master
Sage Weil [Thu, 31 Oct 2019 15:40:59 +0000 (10:40 -0500)]
Merge PR #31270 into master

* refs/pull/31270/head:
ceph-daemon: no extra newline needed in authorized_keys file
ceph-daemon: use client.admin keyring during bootstrap

Reviewed-by: Alfredo Deza <adeza@redhat.com>
5 years agoMerge pull request #31265 from idryomov/wip-krbd-unmap-msgr1
Ilya Dryomov [Thu, 31 Oct 2019 14:45:19 +0000 (15:45 +0100)]
Merge pull request #31265 from idryomov/wip-krbd-unmap-msgr1

qa/suites/krbd: run unmap subsuite with msgr1 only

Reviewed-by: Jason Dillaman <dillaman@redhat.com>