Commit Graph

79844 Commits

Author SHA1 Message Date
Matt Benjamin
664ad1a16c Merge pull request #18198 from cbodley/wip-21735
rgw: fix error handling in ListBucketIndexesCR
2017-10-26 13:41:19 -04:00
John Spray
1fbd3b7b9f Merge pull request #18511 from smithfarm/wip-rpm-recommend-influxdb
build/ops: rpm: recommend python-influxdb with ceph-mgr

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
2017-10-26 17:23:34 +02:00
John Spray
15e8b1904c Merge pull request #18182 from nrdmn/dashboard
mgr/dashboard: improve error handling

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-26 17:17:37 +02:00
Sage Weil
c337b8739d Merge pull request #18533 from tchaikov/wip-qa-cephtool
qa: do not "ceph fs get cephfs" w/o a cephfs fs

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2017-10-26 09:19:11 -05:00
Mykola Golub
fb48989eeb Merge pull request #18545 from batrick/pr18393-revert
Revert "ceph_context: re-expand admin_socket metavariables in child process"

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-26 10:28:58 +03:00
Sage Weil
028e15d62f Merge pull request #18496 from liewegas/wip-pgmap
build: remove PGMap.cc from libcommon

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 21:53:07 -05:00
Sage Weil
f1afb1684c Merge pull request #18527 from xiexingguo/wip-hunt-scrub-mismatch
osd/PrimaryLogPG: several oi.extents fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-25 21:49:45 -05:00
Sage Weil
b3bb61ede6 Merge pull request #18531 from majianpeng/msg-async
msg/async misc cleanup 

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-10-25 21:49:27 -05:00
Jianpeng Ma
e564518350 msg/async: record correctly l_msgr_send_bytes if "rc == 0".
If rc == 0, it mean all data of outcoming_bl whether old or new data.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-26 18:08:54 +08:00
Patrick Donnelly
2bba5d8e0f
Merge PR #18192 into master
* refs/pull/18192/head:
	qa/cephfs: test ec data pool
	qa/suites/fs/basic_functional/clusters: more osds

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-25 17:05:38 -07:00
Patrick Donnelly
1e571befcf
Revert "ceph_context: re-expand admin_socket metavariables in child process"
This commit introduces a regression where the admin socket specified in
ceph.conf overrides command line arguments or environment variables.

This reverts commit 1630f4bbef.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-25 13:29:42 -07:00
Sage Weil
92141dc122 Merge pull request #18485 from liewegas/wip-remote-res-preemption
osd: fix recovery reservation bugs, and implement remote reservation preemption

Reviewed-by: David Zafman <dzafman@redhat.com>
2017-10-25 14:47:44 -05:00
Jianpeng Ma
1a6817a507 msg/async: updating l_msgr_running_send_time if write_message failed.
Also for the most time write_message return zero. So avoid checking
"r < 0 or r > 0" every time, it should firstly check "r == 0".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-26 00:50:29 +08:00
David Zafman
e31075fd1d Merge pull request #18528 from tchaikov/wip-osd-misplaced
osd/PG: fix calc of misplaced objects

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-25 09:36:04 -07:00
Jianpeng Ma
3350b35045 msg/async: only system can accept more data, continue send.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-26 00:34:45 +08:00
Kefu Chai
718496bf72 Merge pull request #18523 from tchaikov/wip-vstart-quoted
vstart.sh: should quote the parameters to get them quoted

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-26 00:18:40 +08:00
Jianpeng Ma
2371b149e0 msg/async: remove redundant condition.
From the code, if out_q[r].is_empty, it already remove.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-26 00:16:45 +08:00
Jianpeng Ma
8960e42ae0 msg/async: batch handle out_seq.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-26 00:03:36 +08:00
Patrick Donnelly
c9c58c580d
Merge PR #18062 into master
* refs/pull/18062/head:
	client: put MetaSession map container
	client: simplify release context ref mgmt

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-10-25 06:51:45 -07:00
Matt Benjamin
9f6d3cf3f4 Merge pull request #18381 from cbodley/wip-21832
Revert "radosgw: fix awsv4 header line sort order."
2017-10-25 09:37:06 -04:00
Matt Benjamin
d1fdc2316c Merge pull request #18369 from baixueyu/refcount_bug
rgw: source data in 'default.rgw.buckets.data' may not be deleted after inter-bucket copy
2017-10-25 08:58:07 -04:00
Kefu Chai
410594aed0 Merge pull request #16605 from theanalyst/tools/release-notes-pyfixes
script: ceph-release-notes: minor fixes for split_component

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 19:24:53 +08:00
Alfredo Deza
02e1263f06 Merge pull request #18482 from liewegas/wip-luminous-note-fix
doc/release-notes: add jewel->kraken notes

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-10-25 07:24:13 -04:00
Kefu Chai
4b6406b086 Merge pull request #18481 from xiexingguo/wip-choose-acting
osd/PG: miscellaneous choose acting changes and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-25 19:21:42 +08:00
Kefu Chai
5fc34435dd Merge pull request #18473 from yuyuyu101/wip-objecter-mono
osdc/Objecter: using coarse_mono instead

