RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,838 Commits 226 Branches 396 Tags 1.7 GiB
48b6cc6182
Commit Graph

109838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
48b6cc6182 Merge PR #34061 into master 
* refs/pull/34061/head:
	mgr/orch: Add `ceph orch ls --export`
	mgr/dashboard: adapt to new `ServiceDescription.to_json()`
	python-common: add `service_name` to `ServiceSpec.to_json`
	python-common: make ServiceSpec and ServiceDescription compatible
	src/ceph.in: add yaml to known formats
	mgr/orch: add yaml to `orch ls`
	mgr/orch: remove `orch spec dump`
	python-common: reorder RGWSpec arguments
	python-common: prevent ServiceSpec of wrong type
	pybind/mgr: tox.ini: omit cov report
	mgr/cephadm: test describe_service
	mgr/orch: ServiceDescription: change json representation
	mgr/orch: ServiceDescription: Make spec a requirement

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-29 07:17:37 -05:00
Sage Weil
932d152f35 Merge PR #34215 into master 
* refs/pull/34215/head:
	cephadm: Fix trucated output of `mgr dump`

Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-29 07:16:59 -05:00
Kefu Chai
260b1a922e
Merge pull request #34268 from poyea/docs-options-1 
doc: Fix inconsistency in logging settings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-29 14:24:09 +08:00
John Law
c2c069f2b4 doc: Fix inconsistency in logging settings 
This patch fixes inconsistency in logging settings with options, namely `log_flush_on_exit` and `log_to_stderr`. This patch also adds `log_to_file` to the section.

Signed-off-by: John Law <johnlaw.po@gmail.com>
 2020-03-29 03:14:45 +02:00
Sage Weil
9f3f05c5e5 Merge PR #34062 into master 
* refs/pull/34062/head:
	cephadm: update check-host() to return all problems

Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-28 09:24:55 -05:00
Kefu Chai
0e40f6fb01
Merge pull request #33943 from xxhdx1985126/wip-crimson-alienstore-bugs 
crimson: fix bugs that come up when osds go through down/up

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-28 09:53:43 +08:00
Sebastian Wagner
6a6759eef0 cephadm: Fix trucated output of mgr dump 
In case the process has terminated, we
have to make sure to read till EOF, otherwise
we might skip some bytes.

Fixes: https://tracker.ceph.com/issues/44642

Co-authored-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-28 00:42:34 +01:00
Sage Weil
037a68d76e Merge PR #34247 into master 
* refs/pull/34247/head:
	mgr/dashboard: do not fail on user creation

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-27 15:20:17 -05:00
Gregory Farnum
60504bd048
Merge pull request #33279 from rishabh-d-dave/fs-move-run_shell-and-related-methods 
qa/cephfs: move run_shell to mount.py and add methods for negative testing
 2020-03-27 12:59:43 -07:00
Gregory Farnum
d472ab9753
Merge pull request #34021 from lxbsz/deleg_XXX 
test/libcephfs: retry and wait for caps when setting the RD deleg
 2020-03-27 12:57:20 -07:00
Gregory Farnum
514739d2f4
Merge pull request #33494 from lxbsz/mount 
mount.ceph: stop printing warning message for unrecognized mount options

Reviewed-by: Jeff Layton <jlayton@redhat.com>
 2020-03-27 12:56:38 -07:00
Gregory Farnum
ca24037277
Merge pull request #33740 from lxbsz/qa_test_timeout_failed 
qa/test_config_session_timeout: fix options conflicting

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
 2020-03-27 12:55:20 -07:00
Gregory Farnum
fb1fdf4d55
Merge pull request #34024 from vshankar/wip-ignore-mgrmap-when-laggy 
mds: do not defer incoming mgrmap when mds is laggy

Reviewed-by:  "Yan, Zheng" <zyan@redhat.com>
 2020-03-27 12:29:43 -07:00
Tatjana Dehler
9992faa947 mgr/dashboard: do not fail on user creation 
Accordingly to other Ceph commands do not fail on user
creation with a non-zero error code if the user already
exists.
Instead succeed and return the message 'User <username>
already exists'.

