RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,897 Commits 3 Branches 395 Tags 1.3 GiB
18cbe60124
Commit Graph

103897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Lenz Grimmer
ea2370461f
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>
 2019-11-06 12:30:58 +00:00
Sebastian Wagner
3feda32916
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>
 2019-11-06 11:48:29 +01:00
Patrick Donnelly
ffcd974222
Merge PR #31409 into master 
* refs/pull/31409/head:
	mds: Fix MDCache.h reorder compiler warnings

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2019-11-05 19:09:46 -08:00
Patrick Donnelly
eb209019b9
Merge PR #31401 into master 
* refs/pull/31401/head:
	mds: clarify comment

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
 2019-11-05 16:54:03 -08:00
Sage Weil
9ba87385bc 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>
 2019-11-05 12:36:45 -06:00
Sage Weil
83b072f3cc 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>
 2019-11-05 12:11:06 -06:00
Sage Weil
13198b133f mgr/MgrClient: fix open condition fix 
Fix fc60989bf7, which reversed this
condition.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 11:13:35 -06:00
Sage Weil
e38eeb62c5 mgr/ssh: raise RuntimeError when ceph-daemon invocation fails 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 10:27:45 -06:00
Lenz Grimmer
f4c0f580b9
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>
 2019-11-05 15:59:57 +00:00
Sage Weil
f5762cc984 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>
 2019-11-05 09:28:32 -06:00
Sage Weil
6cca11e80a 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>
 2019-11-05 08:55:59 -06:00
Sage Weil
d7fc56b72b ceph-daemon: make systemd unit descriptions Capitalized 
Same style as other units.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:01 -06:00
Sage Weil
332432bdc1 ceph-daemon: handle daemon names with multiple .'s 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:01 -06:00
Sage Weil
b3097bf8b0 mgr/ssh: rgw: ensure map rgws are mapped to the zone 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:01 -06:00
Sage Weil
a2fabd86db mgr/ssh: use . as delimiter between service group and id 
This aligns with . as an entity delimiter in the ceph config.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:01 -06:00
Sage Weil
f59a40186b mgr/ssh: implement 'rgw update' 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:01 -06:00
Sage Weil
a8a05e2e29 mgr/orchestrator_cli: add 'rgw update' CLI command 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:00 -06:00
Sage Weil
5c09643823 mgr/ssh: add 'rgw rm' 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:00 -06:00
Sage Weil
06abbd518d mgr/ssh: implement 'rgw add' 
Note that this doesn't correctly confine a daemon to a zone.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:00 -06:00
Sage Weil
1d61bfb3af ceph-daemon: handle 'rgw' type daemons 
- weird data dir: /var/lib/ceph/radosgw/ceph-rgw.$id (not
  /var/lib/ceph/rgw/ceph-$id)
- weird auth name: client.rgw.$id (not rgw.$id)
- weird entrypoint: /usr/bin/radosgw (not /usr/bin/ceph-rgw)

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:00 -06:00
Sage Weil
47c5d3c8b6 mgr/orchestrator_cli: rgw add: optionally take count and node names 
This avoids the need for JSON in the common case.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 08:46:00 -06:00
Sage Weil
35640cb201 Merge PR #31327 into master 
* refs/pull/31327/head:
	mon/ConfigMap: search nested sections

Reviewed-by: Neha Ojha <nojha@redhat.com>
 2019-11-05 08:39:09 -06:00
Sage Weil
8fc888e3c9 Merge PR #31412 into master 
* refs/pull/31412/head:
	osd: send smart asok result to stdout, not stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2019-11-05 08:38:47 -06:00
Casey Bodley
3e718d3f4f
Merge pull request #31363 from cbodley/wip-qa-rgw-ec-is-fast-again 
qa/rgw: remove whitelist for SLOW_OPS against ec pools

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
 2019-11-05 08:52:10 -05:00
Sage Weil
6be3ef3f25 osd: send smart asok result to stdout, not stderr 
Uncross the streams!

Reported-by: Patrick Seidensal <pseidensal@suse.com>
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-11-05 07:34:07 -06:00
Sage Weil
aa010d47ef Merge PR #31321 into master 
* refs/pull/31321/head:
	ceph-daemon: do not relabel system directories
 2019-11-05 07:08:09 -06:00