Reviewed-by: Adam Emerson <aemerson@redhat.com>
2017-10-25 19:20:59 +08:00
Kefu Chai
68ef19bc3c Merge pull request #18471 from yuyuyu101/wip-omap-stat
osd/ReplicatedPG: add omap write bytes to delta_stats

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-25 19:20:35 +08:00
Kefu Chai
3ceab4ca43 Merge pull request #16332 from badone/wip-warn-about-objects-with-too-many-omap-entries
osd: Warn about objects with too many omap entries

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 19:20:00 +08:00
Kefu Chai
022f08362e Merge pull request #18506 from majianpeng/osd-scrub
osd/PrimaryLogPG: add condition "is_chunky_scrub_active" to check object in chunky_scrub

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-25 19:18:50 +08:00
Kefu Chai
0f1e97238c qa: do not "ceph fs get cephfs" w/o a cephfs fs
introduced by 183646c

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-25 19:12:39 +08:00
Abhishek Lekshmanan
35876bb79d script: ceph-release-notes: minor fixes for split_component
make labels a set as intersection would fail otherwise, also sort the
results of prefixes before creating the title

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-10-25 10:43:07 +02:00
Nathan Cutler
ca820fff95 build/ops: rpm: recommend python-influxdb with ceph-mgr
The influxdb module won't run if python-influxdb is not present (but it will be
graceful about not running). That means python-influxdb is a dependency of
that module, not mgr itself. However, we are not (yet) packaging the modules
separately. (When we do, this could become a Requires: of the module.)

RPM itself does not support "Recommends", and ignores this line. Higher-level
tools may or may not support it, so put this line in a SUSE-only conditional
since we know that zypper supports it.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
2017-10-25 09:42:47 +02:00
Mykola Golub
849c21582b Merge pull request #18517 from dillaman/wip-iscsi-docs
doc/rbd: specify additional ESX prerequisites

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-25 10:41:41 +03:00
Kefu Chai
84f74e5cce OSD/PG: fix calc of misplaced objects
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-25 14:29:40 +08:00
Kefu Chai
1fb6277d64 Merge pull request #18466 from zealoussnow/wip-wrong-parameter
OSD: drop unsed parameter passed to check_osdmap_features

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
2017-10-25 13:31:19 +08:00
Kefu Chai
4a87cc7fbb Merge pull request #18425 from ZVampirEM77/wip-options-cleanup
common/options.cc: cleanup readable literals for default sizes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 13:27:52 +08:00
Kefu Chai
e90916dd77 Merge pull request #17894 from chenliuzhong/change-aio-max-nr
ceph.spec.in,debian/rules: change aio-max-nr to 1048576

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 13:25:24 +08:00
Kefu Chai
5277240d87 vstart.sh: should quote the parameters to get them quoted
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-25 10:19:14 +08:00
Brad Hubbard
7e6e87e85c Merge pull request #18505 from badone/wip-unittest-crypto-getentropy-limit
unittest_crypto: Don't exceed limit for getentropy

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-10-25 10:27:38 +10:00
Josh Durgin
df7a694896 Merge pull request #18181 from tchaikov/wip-vstart-quoted-print
vstart.sh: quote command only when necessary

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-24 16:43:38 -07:00
Patrick Donnelly
c58161f25b
Merge PR #17266 into master
* refs/pull/17266/head:
	qa: update test_ceph_argparse to test fs cmds
	qa: use fs rm_data_pool
	qa: fix mdsmap lookup
	qa: remove usage of mds dump
	PendingReleaseNotes: add obsoleted mds commands
	qa: remove use of obsolete mds commands
	ceph_volume_client: remove use of obsolete mds cmd
	doc: update on obsolete mds commands
	cephfs: obsolete deprecated mds commands

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
2017-10-24 16:37:14 -07:00
Josh Durgin
184ca91dbc Merge pull request #17909 from tchaikov/wip-coverity
test/objectstore/test_bluefs: cleanups

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-24 16:34:02 -07:00
Patrick Donnelly
b14a8a4aa1
qa: update test_ceph_argparse to test fs cmds
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-24 15:41:10 -07:00
Sage Weil
f3ad3401a9 Merge pull request #18475 from yuyuyu101/wip-fix-alignment
os/ObjectStore: fix get_data_alignment return -1 causing problem in msg header

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-10-24 15:39:11 -05:00
Yuri Weinstein
64bd835813 Merge pull request #18297 from dzafman/wip-21803
osd/PG: fix objects degraded higher than 100%

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-10-24 13:31:40 -07:00
Yuri Weinstein
e13a8ce8f1 Merge pull request #18479 from wzliao/wip-correct-scrub-cost
osd/OSD.cc: use option 'osd_scrub_cost' instead

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-24 13:30:01 -07:00
Jason Dillaman
61ad73526c doc/rbd: specify additional ESX prerequisites
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-24 15:49:42 -04:00
Patrick Donnelly
6809dbed6b
Merge PR #18109 into master
* refs/pull/18109/head:
	mds: clean up non-existent data pools in MDSMap
	mds: reduce variable scope

Reviewed-by: John Spray <john.spray@redhat.com>
2017-10-24 12:17:25 -07:00
Patrick Donnelly
db5df3c605
Merge PR #18366 into master
* refs/pull/18366/head:
	mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/
	mon: tidy up mds_blacklist_interval

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-24 12:17:19 -07:00
Patrick Donnelly
710cf45e48
Merge PR #18384 into master
* refs/pull/18384/head:
	mds: disable early reply for dir layout and quota related requests
	mds: make mksnap/setlayout wait for unsafe requests on other mds
	mds: don't rdlock locks in replica object while auth mds is recovering
	mds: move ScatterLock::state_flags into SimpleLock

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-24 12:17:14 -07:00
Patrick Donnelly
3e9d8155e9
Merge PR #18393 into master
* refs/pull/18393/head:
	ceph_context: re-expand admin_socket metavariables in child process

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-24 12:17:08 -07:00