Fixes: https://tracker.ceph.com/issues/44502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
 2020-03-27 15:58:42 +01:00
Laura Paduano
7dc02fd0ad
Merge pull request #33992 from rhcs-dashboard/44626-fix-notifications-e2e-tests 
mgr/dashboard: fix notifications E2E tests

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
 2020-03-27 12:42:42 +01:00
Nathan Cutler
a6846c150c
Merge pull request #34209 from smithfarm/wip-doc-multi-cluster-follow-on-fix 
doc: fix cephadm link

Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-27 10:20:00 +01:00
Nathan Cutler
0e1e85047d
Merge pull request #34235 from toabctl/add-sle-15-sp2 
qa/distros: add SLE-15-SP2

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2020-03-27 09:33:50 +01:00
Kefu Chai
a12f9f19e0
Merge pull request #32749 from james58899/fix-capacity 
monitoring: Fix pool capacity incorrect

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
 2020-03-27 16:13:29 +08:00
Kefu Chai
fde92a3775
Merge pull request #34233 from tchaikov/wip-qa-py3 
qa/tasks: change to be py3 compatible and cleanups

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
 2020-03-27 15:53:05 +08:00
Thomas Bechtold
3261e24636 qa/distros: add SLE-15-SP2 
Ceph octopus is known to run on SLE-15-SP2 so add it to
qa/distros/all.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
 2020-03-27 08:17:13 +01:00
Kefu Chai
14722092fd cmake: add import-tasks to run-tox-qa test 
to ensure that qa suites are python3 compatible

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2020-03-27 14:54:37 +08:00
Kefu Chai
7d37226548 qa/tasks/mgr: use relative import 
for better readability, and to ease the pain of developer to track back
to the top level python package for referencing a submodule

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2020-03-27 14:51:24 +08:00
Kefu Chai
4b4f393aec qa/tasks/cephfs: fix print() to be py3 compatible 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2020-03-27 14:51:24 +08:00
Kefu Chai
a105dea117
Merge pull request #33949 from toabctl/import-tasks-with-py3 
qa: Add a tox env that can test importing files

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-27 14:49:46 +08:00
Kefu Chai
76b81f3a88
Merge pull request #34141 from tchaikov/wip-test-threadsafe 
test/objectstore: set "threadsafe" flag for ASSERT_DEATH tests

Reviewed-by: Neha Ojha <nojha@redhat.com>
 2020-03-27 12:52:28 +08:00
Xuehan Xu
b5767df1a8 crimson: fix pglog read_log_and_missing issue 
Currently pglog's read_log_and_missing_crimson's implementation
would cause null pointer exception, since at the time, we don't the
key to start from

Signed-off-by: Xuehan Xu <xxhdx1985126@163.com>
 2020-03-27 11:08:41 +08:00
Xuehan Xu
551e663a98 crimson: add necessary FuturizedStore APIs for data recovery 
Signed-off-by: Xuehan Xu <xxhdx1985126@163.com>
 2020-03-27 11:08:35 +08:00
Xuehan Xu
adbdd753f1 crimson: make sure pg meta is valid when loading pg 
currently, PGMeta instances are all local variables in method,
which would lead to daggling reference/pointer problems when using
seastar::futures.

Signed-off-by: Xuehan Xu <xxhdx1985126@163.com>
 2020-03-27 11:08:30 +08:00
Sage Weil
3ee082218c Merge PR #32093 into master 
* refs/pull/32093/head:
	doc/start: Update hardware recommendations.

Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-26 15:45:24 -05:00
Mark Nelson
3305a07324 doc/start: Update hardware recommendations. 
Signed-off-by: Mark Nelson <mnelson@redhat.com>
 2020-03-26 15:07:50 -05:00
Sage Weil
371b377a43 Merge PR #34218 into master 
* refs/pull/34218/head:
	mgr/cephadm: Add missing decorator

