Commit Graph

103931 Commits

Author SHA1 Message Date
Sage Weil
5def1df5e8 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>
2019-11-07 10:57:56 -06:00
Sage Weil
b7fb76e8a1 Merge PR #30976 into master
* refs/pull/30976/head:
	cmake: bump libceph-common SO version for compliance

Reviewed-by: Tim Serong <tserong@suse.com>
2019-11-07 10:55:59 -06:00
Sage Weil
147b576be4 Merge PR #31438 into master
* refs/pull/31438/head:
	mgr/ssh: implement blink_device_light

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-07 10:10:16 -06:00
Sage Weil
f0d399bc68 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>
2019-11-07 09:41:59 -06:00
Sage Weil
419965a52b Merge PR #31445 into master
* refs/pull/31445/head:
	ceph-daemon: set container_image during bootstrap

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-07 09:41:19 -06:00
Sage Weil
a9b5fa6303 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>
2019-11-07 07:56:23 -06:00
Sage Weil
1fc600c5e7 Merge PR #31443 into master
* refs/pull/31443/head:
	ceph-daemon: fix 'version' field for legacy `ls`

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-07 07:55:43 -06:00
Sage Weil
8f855389af 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>
2019-11-07 07:55:14 -06:00
Sage Weil
60ddc4d97e 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>
2019-11-07 07:51:11 -06:00
Sage Weil
992499c7bc Merge PR #31463 into master
* refs/pull/31463/head:
	ceph-daemon: switch default image

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-07 07:49:49 -06:00
Sage Weil
c19a797bb0 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>
2019-11-07 07:27:16 -06:00
Sage Weil
d98714cde3 ceph-daemon: switch default image
Use this until octopus is ready.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-07 07:25:48 -06:00
Joshua Schmid
c26218fd30 mgr/ssh: remove superfluous parameters
in _set_ssh_config and _clear_ssh_config

Signed-off-by: Joshua Schmid <jschmid@suse.de>
2019-11-07 13:44:20 +01:00
Lenz Grimmer
66222117c1
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>
2019-11-07 12:18:39 +00:00
Lenz Grimmer
258c48c224
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>
2019-11-07 11:42:09 +00:00
Lenz Grimmer
f7d731f849
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>
2019-11-07 11:11:31 +00:00
Thomas Bechtold
55541d3f86 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>
2019-11-07 10:51:46 +01:00
Sebastian Wagner
55240ea279
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>
2019-11-07 10:17:33 +01:00
Volker Theile
e8f1f0253a
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>
2019-11-07 10:04:13 +01:00
Kiefer Chang
19cb6db934
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>
2019-11-07 12:34:08 +08:00
Jason Dillaman
8cb1f6bddb
Merge pull request #31350 from chenpan1012/rbd_testcase
cls/rbd: add snapshot limit UINT64_MAX test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-11-06 18:43:41 -05:00
Sage Weil
e9b57e0276 ceph-daemon: make 'ls' log less noisy
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 17:43:11 -06:00
Jason Dillaman
18cbe60124
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>
2019-11-06 18:41:55 -05:00
Michael Fritch
440830c9c9
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>
2019-11-06 11:18:43 -07:00
Sage Weil
80ade6cd27 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>
2019-11-06 12:00:39 -06:00
Sage Weil
7328fa4dcf Merge PR #31437 into master
* refs/pull/31437/head:
	ceph-daemon: Remove data dir during adopt

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-06 11:30:29 -06:00
Sebastian Wagner
df6287f7f0 github/codeowners: Add orchestrator team
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2019-11-06 17:17:16 +01:00
Sage Weil
e326dfbc61 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>
2019-11-06 09:46:36 -06:00
Sage Weil
5964f5f2bd Merge PR #31439 into master
* refs/pull/31439/head:
	ceph-daemon: fix traceback during `ls` command

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-06 09:41:11 -06:00
Sage Weil
22523d97b6 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>
2019-11-06 09:33:36 -06:00
Thomas Bechtold
5eaf133038 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>
2019-11-06 16:24:17 +01:00
Michael Fritch
0c2f8cf748
ceph-daemon: fix traceback during ls command
fixup for 3a1ac3ff6a

Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-06 08:19:47 -07:00
Thomas Bechtold
b04b8f7398 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>
2019-11-06 16:11:46 +01:00
Thomas Bechtold
a004d92ae0 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>
2019-11-06 16:09:55 +01:00
Michael Fritch
7e018e9c4b
ceph-daemon: Remove data dir during adopt
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-06 07:56:39 -07:00
Lenz Grimmer
fe8f786b6e
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>
2019-11-06 14:35:43 +00:00
Sage Weil
f39980bc21 Merge PR #31422 into master
* refs/pull/31422/head:
	mgr/MgrClient: fix open condition fix

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-11-06 08:32:29 -06:00
Sage Weil
80f72fa7f3 mgr/ssh: add 'osd rm'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:26:12 -06:00
Sage Weil
cd002f9d61 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>
2019-11-06 08:26:12 -06:00
Sage Weil
67f5f44cc9 mgr/orchestrator_cli: fix 'service ls' table format
Make this match the rest of Ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:26:12 -06:00
Sage Weil
26789b3940 mgr/ssh: invalidate service state on create, remove, and service action
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:26:12 -06:00
Sage Weil
932cfa23b7 mgr/orchestrator: add invalidate() to OutdatableDictMixin
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:25:49 -06:00
Sage Weil
89c1bf5194 mgr/ssh: cache services
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:25:49 -06:00
Sage Weil
ea5fa0426e mgr/ssh: drop specialized _remove_{mds,mgr,rgw}
_remove_daemon is sufficient

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:25:49 -06:00
Sage Weil
df458a8bf0 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>
2019-11-06 08:25:49 -06:00
Sage Weil
0a64cfb80c mgr/orchestrator: make wait poll every 1s (not 5s)
More responsive!

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-06 08:25:49 -06:00
Patrick Seidensal
9eb1c34f6f 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>
2019-11-06 14:58:21 +01:00
Patrick Seidensal
a4e96b45ac 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>
2019-11-06 14:57:28 +01:00
Tiago Melo
69ec9c1186 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>
2019-11-06 11:37:58 -01:00
Lenz Grimmer
4b977d7584
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>
2019-11-06 12:32:35 +00:00