]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoceph-volume: add proper size attribute to partitions 31492/head
Jan Fajerski [Fri, 8 Nov 2019 16:54:00 +0000 (17:54 +0100)]
ceph-volume: add proper size attribute to partitions

Fixes: https://tracker.ceph.com/issues/42710
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge PR #31467 into master
Sage Weil [Fri, 8 Nov 2019 16:10:46 +0000 (10:10 -0600)]
Merge PR #31467 into master

* refs/pull/31467/head:
ceph-daemon: Add basic unittest infrastructure and cmake integration
ceph-daemon: Move ceph-daemon executable to own directory

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: Add basic unittest infrastructure and cmake integration 31467/head
Thomas Bechtold [Thu, 7 Nov 2019 16:47:02 +0000 (17:47 +0100)]
ceph-daemon: Add basic unittest infrastructure and cmake integration

To be able to write unittests, add a tox.ini (for testing in venvs)
and a first single test case as example.
Tests can be executed with eg:

$ tox

Or by running the usual:

$ ./run-make-check.sh

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: Move ceph-daemon executable to own directory
Thomas Bechtold [Thu, 7 Nov 2019 15:41:23 +0000 (16:41 +0100)]
ceph-daemon: Move ceph-daemon executable to own directory

Moving ceph-daemon into src/ceph-daemon/ makes it simpler to add extra
code (eg. tox.ini, README, unittests, ...) specific to ceph-daemon.
That way related files are in a single directory.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoMerge PR #31477 into master
Sage Weil [Fri, 8 Nov 2019 15:15:50 +0000 (09:15 -0600)]
Merge PR #31477 into master

* refs/pull/31477/head:
ceph-daemon: unmount osd data dir during `adopt`

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31478 into master
Sage Weil [Fri, 8 Nov 2019 13:22:59 +0000 (07:22 -0600)]
Merge PR #31478 into master

* refs/pull/31478/head:
ceph-daemon: add --skip-pull
ceph-daemon: add explicit pull at bootstrap start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31177 into master
Sage Weil [Fri, 8 Nov 2019 13:22:05 +0000 (07:22 -0600)]
Merge PR #31177 into master

* refs/pull/31177/head:
doc: update with zone bucket and straw2 addition

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31476 into master
Sage Weil [Fri, 8 Nov 2019 13:11:20 +0000 (07:11 -0600)]
Merge PR #31476 into master

* refs/pull/31476/head:
ceph-daemon: make mon container privileged

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoceph-daemon: add --skip-pull 31478/head
Sage Weil [Fri, 8 Nov 2019 13:10:53 +0000 (07:10 -0600)]
ceph-daemon: add --skip-pull

It occurs to me there might be cases where the user *doesn't* want to pull
the latest image (e.g., because it is a partially disconnected enviroment,
and they know the image is already in the local registry).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31464 into master
Sage Weil [Fri, 8 Nov 2019 13:08:46 +0000 (07:08 -0600)]
Merge PR #31464 into master

* refs/pull/31464/head:
ceph-daemon: help users find the shell/CLI too
ceph-daemon: enable the dashboard during bootstrap
ceph-daemon: add CLI helper to bootstrap

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31479 from rishabh-d-dave/cv-dd-sync
Jan Fajerski [Fri, 8 Nov 2019 13:01:29 +0000 (14:01 +0100)]
Merge pull request #31479 from rishabh-d-dave/cv-dd-sync

ceph-volume: use fsync for dd command

5 years agoMerge pull request #29041 from jan--f/c-v-too-small-disks-unavailable
Jan Fajerski [Fri, 8 Nov 2019 12:52:45 +0000 (13:52 +0100)]
Merge pull request #29041 from jan--f/c-v-too-small-disks-unavailable

ceph-volume: reject disks smaller then 5GB in inventory

5 years agoMerge pull request #31260 from trociny/wip-42405
Jason Dillaman [Fri, 8 Nov 2019 12:35:41 +0000 (07:35 -0500)]
Merge pull request #31260 from trociny/wip-42405

rbd-mirror: removing non-primary trash snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31188 from zy751713126/rbd_features
Jason Dillaman [Fri, 8 Nov 2019 12:35:05 +0000 (07:35 -0500)]
Merge pull request #31188 from zy751713126/rbd_features