Reviewed-by: Michael Fritch <mfritch@suse.com>
 2020-03-26 12:41:01 -05:00
Sebastian Wagner
8e90f312e4 mgr/cephadm: Add missing decorator 
Caused by a conflict between

* #33581 (770816dc9f) and
* #34091 (a78f42e225)

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 17:50:21 +01:00
Kefu Chai
1032494ad2
Merge pull request #33873 from lxbsz/qa_vs_failed 
qa/tasks/vstart_runner: fix sh to make it compatible with teth

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-26 23:26:53 +08:00
Kefu Chai
be11e75d5d
Merge pull request #33882 from rosinL/wip-fix-rdma-segfault 
msg/async/rdma: add return value check after qp created

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-26 23:25:39 +08:00
Kefu Chai
8e9621e8b9
Merge pull request #34195 from tchaikov/wip-tasks-mgr-submodule 
qa/tasks/mgr: partial revert of 'import with full path'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
 2020-03-26 23:23:43 +08:00
Kefu Chai
c69d128e48
Merge pull request #34196 from majianpeng/bluestore-remove-incorrectly-comments 
os/bluestore: remove incorrect comments.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2020-03-26 23:21:57 +08:00
Neha Ojha
c4d80afd53
Merge pull request #34183 from neha-ojha/wip-doc-fix 
doc/releases/octopus.rst: fix min_mon_release string

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2020-03-26 08:12:37 -07:00
Nathan Cutler
7dd012252c doc: fix cephadm link 
Fixes: 8fe460e756
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2020-03-26 15:55:47 +01:00
Sage Weil
f865f3e0a0 Merge PR #34091 into master 
* refs/pull/34091/head:
	mgr/cephadm: cleanup async_map_completion etc.
	mgr/cephadm: replace async_completion with trivial_completion
	mgr/cephadm: replace async_map_completion with a simple wrapper
 2020-03-26 09:05:35 -05:00
Sage Weil
7ef5458e26 Merge PR #34188 into master 
* refs/pull/34188/head:
	doc: do not encourage readers to run multiple clusters on same HW

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2020-03-26 07:46:30 -05:00
Igor Fedotov
a91492ebb3
Merge pull request #30839 from ifed01/wip-ifed-aloc_replay_improve 
test/bmap_allocator_replay_test: improving allocator replay tool.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
 2020-03-26 15:32:01 +03:00
Sebastian Wagner
3543aeb84c mgr/orch: Add ceph orch ls --export 
* defaults to `--format yaml`
* don't include `status`

```
$  ceph orch ls --export
placement:
  host_pattern: '*'
service_name: crash
service_type: crash
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
c5e6ecb547 mgr/dashboard: adapt to new ServiceDescription.to_json() 
`ServiceDescription.to_json()` is now based on `ServiceSpec.to_json()`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
6bffff2f1b python-common: add service_name to ServiceSpec.to_json 
To make it compatible to `Orchestrator.describe_service`.
Otherwise we have the awkward situation that users need to
pass `service_name` to `describe_service`, but `service_id` to apply

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
7f8c7ad3ca python-common: make ServiceSpec and ServiceDescription compatible 
`ServiceSpec.from_json(ServiceDescription().to_json())` now works

as does

`ceph orch ls  --format yaml | ceph orch apply -i -`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
4a4dac2725 src/ceph.in: add yaml to known formats 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
dcde4899ce mgr/orch: add yaml to orch ls 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
446ede26f3 mgr/orch: remove orch spec dump 
as this is now a subset of `orch ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 12:02:56 +01:00
Sebastian Wagner
9335b7e564 python-common: reorder RGWSpec arguments 
to match the argumens from `ServiceSpec`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 11:57:25 +01:00
Sebastian Wagner
e39088c30e python-common: prevent ServiceSpec of wrong type 
Some Python foo to make sure, we don't have an object
like `ServiceSpec('rgw')` of type `ServiceSpec`. Now we have:

>>> type(ServiceSpec('rgw')) == type(RGWSpec('rgw'))

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-26 11:57:25 +01:00