Commit Graph

93607 Commits

Author SHA1 Message Date
Yingxin
e662b7865f crimson/net: remove the unecessary then
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2019-01-04 13:48:54 +08:00
Kefu Chai
41d266b9b9
Merge pull request #25770 from votdev/fix_telemetry_issues
mgr/telemetry: Fix various issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-04 13:23:47 +08:00
Kefu Chai
8c650f5b35
Merge pull request #25783 from neha-ojha/wip-25672
common/blkdev.h: use std::string

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Rick Chen <rick.chen@prophetstor.com>
2019-01-04 13:18:35 +08:00
IvanGuan
0e137de26e client: fix fuse client hang because its pipe to mds is not ok
If fuse client session had been killed by mds and the mds daemon restart
or hot-standby switch happens right away but the client did not receive
any message from monitor due to network or other whatever reason untill
the mds become active again.Thus cause client didn't do closed_mds_session
lead the seession still is STATE_OPEN but client can't send any message to
mds because its pipe is not ok.So we should close the stale session so that
it can be reopened again.

Fixes: http://tracker.ceph.com/issues/36079
Signed-off-by: Guan yunfei <yunfei.guan@xtaotech.com>
2019-01-04 12:22:27 +08:00
Kefu Chai
1b17bf1ca8
Merge pull request #25758 from xiexingguo/wip-async-prefetch
msg/async: improve read-prefetch logic

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-04 11:16:22 +08:00
Kefu Chai
e506210477
Merge pull request #25760 from cxytt/bug-fix
mon: shutdown messenger early to avoid accessing deleted logger

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-04 11:13:28 +08:00
Neha Ojha
e03e65f5e2 common/blkdev.h: use std::string
Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-01-03 18:57:28 -08:00
Sage Weil
9987923eef Merge PR #24159 into master
* refs/pull/24159/head:
	mon/PGMap: show pg state age instead of stamp

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-01-03 20:38:30 -06:00
Sage Weil
8917a153f4 Merge PR #25623 into master
* refs/pull/25623/head:
	common/ceph_time: 'mo' for month
	common/options: use new parse_timespan
	common/ceph_time: add parse_timespan
	common/config_proxy: pass err_ss through on set_val
	common/ceph_time: add exact_timespan_str

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 20:38:14 -06:00
Sage Weil
cb4d8a3158 Merge PR #25756 into master
* refs/pull/25756/head:
	vstart.sh: force setting dashboard options before first mgr starts
	mon/ConfigMonitor: add --force flag to 'config set'

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 20:37:54 -06:00
Sage Weil
fbddc56abd Merge PR #25763 into master
* refs/pull/25763/head:
	ceph_argparse: make command ceph acceph SIGINT.

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 20:37:38 -06:00
Sage Weil
8c46f7b51f Merge PR #25672 into master
* refs/pull/25672/head:
	osd: OSD device smart data include additional nvme data
	common/blkdev: add missing get_device_id impl
	os/bluestore,filestore: use get_raw_devices
	osd: update metadata and smart code to report get_device_id errors
	mon: update metadata and smart commands to use get_raw_devices
	common/blkdev: add get_raw_devices helper
	common/blkdev: fix BlkDev::get_devid when we got a devname, not fd
	common/blkdev: return optional error string from get_device_id
	common/blkdev: refactor to add block_device_get_metrics returning json

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-01-03 20:11:11 -06:00
Patrick Donnelly
33a5f4b723
Merge PR #25593 into master
* refs/pull/25593/head:
	mds: create heartbeat grace config option

Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-01-03 17:40:53 -08:00
xie xingguo
b1d3ca5e78 mon/OSDMonitor: do not populate void pg_temp into nextmap
Due to commit ea723fb, pg_temp with clean acting set are added to inc map.
The original intent was to clear out pg_temps during priming, but as
written it would set a new_pg_temp item clearing the pg_temp even if one
didn't already exist.  Adding the up != acting condition in there makes us
only take that path if there is an existing pg_temp entry to remove.

Fixes: https://tracker.ceph.com/issues/37784
Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
2019-01-04 08:39:01 +08:00
hsiang41
2da890117c osd: OSD device smart data include additional nvme data
Add nvme addition data into the deveh health data. That use nvme tool
and command syntax "nvme <vendor> smart-log-add <dev> -json". The nvme
json output append in the dev smart "nvme_smart_health_information_add_log".

- made run_smartctl static/private
- changed get_metrics to take a const string, not c str

Signed-off-by: Rick Chen <rick.chen@prophetstor.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Sage Weil
9f3dff2012 common/blkdev: add missing get_device_id impl
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Sage Weil
b23fa4ca7a os/bluestore,filestore: use get_raw_devices
There is a minor change here: before the devices list would include
e.g. 'sda2' and 'sda', and now it will only include 'sda'.