librbd: features converting bitmask and string API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31457 from jschmid1/ssh_orch_dev_env
Sebastian Wagner [Fri, 8 Nov 2019 12:20:49 +0000 (13:20 +0100)]
Merge pull request #31457 from jschmid1/ssh_orch_dev_env

mgr/ssh: update ssh-orch bootstrap guide (Vagrantfile & docs)

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: do not show non-pool data in pool details (#31456)
Lenz Grimmer [Fri, 8 Nov 2019 11:36:22 +0000 (11:36 +0000)]
mgr/dashboard: do not show non-pool data in pool details (#31456)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Fix grafana dashboards (#31219)
Lenz Grimmer [Fri, 8 Nov 2019 11:08:11 +0000 (11:08 +0000)]
mgr/dashboard: Fix grafana dashboards (#31219)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31189 from bk201/wip-42075
Lenz Grimmer [Fri, 8 Nov 2019 10:58:38 +0000 (10:58 +0000)]
Merge pull request #31189 from bk201/wip-42075

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31021 from sebastian-philipp/python-common-make-drive-selection
Sebastian Wagner [Fri, 8 Nov 2019 10:20:50 +0000 (11:20 +0100)]
Merge pull request #31021 from sebastian-philipp/python-common-make-drive-selection

python-common: Add drive selection

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoceph-volume: use fsync for dd command 31479/head
Rishabh Dave [Fri, 8 Nov 2019 07:04:27 +0000 (12:34 +0530)]
ceph-volume: use fsync for dd command

fsync makes sure that data and metadata is actually written to device
being zapped before finishing.

Fixes: https://tracker.ceph.com/issues/39156
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoceph-daemon: add explicit pull at bootstrap start
Sage Weil [Fri, 8 Nov 2019 03:43:37 +0000 (21:43 -0600)]
ceph-daemon: add explicit pull at bootstrap start

This is less confusing for users since the pull can be slow and the
uid/gid check is a weird thing to hang on for a long time.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: unmount osd data dir during `adopt` 31477/head
Michael Fritch [Fri, 8 Nov 2019 00:13:18 +0000 (17:13 -0700)]
ceph-daemon: unmount osd data dir during `adopt`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: make mon container privileged 31476/head
Sage Weil [Thu, 7 Nov 2019 23:14:52 +0000 (17:14 -0600)]
ceph-daemon: make mon container privileged

libudev needs to be privileged in order to query the underlying hardware
devices, as reported by the 'ceph device ...' command set, and to scrape
smart metrics, etc.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: help users find the shell/CLI too 31464/head
Sage Weil [Thu, 7 Nov 2019 15:23:22 +0000 (09:23 -0600)]
ceph-daemon: help users find the shell/CLI too

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: enable the dashboard during bootstrap
Sage Weil [Thu, 7 Nov 2019 14:31:18 +0000 (08:31 -0600)]
ceph-daemon: enable the dashboard during bootstrap

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31221 from weiyingze-git/patch
Jason Dillaman [Thu, 7 Nov 2019 20:25:03 +0000 (15:25 -0500)]
Merge pull request #31221 from weiyingze-git/patch

test: add test_remove_snap_ImageNotFound test case in remove snap part

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31414 from cbodley/wip-qa-rgw-more-crypto-backend
Casey Bodley [Thu, 7 Nov 2019 19:15:29 +0000 (14:15 -0500)]
Merge pull request #31414 from cbodley/wip-qa-rgw-more-crypto-backend

qa/rgw: use 'testing' kms backend for other rgw subsuites

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge PR #31398 into master
Sage Weil [Thu, 7 Nov 2019 16:58:46 +0000 (10:58 -0600)]
Merge PR #31398 into master

* refs/pull/31398/head:
pybind/mgr/pg_autoscaler: implement shutdown method

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
5 years agoMerge PR #31064 into master
Sage Weil [Thu, 7 Nov 2019 16:57:56 +0000 (10:57 -0600)]
Merge PR #31064 into master

* refs/pull/31064/head:
test: Test balancer module commands
mgr: Improve balancer module status
mgr: Release GIL before calling OSDMap::calc_pg_upmaps()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #30976 into master
Sage Weil [Thu, 7 Nov 2019 16:55:59 +0000 (10:55 -0600)]
Merge PR #30976 into master

* refs/pull/30976/head:
cmake: bump libceph-common SO version for compliance

Reviewed-by: Tim Serong <tserong@suse.com>
5 years agoceph-volume: reject disks smaller then 5GB in inventory 29041/head
Jan Fajerski [Mon, 15 Jul 2019 08:33:45 +0000 (10:33 +0200)]
ceph-volume: reject disks smaller then 5GB in inventory

Volumes smaller than 5GB won't be created anyway. This also guards
against drives with size 0, as can happen in mdraid setups.

Fixes: http://tracker.ceph.com/issues/40776
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge PR #31438 into master
Sage Weil [Thu, 7 Nov 2019 16:10:16 +0000 (10:10 -0600)]
Merge PR #31438 into master

* refs/pull/31438/head:
mgr/ssh: implement blink_device_light

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31462 into master
Sage Weil [Thu, 7 Nov 2019 15:41:59 +0000 (09:41 -0600)]
Merge PR #31462 into master

* refs/pull/31462/head:
mgr/ssh: remove superfluous parameters

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31445 into master
Sage Weil [Thu, 7 Nov 2019 15:41:19 +0000 (09:41 -0600)]
Merge PR #31445 into master

* refs/pull/31445/head:
ceph-daemon: set container_image during bootstrap

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: add CLI helper to bootstrap
Sage Weil [Thu, 7 Nov 2019 14:17:46 +0000 (08:17 -0600)]
ceph-daemon: add CLI helper to bootstrap

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: implement blink_device_light 31438/head
Sage Weil [Wed, 6 Nov 2019 14:59:37 +0000 (08:59 -0600)]
mgr/ssh: implement blink_device_light

On my test box I get as far as

  NO_SUPPORT(153): SCSI VPD page 0x83 is not supported

because my hardware doesn't support this.  The same command works
on another box that does.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31443 into master
Sage Weil [Thu, 7 Nov 2019 13:55:43 +0000 (07:55 -0600)]
Merge PR #31443 into master

* refs/pull/31443/head:
ceph-daemon: fix 'version' field for legacy `ls`

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31458 into master
Sage Weil [Thu, 7 Nov 2019 13:55:14 +0000 (07:55 -0600)]
Merge PR #31458 into master

* refs/pull/31458/head:
ceph-daemon: Only run in the __main__ scope

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: set container_image during bootstrap 31445/head
Sage Weil [Wed, 6 Nov 2019 20:49:12 +0000 (14:49 -0600)]
ceph-daemon: set container_image during bootstrap

Set the new cluster's container_image to match the image we bootstrapped
with.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31463 into master
Sage Weil [Thu, 7 Nov 2019 13:49:49 +0000 (07:49 -0600)]
Merge PR #31463 into master

* refs/pull/31463/head:
ceph-daemon: switch default image

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31448 into master
Sage Weil [Thu, 7 Nov 2019 13:27:16 +0000 (07:27 -0600)]
Merge PR #31448 into master

* refs/pull/31448/head:
ceph-daemon: make 'ls' log less noisy

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: switch default image 31463/head
Sage Weil [Thu, 7 Nov 2019 13:25:48 +0000 (07:25 -0600)]
ceph-daemon: switch default image

Use this until octopus is ready.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: remove superfluous parameters 31462/head
Joshua Schmid [Thu, 7 Nov 2019 12:44:20 +0000 (13:44 +0100)]
mgr/ssh: remove superfluous parameters

in _set_ssh_config and _clear_ssh_config

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/{dashboard,prometheus}: return FQDN instead of '0.0.0.0' (#31430)
Lenz Grimmer [Thu, 7 Nov 2019 12:18:39 +0000 (12:18 +0000)]
mgr/{dashboard,prometheus}: return FQDN instead of '0.0.0.0' (#31430)

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/ssh: move and adapt documentation for ssh-orchestrator 31457/head
Joshua Schmid [Thu, 7 Nov 2019 09:33:26 +0000 (10:33 +0100)]
mgr/ssh: move and adapt documentation for ssh-orchestrator

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/dashboard: Use htmllint (#30998)
Lenz Grimmer [Thu, 7 Nov 2019 11:42:09 +0000 (11:42 +0000)]
mgr/dashboard: Use htmllint (#30998)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Set iSCSI disk WWN and LUN number from the UI (#31056)
Lenz Grimmer [Thu, 7 Nov 2019 11:11:31 +0000 (11:11 +0000)]
mgr/dashboard: Set iSCSI disk WWN and LUN number from the UI (#31056)

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoceph-daemon: Only run in the __main__ scope 31458/head
Thomas Bechtold [Thu, 7 Nov 2019 09:50:04 +0000 (10:50 +0100)]
ceph-daemon: Only run in the __main__ scope

That makes unit testing easier to setup because the code is not loaded
when ceph-daemon gets imported. Instead it is only loaded when
executed.
For that, the parser also moved to a function instead of being on
module level.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/ssh: adapt vagrantfile for ssh-orchestration bootstrap
Joshua Schmid [Thu, 7 Nov 2019 09:23:58 +0000 (10:23 +0100)]
mgr/ssh: adapt vagrantfile for ssh-orchestration bootstrap

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #31070 from sebastian-philipp/dashbaord-run-backend-zsh
Sebastian Wagner [Thu, 7 Nov 2019 09:17:33 +0000 (10:17 +0100)]
Merge pull request #31070 from sebastian-philipp/dashbaord-run-backend-zsh

mgr/dashboard: Fix zsh support in run-backend-api-tests.sh

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
5 years agomgr/dashboard: do not show non-pool data in pool details 31456/head
Alfonso Martínez [Thu, 7 Nov 2019 09:15:30 +0000 (10:15 +0100)]
mgr/dashboard: do not show non-pool data in pool details

Fixes: https://tracker.ceph.com/issues/42674
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
5 years agomgr/dashboard: fix e2e test failure for OSDs (#31451)
Volker Theile [Thu, 7 Nov 2019 09:04:13 +0000 (10:04 +0100)]
mgr/dashboard: fix e2e test failure for OSDs (#31451)

mgr/dashboard: fix e2e test failure for OSDs

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agotest/pybind: add features test case 31188/head
zhengyin [Mon, 21 Oct 2019 07:32:39 +0000 (15:32 +0800)]
test/pybind: add features test case

add features_to_string and features_from_string test case

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
5 years agolibrbd: features converting bitmask and string API
zhengyin [Mon, 21 Oct 2019 07:28:00 +0000 (15:28 +0800)]
librbd: features converting bitmask and string API

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
5 years agomgr/dashboard: fix e2e test failure for OSDs 31451/head
Kiefer Chang [Thu, 7 Nov 2019 04:11:21 +0000 (12:11 +0800)]
mgr/dashboard: fix e2e test failure for OSDs

When clicking a selected row, the row becomes unselected and the detail
component is hidden. Rearrange related tests by selecting the row only
once.

Fixes: https://tracker.ceph.com/issues/42671
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #31350 from chenpan1012/rbd_testcase
Jason Dillaman [Wed, 6 Nov 2019 23:43:41 +0000 (18:43 -0500)]
Merge pull request #31350 from chenpan1012/rbd_testcase

cls/rbd: add snapshot limit UINT64_MAX test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-daemon: make 'ls' log less noisy 31448/head
Sage Weil [Wed, 6 Nov 2019 23:42:13 +0000 (17:42 -0600)]
ceph-daemon: make 'ls' log less noisy

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge branch 'master' into patch 31221/head
Jason Dillaman [Wed, 6 Nov 2019 23:43:08 +0000 (18:43 -0500)]
Merge branch 'master' into patch

5 years agoMerge pull request #31208 from weiyingze-git/master
Jason Dillaman [Wed, 6 Nov 2019 23:41:55 +0000 (18:41 -0500)]
Merge pull request #31208 from weiyingze-git/master

test:add test_remove_snap2 interface to remove  snap when it's protected

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-daemon: fix 'version' field for legacy `ls` 31443/head
Michael Fritch [Wed, 6 Nov 2019 17:35:51 +0000 (10:35 -0700)]
ceph-daemon: fix 'version' field for legacy `ls`

The `ls` command was reporting the git commit id instead of the ceph
version.

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31441 into master
Sage Weil [Wed, 6 Nov 2019 18:00:39 +0000 (12:00 -0600)]
Merge PR #31441 into master

* refs/pull/31441/head:
github/codeowners: Add orchestrator team

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31437 into master
Sage Weil [Wed, 6 Nov 2019 17:30:29 +0000 (11:30 -0600)]
Merge PR #31437 into master

* refs/pull/31437/head:
ceph-daemon: Remove data dir during adopt

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agogithub/codeowners: Add orchestrator team 31441/head
Sebastian Wagner [Wed, 6 Nov 2019 16:06:09 +0000 (17:06 +0100)]
github/codeowners: Add orchestrator team

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge PR #31440 into master
Sage Weil [Wed, 6 Nov 2019 15:46:36 +0000 (09:46 -0600)]
Merge PR #31440 into master

* refs/pull/31440/head:
qa/standalone/test_ceph_daemon: Make container images configurable
qa/standalone/test_ceph_daemon: Allow running from root dir
qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31439 into master
Sage Weil [Wed, 6 Nov 2019 15:41:11 +0000 (09:41 -0600)]
Merge PR #31439 into master

* refs/pull/31439/head:
ceph-daemon: fix traceback during `ls` command

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31385 into master
Sage Weil [Wed, 6 Nov 2019 15:33:36 +0000 (09:33 -0600)]
Merge PR #31385 into master

* refs/pull/31385/head:
mgr/ssh: add 'osd rm'
mgr/ssh: keep inventory and service cache keys in sync
mgr/orchestrator_cli: fix 'service ls' table format
mgr/ssh: invalidate service state on create, remove, and service action
mgr/orchestrator: add invalidate() to OutdatableDictMixin
mgr/ssh: cache services
mgr/ssh: drop specialized _remove_{mds,mgr,rgw}
mgr/ssh: change inventory_cache_timeout to seconds (not minutes)
mgr/orchestrator: make wait poll every 1s (not 5s)

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoqa/standalone/test_ceph_daemon: Make container images configurable 31440/head
Thomas Bechtold [Wed, 6 Nov 2019 15:24:17 +0000 (16:24 +0100)]
qa/standalone/test_ceph_daemon: Make container images configurable

Instead of hardcoding the images, make them configureable via
environment variables.
That way, downstream can use the script with custom images.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: fix traceback during `ls` command 31439/head
Michael Fritch [Wed, 6 Nov 2019 14:00:26 +0000 (07:00 -0700)]
ceph-daemon: fix traceback during `ls` command

fixup for 3a1ac3ff6ac2ef6e3e8c361c0c55562b732b9aac

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoqa/standalone/test_ceph_daemon: Allow running from root dir
Thomas Bechtold [Wed, 6 Nov 2019 15:10:53 +0000 (16:10 +0100)]
qa/standalone/test_ceph_daemon: Allow running from root dir

Allow running the script from root directory via:

./qa/standalone/test_ceph_daemon.sh

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoqa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set
Thomas Bechtold [Wed, 6 Nov 2019 15:01:25 +0000 (16:01 +0100)]
qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set

When running test_ceph_daemon.sh from the root dir and not setting
$CEPH_DAEMON manually, the call hangs at:

$ ./qa/standalone/test_ceph_daemon.sh
[...]
+ for p in $PYTHONS
+ echo '=== re-running with python3 ==='
=== re-running with python3 ===
++ which python3
+ ln -s /usr/bin/python3 /tmp/tmp.6hneCsNMio/python
+ echo '#!/tmp/tmp.6hneCsNMio/python'
+ cat

Check that there is a ceph-daemon found before continue.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: Remove data dir during adopt 31437/head
Michael Fritch [Wed, 6 Nov 2019 14:56:39 +0000 (07:56 -0700)]
ceph-daemon: Remove data dir during adopt

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/dashboard: add missing test_orchestrator suite (#31198)
Lenz Grimmer [Wed, 6 Nov 2019 14:35:43 +0000 (14:35 +0000)]
mgr/dashboard: add missing test_orchestrator suite (#31198)

mgr/dashboard: add missing test_orchestrator suite

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31422 into master
Sage Weil [Wed, 6 Nov 2019 14:32:29 +0000 (08:32 -0600)]
Merge PR #31422 into master

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

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agomgr/ssh: add 'osd rm' 31385/head
Sage Weil [Tue, 5 Nov 2019 14:39:16 +0000 (08:39 -0600)]
mgr/ssh: add 'osd rm'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: keep inventory and service cache keys in sync
Sage Weil [Mon, 4 Nov 2019 19:43:36 +0000 (13:43 -0600)]
mgr/ssh: keep inventory and service cache keys in sync

Our host list is implicitly defined as the set of keys for the inventory
(and service) caches.  Ensure they are in sync by unioning and inserting
any missing items.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: fix 'service ls' table format
Sage Weil [Mon, 4 Nov 2019 19:15:21 +0000 (13:15 -0600)]
mgr/orchestrator_cli: fix 'service ls' table format

Make this match the rest of Ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: invalidate service state on create, remove, and service action
Sage Weil [Mon, 4 Nov 2019 19:05:07 +0000 (13:05 -0600)]
mgr/ssh: invalidate service state on create, remove, and service action

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: add invalidate() to OutdatableDictMixin
Sage Weil [Mon, 4 Nov 2019 18:59:12 +0000 (12:59 -0600)]
mgr/orchestrator: add invalidate() to OutdatableDictMixin

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: cache services
Sage Weil [Mon, 4 Nov 2019 18:31:34 +0000 (12:31 -0600)]
mgr/ssh: cache services

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: drop specialized _remove_{mds,mgr,rgw}
Sage Weil [Mon, 4 Nov 2019 19:04:27 +0000 (13:04 -0600)]
mgr/ssh: drop specialized _remove_{mds,mgr,rgw}

_remove_daemon is sufficient

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: change inventory_cache_timeout to seconds (not minutes)
Sage Weil [Mon, 4 Nov 2019 18:51:08 +0000 (12:51 -0600)]
mgr/ssh: change inventory_cache_timeout to seconds (not minutes)

The descriptio didn't match the implementation (which took minutes).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: make wait poll every 1s (not 5s)
Sage Weil [Mon, 4 Nov 2019 19:06:06 +0000 (13:06 -0600)]
mgr/orchestrator: make wait poll every 1s (not 5s)

More responsive!

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/prometheus: return FQDN for default server_addr 31430/head
Patrick Seidensal [Wed, 6 Nov 2019 10:45:51 +0000 (11:45 +0100)]
mgr/prometheus: return FQDN for default server_addr

Instead of returning '0.0.0.0' the prometheus module returns the FQDN of
the host, as it is the case for '::'.

Fixes: https://tracker.ceph.com/issues/42664
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
5 years agomgr/dashboard: return FQDN for default server_addr
Patrick Seidensal [Wed, 6 Nov 2019 10:42:52 +0000 (11:42 +0100)]
mgr/dashboard: return FQDN for default server_addr

Instead of returning '0.0.0.0' the dashboard returns the FQDN of the
host, as it is the case for '::'.

Fixes: https://tracker.ceph.com/issues/42664
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
5 years agomgr/dashboard: Use htmllint 30998/head
Tiago Melo [Fri, 18 Oct 2019 16:23:53 +0000 (16:23 +0000)]
mgr/dashboard: Use htmllint

This package will replace htmlhint.

Some rules from the previous installed packages were not working that well.
This new package has more rules and seems to work better.

Signed-off-by: Tiago Melo <tmelo@suse.com>
5 years agomgr/dashboard: Add support for device management (#30759)
Lenz Grimmer [Wed, 6 Nov 2019 12:32:35 +0000 (12:32 +0000)]
mgr/dashboard: Add support for device management (#30759)

mgr/dashboard: Add support for device management

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Searchable objects for table (#31199)
Lenz Grimmer [Wed, 6 Nov 2019 12:30:58 +0000 (12:30 +0000)]
mgr/dashboard: Searchable objects for table (#31199)

mgr/dashboard: Searchable objects for table

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #26768 from sebastian-philipp/upstream-pull-26684
Sebastian Wagner [Wed, 6 Nov 2019 10:48:29 +0000 (11:48 +0100)]
Merge pull request #26768 from sebastian-philipp/upstream-pull-26684

mgr/orchestrator: device lights

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31409 into master
Patrick Donnelly [Wed, 6 Nov 2019 03:09:46 +0000 (19:09 -0800)]
Merge PR #31409 into master

* refs/pull/31409/head:
mds: Fix MDCache.h reorder compiler warnings

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31401 into master
Patrick Donnelly [Wed, 6 Nov 2019 00:54:03 +0000 (16:54 -0800)]
Merge PR #31401 into master

* refs/pull/31401/head:
mds: clarify comment

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
5 years agoMerge PR #31420 into master
Sage Weil [Tue, 5 Nov 2019 18:36:45 +0000 (12:36 -0600)]
Merge PR #31420 into master

* refs/pull/31420/head:
ceph-daemon: do not screw up line splitting
mgr/ssh: raise RuntimeError when ceph-daemon invocation fails

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: do not screw up line splitting 31420/head
Sage Weil [Tue, 5 Nov 2019 16:36:30 +0000 (10:36 -0600)]
ceph-daemon: do not screw up line splitting

When we log stdout and stderr, we were artificially adding line splits
due to reading 1024 bytes at a time and assuming it was aligned with a
newline.

Fix by keeping partial lines buffered and only log them once they are
complete (or the call finishes).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/MgrClient: fix open condition fix 31422/head
Sage Weil [Tue, 5 Nov 2019 17:13:35 +0000 (11:13 -0600)]
mgr/MgrClient: fix open condition fix

Fix fc60989bf7a72c35b8f6b8fec2407b3080ad9bbd, which reversed this
condition.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: raise RuntimeError when ceph-daemon invocation fails
Sage Weil [Tue, 5 Nov 2019 16:27:45 +0000 (10:27 -0600)]
mgr/ssh: raise RuntimeError when ceph-daemon invocation fails

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: disable pg_autoscale for new pools in e2e tests (#31396)
Lenz Grimmer [Tue, 5 Nov 2019 15:59:57 +0000 (15:59 +0000)]
mgr/dashboard: disable pg_autoscale for new pools in e2e tests (#31396)

mgr/dashboard: disable pg_autoscale for new pools in e2e tests

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge PR #31365 into master
Sage Weil [Tue, 5 Nov 2019 15:28:32 +0000 (09:28 -0600)]
Merge PR #31365 into master

* refs/pull/31365/head:
ceph-daemon: make rm-daemon reset-failed
ceph-daemon: make rm-cluster handle failed unit cleanup

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Fix error on ceph-iscsi version pre controls_limits 31056/head
Ricardo Marques [Thu, 31 Oct 2019 21:39:17 +0000 (21:39 +0000)]
mgr/dashboard: Fix error on ceph-iscsi version pre controls_limits

Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agomgr/dashboard: Set iSCSI disk WWN and LUN number from the UI
Ricardo Marques [Fri, 18 Oct 2019 16:43:38 +0000 (17:43 +0100)]
mgr/dashboard: Set iSCSI disk WWN and LUN number from the UI

Fixes: https://tracker.ceph.com/issues/41749
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge PR #31303 into master
Sage Weil [Tue, 5 Nov 2019 14:55:59 +0000 (08:55 -0600)]
Merge PR #31303 into master

* refs/pull/31303/head:
ceph-daemon: make systemd unit descriptions Capitalized
ceph-daemon: handle daemon names with multiple .'s
mgr/ssh: rgw: ensure map rgws are mapped to the zone
mgr/ssh: use . as delimiter between service group and id
mgr/ssh: implement 'rgw update'
mgr/orchestrator_cli: add 'rgw update' CLI command
mgr/ssh: add 'rgw rm'
mgr/ssh: implement 'rgw add'
ceph-daemon: handle 'rgw' type daemons
mgr/orchestrator_cli: rgw add: optionally take count and node names

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: make systemd unit descriptions Capitalized 31303/head
Sage Weil [Fri, 1 Nov 2019 18:32:36 +0000 (13:32 -0500)]
ceph-daemon: make systemd unit descriptions Capitalized

Same style as other units.

Signed-off-by: Sage Weil <sage@redhat.com>