Commit Graph

108997 Commits

Author SHA1 Message Date
Jason Dillaman
e06946b6b5
Merge pull request #33676 from pponnuvel/strncpy_avoid_one_byte_copy
test/librbd: avoid copying/overwriting a byte unnecessarily
2020-03-09 13:48:33 -04:00
Jason Dillaman
797ed05e14
Merge pull request #33681 from changchengx/blockguard_right_exclusive
librbd: explicitly specify BlockGuard to be right exclusive

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2020-03-09 13:47:39 -04:00
Jason Dillaman
499a4e50f0
Merge pull request #33712 from yison/rwl-fix-block-extents-issue
librbd: fix block extents issue of rwl writeback cache

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2020-03-09 13:46:13 -04:00
Kefu Chai
50cf889e78
Merge pull request #33196 from xxhdx1985126/wip-crimson-pglog-to-pr
crimson: add pglog support to crimson's data write path

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-09 23:09:05 +08:00
Sage Weil
5206bfbd48 Merge PR #33793 into master
* refs/pull/33793/head:
	qa/suites/rados/cephadm/upgrade: new start point
	qa/tasks/cephadm: put bootstrap config etc directly in /etc/ceph
	cephadm: shell: default to config and keyring in /etc/ceph, if present

Reviewed-by: Ricardo Marques <rimarques@suse.com>
2020-03-09 08:28:57 -05:00
Sage Weil
f3ffbb88f6 Merge PR #33808 into master
* refs/pull/33808/head:
	mgr/cephadm: apply: fill in default placement if none is provided
	mgr/cephadm: make placement truly optional (default to count=1)
	mgr/cephadm: allow count == 0
	mgr/cephadm: remove magic labels

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2020-03-09 08:28:37 -05:00
Lenz Grimmer
da52dec552
Merge pull request #33756 from tspmelo/wip-remove-ngx-store
mgr/dashboard: Remove ngx-store

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2020-03-09 12:30:50 +01:00
Kefu Chai
ec9c315ea0
Merge pull request #33691 from rhcs-dashboard/vstart-enable-nfs-ganesa-mgmt-dashboard
vstart.sh: enable nfs-ganesha mgmt. in dashboard.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-09 19:25:05 +08:00
Kefu Chai
f41fd1faef
Merge pull request #33797 from tchaikov/wip-crimson-cleanups
crimson: cleanups

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2020-03-09 18:22:29 +08:00
Kefu Chai
b57403de20
Merge pull request #32440 from rosinL/wip-spdk
os/bluestore/spdk: Fix the overflow error of parsing spdk coremask

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-09 11:54:58 +08:00
Kefu Chai
6582a688ae crimson/mgr: close() in background
as per Yingxin,