Fixes: http://tracker.ceph.com/issues/37542
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Sage Weil
f879f88a27 osd: update metadata and smart code to report get_device_id errors
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Sage Weil
cfcb7bc1e8 mon: update metadata and smart commands to use get_raw_devices
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Sage Weil
2555233efc common/blkdev: add get_raw_devices helper
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 18:10:26 -06:00
Neha Ojha
a74129d26d qa/suites/upgrade/mimic-x: fix rhel runs
The following fragment was required for rhel on ovh
overrides:
    ansible.cephlab:
      skip_tags: entitlements,packages,repos

Since, this suite runs on smithi in our nightlies, we should not need
this.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-01-03 13:39:30 -08:00
Alfredo Deza
8cb6de178e
Merge pull request #25674 from alfredodeza/wip-rm37442
ceph-volume normalize comma to dot for string to int conversions 

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2019-01-03 13:44:06 -05:00
Patrick Donnelly
ee7d253494
Merge PR #24635 into master
* refs/pull/24635/head:
	test: add scrub control command tests
	mds: scrub abort/pause/resume/status control commands
	test: switch using "scrub start" tell interface to initiate scrub
	mds: introduce "scrub start" tell interface to initiate scrub
	mds: dump scrub formatted output when context completion
	mds: generate random scrub tag when empty
	mds: introduce C_ExecAndReply context completion class
	mds: use CInode::scrub_is_in_progress() wherever required

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-01-03 10:15:31 -08:00
Sage Weil
e708b729cf msg/msg_types: encode entity_addr_t TYPE_ANY as TYPE_LEGACY for pre-nautilus
This is primarily for OSDMap's blacklist, which, starting with nautilus,
is populated by ANY addrs instead of LEGACY addrs.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
c378bd830a client: make blacklist detection handle TYPE_ANY entries
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
c4c511fd44 mon/OSDMonitor: maintain compat output for 'blacklist ls'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
e09ca7b80b client: maintain compat for {inst,addr}_str in status dump
Add 'addr' field too.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
0d4c4db3c0 qa/tasks/ceph_manager: compare osd flush seq #'s as ints
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
8a3d90199d qa/suites/fs: make use of simple.yaml where appropriate
There's more needed than just ms_type=simple now.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
d518eb6cac qa/msgr: move msgr factet into generic re-usable dir
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:38 -06:00
Sage Weil
3b43e2a7b0 crimson: fix monmap build for seastar
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
b4e292ca9a doc/start/ceph.conf: trim the sample ceph.conf file
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
cdcb05765f doc/rados/operations: only describe --public-{addr,network} method for adding mons
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
ad39c086a0 PendingReleaseNotes: deprecate 'mon addr'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
8e2fcae16e doc: fix some 'mon addr' references
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
1675cd5096 doc/rados/configuration: fix some 'mon addr' references
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
369dadea44 doc/rados/configuration/network-config-ref: revise network docs somewhat
These still could use a larger rewrite, but this is a bit better.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
bef7c62fe8 doc/rados/configuration/network-config-ref: remove totally obsolete section
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
16980bd12f qa/suites/rados: replace mon_seesaw.py task with a small bash script
The teuthology test did not like the change to remove 'mon addr' from
ceph.conf.  The standalone script is easier to test.

Note that it avoids mon names 'a', 'b', 'c' since the MonMap::build_initial
uses those.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
f857c70c9c qa/suites/fs/upgrade: don't bind to v2 addrs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
caa3a82ada qa/tasks/mon_thrash: avoid 'mon addr' in mon section
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
f3ddb1c9b8 mon/MonClient: disable ms_bind_msgr2 if NAUTILUS feature not set
Do not try to bind to v2 addresses until all of the mons will know what
we are doing and will be able to advertise those addresses.

This avoids the possibility of corner cases where we bind to one thing
but advertise something different via the various cluster maps.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
ae8b0cd62a osd/OSDMap: maintain compat addr fields
Fixes b47d9135d5 and
9fb1e521c7.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
1aceb2d04b msg/msg_types: add get_legacy_str()
Render a pre-nautilus entity_addr_t string.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
51ede31d55 mds/MDSMap.h: maintain compat addr field
This avoids breaking anyone looking at a pre-nautilus dump.
Fixes ea1481d08d.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
ac82a0b3e8 mon/MgrMap: maintain compat active_addr field
This avoids breaking anyone looking at a pre-nautilus dump.  Fixes
7f787704cd.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
5cba1fb874 mon/MonClient: reconnect to mon if it's addrvec appears to have changed
This primarily kicks in if we connect to a mon's v1 address during the
initial probe and then discover that it has v2+v1.  It's a catch-all,
though, so that we'll reconnect to the (er, a) mon in any case where we
see it's addresses change.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
c4ae3554e1 qa/tasks/ceph.conf.template: increase mon_mgr_mkfs_grace
The grace starts with the monmap creation stamp, and ceph.py does a lot
of work between creating that map and actually starting daemons (e.g.,
preparing all of the osd devices), leading to occasional MGR_DOWN errors.
Double the grace period.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
6f42b656d4 msg/async/ProtocolV2: fill in IP for all peer_addrs
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00
Sage Weil
283c8d3d34 msg/async: print all addrs on debug lines
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 11:17:31 -06:00