Commit Graph

110057 Commits

Author SHA1 Message Date
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
Sage Weil
af8fa11a1f Revert "Merge PR #34091 into master"
This reverts commit f865f3e0a0, reversing
changes made to 7ef5458e26.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-27 13:38:45 -05:00
Sage Weil
65ad142d59 qa/tasks/cephadm: no need to explicitly reconfig
cephadm does this magically now.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-27 11:49:29 -05:00
Sage Weil
29d2d7d64b qa/tasks/cephadm: fetch final ceph.conf
Otherwise we'll distribute the initial ceph.conf, which only has the
bootstrap mon in it.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-27 11:49:29 -05:00
Sage Weil
4c78dfe26f qa/tasks/cephadm: distribute ceph.conf and admin keyring to all nodes
Revert part of 96220c0c05 so that we still
distribute a *final* ceph.conf and admin keyring to all nodes, right after
all of the mons are up.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-27 10:43:18 -05: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
Daniel-Pivonka
b3f69b10df cephadm: rm-cluster clean up /etc/ceph
rm-cluster command will delete config, keyring, and pub key files from /etc/ceph

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
2020-03-27 10:03:03 -04:00
Patrick Seidensal
6935dc5592 monitoring: alert for prediction of disk and pool fill up broken
Fixes: https://tracker.ceph.com/issues/44776

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-03-27 13:44:28 +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
Kristoffer Grönlund
b7abaab5bd dashboard: Convert FQDN to hostname in grafana panels
The $ceph_hosts variable contained the FQDN for hosts
while the instance label created by ceph only has
the hostname.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:15 +01:00
Kristoffer Grönlund
136d21e21d dashboard: Resolve FQDN / hostname mismatch in hosts overview panel
In the AVG Disk Utilization panel, the result is calculated
by combining the output of node_disk_io_time_seconds_total
with the output of ceph_disk_occupation. However, the
first vector encodes the instance label with the full FQDN
while the ceph label only contains the hostname:port. In
order for these to match correctly, the domain name and port
has to be stripped from the labels.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:09 +01:00
Kristoffer Grönlund
8b61b8d3d7 dashboard: Use exported_instance to identify OSDs
When moving to LVM-based ceph-volume setups, several
grafana dashboards stopped working. The problem is that
(device, instance) no longer results in unique labels
which causes errors like:

"many-to-many matching not allowed: matching labels must be unique on one side"

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:33:01 +01:00
Kristoffer Grönlund
4444333243 dashboard: AVG RAM Utilization panel always showed "N/A"
The references to `$osd_hosts` etc. were encoded as
`[[osd_hosts]]` in the PromQL expression divisor, and
the panel always displayed N/A as the result of the
query.

Replacing the `[[...]]` with `$...` makes the expression
work again.

Fixes: https://tracker.ceph.com/issues/44784
Signed-off-by: Kristoffer Grönlund <kgronlund@suse.com>
2020-03-27 12:32:52 +01:00
Patrick Seidensal
f8e347f771 monitoring: root volume full alert fires false positives
Fixes: https://tracker.ceph.com/issues/44780

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2020-03-27 11:06:08 +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
Mark Nelson
5574617b9f common/options: Disable bluefs_buffered_io by default again.
Signed-off-by: Mark Nelson <mnelson@redhat.com>
2020-03-26 16:21:42 -05: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
James Page
b4c08b2b3a mds: resolve type mismatches on 32 bit archs
Ensure that size_t is cast to uint64_t on 32 bit architectures
to avoid compilation failures due mismatches between uint64_t
and size_t.

Signed-off-by: James Page <james.page@ubuntu.com>
2020-03-26 15:57:25 +00: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