Commit Graph

93421 Commits

Author SHA1 Message Date
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
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
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
Matt Benjamin
3dda250cad
Merge pull request #25473 from theanalyst/rgw/version-copy-fix
rgw: fix versioned obj copy generating tags
2019-01-03 10:42:31 -05:00
Sage Weil
2483f3ed3c common/ceph_time: 'mo' for month
Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 09:18:39 -06:00
Kefu Chai
407750d16e
Merge pull request #25761 from tchaikov/wip-qa-health-schema
mgr/dashboard: updated API test to reflect changes in ModuleInfo

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 23:15:45 +08:00
Sage Weil
8cbaac69cf Merge PR #25736 into master
* refs/pull/25736/head:
	common/options: document some osd/rados options
	unittest_osdmap: feed options as defaults
	mon/OSDMonitor: allow osd_pool_default_pgp_num to be 0

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-01-03 09:03:39 -06:00
Kefu Chai
a3e37c2019
Merge pull request #25766 from tchaikov/wip-rgw-readdir-flags
pybind/rgw: pass the flags to callback function

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2019-01-03 23:01:29 +08:00
Kefu Chai
9a92825489
Merge pull request #25635 from rhcs-dashboard/36740-pool-stats-disabled-by-default
mgr/dashboard: pool stats not returned by default

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-01-03 22:45:54 +08:00
Patrick Donnelly
38044113a1
Merge PR #25528 into master
* refs/pull/25528/head:
	mds: log evicted clients to clog/dbg

Reviewed-by: Zheng Yan <zyan@redhat.com>
2019-01-03 06:43:29 -08:00
Casey Bodley
782f25e00f
Merge pull request #24845 from pritha-srivastava/wip-rgw-assume-role-fixes
rgw: Minor fixes to AssumeRole for boto compliance.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2019-01-03 09:24:58 -05:00
Casey Bodley
905f7103a3
Merge pull request #25180 from pritha-srivastava/wip-rgw-user-policy-fixes
rgw: Fixes to permission evaluation related to user policies.

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-01-03 09:22:36 -05:00
Kefu Chai
67e19d1215
Merge pull request #25659 from Linbing/wip-fixup-read-deadlock
os/bluestore: fixup access a destroy cond cause deadlock or undefine behavior

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 22:06:27 +08:00
Sage Weil
50687a2971 Merge PR #25673 into master
* refs/pull/25673/head:
	mon/Monitor: quorum_age in JSON output as int, not string

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 07:23:57 -06:00
Sage Weil
51ee347540 common/options: use new parse_timespan
It's more complete and robust, and lives in ceph_time.h where it probably
belongs.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:19:20 -06:00
Sage Weil
6564664669 common/ceph_time: add parse_timespan
Make it understand units like 'hours', 'minute', 'm', 'w', etc.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:19:20 -06:00
Sage Weil
b8fceaf6f9 vstart.sh: force setting dashboard options before first mgr starts
These options are unknown before the mgr first starts and registers them.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:10:12 -06:00
Sage Weil
2f5a1becb8 mon/ConfigMonitor: add --force flag to 'config set'
Add a force flag to override option and/or value checks.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-01-03 07:10:12 -06:00
Kefu Chai
486c6a48d9 qa/mgr: add "module_options" to module_info_schema
it was introduced in 280c23ba. so update the schema test accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-01-03 20:44:46 +08:00
Kefu Chai
0c643f8cea pybind/rgw: pass the flags to callback function
before this change, the `flags` parameter passed to `LibRGWFS.readdir()`
will be dropped on the floor and ignored.
after this change, it will be passed to the specified callback function.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-01-03 19:00:28 +08:00
Kefu Chai
d78850bb56
Merge pull request #25580 from cyx1231st/wip-crimson-msgr-logging
crimson/net: fix addresses during banner exchange

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 17:09:09 +08:00
Yingxin
a7796ae723 crimson/net: fix address learning during banner exchange
* Don't store my_addr in `Connection`, because my_addr can be learned
  and thus changed.
* Support nonce in SocketMessenger.
* Always set nonce when set_myaddr().
* Add learned_addr() for SocketMessenger.
* Add side_t and socket_port to show the real connecting
  ports of the SocketConnection.
* Fix bannder exchange logic for addresses, including nonce, type, ip,
  port, socket_port for my_addr and peer_addr.