application code is not required to wait for the `close()` future, it
would be safe to ignore it, because:
- `close()` will shutdown its socket synchronously;
- `close()` will create an internal `ConnectionRef` when it's closing;
- `Messenger` will wait for all connections closed during `shutdown()`;

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-09 11:49:57 +08:00
Kefu Chai
1e37793c3d common/buffer.cc: silence ASan warning
silences following warning
```
../src/common/buffer.cc:472:9: runtime error: member access within null pointer of type 'struct raw'
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-09 11:49:57 +08:00
Kefu Chai
c64c47a687 crimson/osd: reorder includes
to follow
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-09 11:49:57 +08:00
Kefu Chai
3dfdf0e86b crimson/mgr: use periodical timer for report
* always rearm the timer when handling MMgrConfigure
* remove `mgr::Client::tick_period`

Signed-off-by: Kefu Chai <kchai@redhat.com>
2020-03-09 11:49:57 +08:00
Sage Weil
78b24f5783 Merge PR #33776 into master
* refs/pull/33776/head:
	test: Add flush_pg_stats to avoid race with getting num_shards_repaired

Reviewed-by: Neha Ojha <nojha@redhat.com>
2020-03-08 22:05:52 -05:00
Sage Weil
c0524e31c2 mgr/cephadm: apply: fill in default placement if none is provided
Most stateless daemons get 2x (so there is a standby).  Monitoring items
get just 1x.

By default we do 5 monitors, which will gracefully degrade to one per host
if the cluster has <5 hosts.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 21:19:52 -05:00
Chunsong Feng
d79efbabb8 os/bluestore/spdk: Fix the overflow error of parsing spdk coremask
coremask supports up to 256 bits in DPDK19.05, but the use of stoll in
NVMEManager::try_get limits the maximum use to 64 bits. Parse coremask by
hex character from low to high.

Fixes: https://tracker.ceph.com/issues/43044
Signed-off-by: Hu Ye <yehu5@huawei.com>
Signed-off-by: Chunsong Feng <fengchunsong@huawei.com>
Signed-off-by: luo rixin <luorixin@huawei.com>
2020-03-09 09:43:41 +08:00
Sage Weil
ab24887736 Merge PR #33804 into master
* refs/pull/33804/head:
	cephadm: ls: warn if daemon type (version) is not supported
	cephadm: report grafana version
	cephadm: report prometheus, node-exporter, alertmanager versions
	cephadm: use None (not '<no value>') for monitoring daemon version

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-08 19:57:06 -05:00
Sage Weil
f4ff4f96ec Merge PR #33792 into master
* refs/pull/33792/head:
	doc/cephadm: fix formatting for osd section
	doc/cephadm: update 'adding mons' section to suggest/prefer 'apply'
	doc/cephadm: fix formatting, typos
	mgr/cephadm: implement apply_mon
	mgr/cephadm: allow mon creation without explicit ip or addr
	mgr/cephadm: allow _apply_service to delete mon daemon's data
	mgr/cephadm: remove mon from monmap before removing mon
	mgr/cephadm: do not remove mon if it breaks quorum

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-08 17:29:00 -05:00
Sage Weil
4ba3e5d3b0 cephadm: ls: warn if daemon type (version) is not supported
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 17:24:27 -05:00
Sage Weil
02f2ddf3dc cephadm: report grafana version
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 17:23:24 -05:00
Sage Weil
6b0463cae5 Merge PR #33802 into master
* refs/pull/33802/head:
	mgr/cephadm: sanity check upgrade version
	mgr/cephadm: only need to invalidate once here
	mgr/cephadm: upgrade requires root mode for now

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-08 16:49:38 -05:00
Sage Weil
9fcad77bb5 Merge PR #33800 into master
* refs/pull/33800/head:
	mgr/cephadm: fix prom config generation when hosts have no labels or addrs

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-08 16:38:28 -05:00
Sage Weil
6d5c758117 Merge PR #33795 into master
* refs/pull/33795/head:
	mgr/orch: collapse 'SPEC' and 'PLACEMENT' columns in 'orch ls'

Reviewed-by: Michael Fritch <mfritch@suse.com>
2020-03-08 16:38:15 -05:00
Ramana Raja
746a2a9180
Merge pull request #33788 from ajarr/wip-44438
test_volumes: fix _verify_clone_attrs call

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2020-03-08 23:06:50 +05:30
Sage Weil
0bb29996ae mgr/cephadm: make placement truly optional (default to count=1)
If no placement information is provided at all, assume 1 daemon over any
host.

This could perhaps be improved with a default placement that varies by
daemon type...

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 12:05:47 -05:00
Sage Weil
f61f8e4d79 mgr/cephadm: allow count == 0
Scale a service down to 0 without removing the spec.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 12:04:22 -05:00
Sage Weil
387813ab5f mgr/cephadm: remove magic labels
Remove the magic label behavior.  It makes the code confusing, it
makes the overall behavior hard to explain, and it makes the PlacementSpec
meaning different than what Rook is doing.

Instead, if you want mons on hosts with label 'mon', then say 'label:mon'.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-08 12:00:45 -05:00
Yuval Lifshitz
e66b911299
Merge pull request #33686 from yuvalif/fix_data_corruption_in_cls_queue_head
cls/queue: fix data corruption in urgent data
2020-03-08 13:17:02 +02:00
Sage Weil
5bd44d4338 mgr/cephadm: fix prom config generation when hosts have no labels or addrs
The inventory for a host might be {}, which evaluates as false.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 21:45:29 -06:00
Sage Weil
0360bea127 Merge PR #33742 into master
* refs/pull/33742/head:
	msg/async: s/nowait/always_async/ in EventCenter::submit_to().
	msg/async: perform recv reset immediately if called inside EC.

Reviewed-by: Sage Weil <sage@redhat.com>
2020-03-07 20:18:23 -06:00
Sage Weil
47d7c75731 cephadm: report prometheus, node-exporter, alertmanager versions
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 16:49:38 -06:00
Sage Weil
6ef96b4881 cephadm: use None (not '<no value>') for monitoring daemon version
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 16:34:08 -06:00
Sage Weil
b6084c333d qa/suites/rados/cephadm/upgrade: new start point
The starting cephadm needs to look for default ceph.conf etc in /etc/ceph
for cephadm.py to be happy.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 15:19:07 -06:00
Sage Weil
96220c0c05 qa/tasks/cephadm: put bootstrap config etc directly in /etc/ceph
This puts the conf and keyring in /etc/ceph earlier rather than later,
making them useful for debugging a live system *during* bootstrap.  It's
also less code.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 15:18:45 -06:00
Sage Weil
90308de33a cephadm: shell: default to config and keyring in /etc/ceph, if present
This just makes things painless for humans: they can usually run
'cephadm shell' and have a working environment.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 15:18:45 -06:00
Sage Weil
b38771f45f Merge PR #33706 into master
* refs/pull/33706/head:
	qa/suites/rados/cephadm/upgrade: adjust starting version
	mgr/orch: from_strings -> from_string; do not accept a list
	mgr/volumes: pass placement as string, not list
	qa/tasks/mgr/test_orchestrator_cli: adjust placement args
	qa/tasks/cephadm: pass apply placement as a single arg
	mgr/orch: PlacementSpec: allow 'count:123'
	mgr/orch: PlacementSpec: may pretty_str() match input
	mgr/orch: take single placement argument
	mgr/orch: PlacementSpec.from_strings: take a string *or* a list

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-07 13:45:16 -06:00
Kefu Chai
cb12759b81
Merge pull request #33625 from sebastian-philipp/python-common-drive-groups-and
python-common: Make Drive Group filter by AND, instead of OR

Reviewed-by: Joshua Schmid <jschmid@suse.de>
2020-03-08 01:47:42 +08:00
Sage Weil
82fa8f261a doc/cephadm: fix formatting for osd section
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
136c49d9b8 doc/cephadm: update 'adding mons' section to suggest/prefer 'apply'
It's nicer for users to specify the cluster/mon subnet once and let
cephadm scale mons.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
e0161132bc doc/cephadm: fix formatting, typos
No need for [monitor 1] when accessing the CLI--this can happy from
any node or container that has a working CLI.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
e025445232 mgr/cephadm: implement apply_mon
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
6b1d6b3cd4 mgr/cephadm: allow mon creation without explicit ip or addr
Allow mons to be created if the public_network option is defined in the
config database.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
f0dcf03d5e mgr/cephadm: allow _apply_service to delete mon daemon's data
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
d78ae6c04d mgr/cephadm: remove mon from monmap before removing mon
Check for force flag early so we don't update the monmap if the daemon
remove is going to fail anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
b6b2d45dea mgr/cephadm: do not remove mon if it breaks quorum
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 11:22:55 -06:00
Sage Weil
26de97d093 mgr/cephadm: sanity check upgrade version
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 10:06:40 -06:00
Sage Weil
1ab85b7fde mgr/cephadm: only need to invalidate once here
Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 09:55:24 -06:00
Sage Weil
a09e01fd21 mgr/cephadm: upgrade requires root mode for now
See https://tracker.ceph.com/issues/44429

Signed-off-by: Sage Weil <sage@redhat.com>
2020-03-07 09:55:24 -06:00
Sage Weil
053fd8f816 Merge PR #33794 into master
* refs/pull/33794/head:
	pybind/mgr/mgr_util: fix pretty time delta

Reviewed-by: Kefu Chai <kchai@redhat.com>
2020-03-07 09:21:32 -06:00