* Add more detailed logging prefixes for SocketConnection.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2019-01-03 15:50:31 +08:00
Yingxin
25ae94fda9 crimson/net: add logic_name to indicate the msgr role for debugging
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2019-01-03 15:46:32 +08:00
Yingxin
7a2f4bf925 crimson/net: add basic loggings for SocketConnection
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2019-01-03 15:41:44 +08:00
Jianpeng Ma
8c85553357 ceph_argparse: make command ceph acceph SIGINT.
If no --connect-timeout point and there is no ceph.conf, the command
'ceph -s' can't stop by ctrl+c.
This introduced by commit 4d8fc26c8
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2019-01-03 14:34:43 +08:00
Kefu Chai
13c8041111
Merge pull request #25757 from gregsfortytwo/wip-doc-put-warning
doc: warn about how 'rados put' works in the manpage

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 14:21:00 +08:00
Kefu Chai
3da70776d5
Merge pull request #25706 from joscollin/wip-build-doc-librados
librados: fix admin/build-doc warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-01-03 14:18:42 +08:00
Kefu Chai
4b392e1afe
Merge pull request #25734 from tchaikov/wip-mgr-default-options
mgr: define option defaults for MgrStandbyModule as well

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 14:12:54 +08:00
Kefu Chai
d1f15e5ee8
Merge pull request #25735 from wjwithagen/wjw-fix-WRITE_LIFE
os/bluestore: Only use WRITE_LIFE_ when available

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 14:12:02 +08:00
Kefu Chai
00865b89de
Merge pull request #25746 from tchaikov/wip-pg-autoscale-mode
osd/OSDMap: set pg_autoscale_mode with setting from conf

Reviewed-by: Sage Weil <sage@redhat.com>
2019-01-03 14:10:15 +08:00
Kefu Chai
705d29b422
Merge pull request #25588 from tchaikov/wip-auth-silence-gcc-warning
cls/rbd: init local var with known value

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-By: Casey Bodley <cbodley@redhat.com>
2019-01-03 14:09:20 +08:00
Kefu Chai
b0a83097eb qa/mgr: extract module_info_schema and reused it
both standby mgr and active mgr have this sub-schema. so extract it out
and reuse it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-01-03 11:01:04 +08:00
Kefu Chai
75c2d63c31 cls/rbd: init local var with known value
DirectoryState does not have an "invalid" enum so far, since it's
defined using `enum class`, init a value of this type with a known value
could be a better choice even it is always initialized before being read.

this silences the GCC warning of:

src/cls/rbd/cls_rbd.cc:3147:3: warning: ‘on_disk_directory_state’ may be
used uninitialized in this function [-Wmaybe-uninitialized]
   if (directory_state != on_disk_directory_state) {
   ^~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-01-03 10:19:02 +08:00
Kefu Chai
0e1cdcd949
Merge pull request #25687 from tchaikov/wip-pg-stats
osd/PrimaryLogPG: do not count failed read in delta_stats

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-01-03 09:41:46 +08:00
Greg Farnum
71a8605762 doc: warn about how 'rados put' works in the manpage
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2019-01-02 15:00:25 -08:00
Gregory Farnum
8e3da9b2d8
Merge pull request #25705 from joscollin/wip-doc-common
doc: Fix Create a Cluster url in Running Multiple Clusters

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-01-02 14:21:28 -08:00
J. Eric Ivancich
090b52ec25
Merge pull request #25450 from ivancich/wip-rgw-category-cleanup
rgw: clean-up -- use enum class for stats category

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2019-01-02 17:00:28 -05:00
J. Eric Ivancich
f600e08605 rgw: clean-up -- remove unnessary "struct"s
In C++ "struct" is unnecessary when referencing a defined
struct. Clean up all uses in src/cls/rgw source files.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2019-01-02 15:45:19 -05:00
J. Eric Ivancich
c52636c84f rgw: clean-up use enum class for stats category
The stats entries for rgw buckets has a category, which used a
combination of uint8_t and enum RGWObjClass. Clean this up by
converting RGWObjClass to an enum class and using that
throughout. This provides type safety and better code clarity. Also,
add some source code documentation.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2019-01-02 15:45:19 -05:00
Alfredo Deza
91bc3a1479 ceph-volume tests.util ensure ints and strings with commas can be converted to ints
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2019-01-02 14:19:00 -05:00