Kefu Chai
d4254db9c9
Merge pull request #20223 from Yan-waller/wip-walle-180124cephosd
...
osd: use existing osd_required variable for messenger policy
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:31:52 +08:00
Kefu Chai
6655648d74
Merge pull request #20201 from majianpeng/mosdrepop-encode-log
...
osd: avoid encoding the same log entries repeatedly for different peers
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:29:34 +08:00
Casey Bodley
19fb77e217
Merge pull request #20016 from cbodley/wip-18885
...
rgw: log unlink_instance mtime as object's mtime
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-02-05 16:44:37 -05:00
Matt Benjamin
80a58a477d
Merge pull request #20145 from linuxbox2/rgwf-deref-readdir-off
...
rgw_file: avoid evaluating nullptr for readdir offset
2018-02-05 14:22:48 -05:00
Casey Bodley
41229b47ed
Merge pull request #20188 from cbodley/wip-rgw-frontend-multimap
...
rgw: beast frontend can listen on multiple endpoints
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-02-05 13:52:04 -05:00
Casey Bodley
705e505049
Merge pull request #20013 from cbodley/wip-rgw-auth-skew
...
rgw: share time skew check between v2 and v4 auth
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-02-05 13:51:43 -05:00
Casey Bodley
ae0557255f
Merge pull request #20017 from cbodley/wip-22248
...
rgw: unlink deleted bucket from bucket's owner
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-02-05 13:50:48 -05:00
Casey Bodley
720a759401
Merge pull request #20120 from cbodley/wip-22797
...
rgw: fix for empty query string in beast frontend
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-02-05 13:49:13 -05:00
Orit Wasserman
19b430fe5b
Merge pull request #20038 from oritwas/wip-rgw-22742
...
rgw: bucket resharding should not update bucket ACL or user stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-05 20:02:06 +02:00
Jason Dillaman
244617c645
Merge pull request #20295 from trociny/wip-test_deep_copy_clone
...
test/pybind/rbd: skip test_deep_copy_clone if layering not enabled
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-05 12:26:44 -05:00
Casey Bodley
58755200cf
Merge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes
...
rgw: Reinstating error codes mapping for Roles.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-02-05 10:03:54 -05:00
Kefu Chai
00a7323694
Merge pull request #20316 from smithfarm/wip-doc-log
...
doc: log-and-debug: fix default value of "log max recent"
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-05 22:53:34 +08:00
Nathan Cutler
2855c30cdf
doc: log-and-debug: fix default value of "log max recent"
...
Doc says 1000000, but the real figure is two orders of magnitude less:
Option("log_max_recent", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(500)
.set_daemon_default(10000)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-02-05 13:53:05 +01:00
John Spray
66c7832c33
Merge pull request #20229 from zhsj/fix-dashboard-prefix
...
pybind/mgr/dashboard: fix duplicated slash in html href
Reviewed-by: John Spray <john.spray@redhat.com>
2018-02-05 13:07:33 +01:00
Pritha Srivastava
d60766103d
rgw: Reinstating error codes mapping for Roles.
...
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
2018-02-05 15:20:10 +05:30
Kefu Chai
27473626f7
Merge pull request #20114 from cethikdata/ceph-disk-lock
...
ceph-disk: reduce the scope of activate_lock.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-05 14:10:49 +08:00
Kefu Chai
164ed9399e
Merge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change
...
osd,dmclock: fix dmclock test simulator change
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-05 11:05:35 +08:00
Kefu Chai
b813b13306
Merge pull request #20258 from tchaikov/wip-balancer-cleanup
...
mgr/balancer: replace magic value of -1 for DEFAULT_CHOOSE_ARGS
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-05 10:01:11 +08:00
Kefu Chai
155c8c6ee1
Merge pull request #20230 from ifed01/wip-ifed-store-test-improve
...
test/store_test: update Many4KWritesTest* test cases to finalize with…
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-05 09:59:39 +08:00
Kefu Chai
72997da4a1
Merge pull request #20221 from fangyuxiangGL/max
...
osd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-05 09:57:59 +08:00
Kefu Chai
764814cc81
Merge pull request #20217 from rzarzynski/wip-osd-legacy-conf-for-perf
...
osd: avoid the config's get_val() overhead on the read path.
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-05 09:54:55 +08:00
Kefu Chai
72bfe3ae40
Merge pull request #20169 from liewegas/wip-22668-revert
...
os/bluestore: disable on_applied sync_complete
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-02-05 09:41:00 +08:00
Yan Jun
3887c47003
osd: use defined osd_required features for messenger policy
...
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2018-02-04 23:16:58 +08:00
Orit Wasserman
1223baf76b
rgw: bucket resharding should not update bucket ACL or user stats
...
bucket link op resets bucket ACL using rgw_link_bucket instead
Fixes: http://tracker.ceph.com/issues/22124
Fixes: http://tracker.ceph.com/issues/22742
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2018-02-04 16:02:58 +02:00
Shengjing Zhu
24fe1cae63
pybind/mgr/dashboard: fix duplicated slash in html href
...
The url_prefix val in html templates is expected not containing '/'
in the end. Otherwise the href will be rendered as '//static/', which
causes browser treating it as http://static/ .
Fixes: http://tracker.ceph.com/issues/22851
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
2018-02-04 18:47:44 +08:00
Mykola Golub
355e8796f7
test/pybind/rbd: skip test_deep_copy_clone if layering not enabled
...
(otherwise it will fail on protect snap)
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-02-04 10:13:18 +02:00
Xie Xingguo
42c73a87d6
Merge pull request #20184 from shun-s/wip-add-osdmap-epoch-show
...
osd/OSDMap: add osdmap epoch info when printing info summary
Reviewed-by: John Spray <john.spray@redhat.com>
2018-02-04 10:08:06 +08:00
Xie Xingguo
18bf4c5551
Merge pull request #20225 from xiexingguo/wip-balancer-pool-options
...
mgr/balancer: more pool-specific enhancements
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-04 10:06:16 +08:00
Xie Xingguo
6b58809ecf
Merge pull request #20224 from xiexingguo/wip-still-mgr-fixes
...
pybind/mgr/balancer: remove optimization plan properly
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-04 10:05:34 +08:00
Xie Xingguo
940188797a
Merge pull request #20278 from xiexingguo/wip-null-ws-check
...
pybind/mgr/balancer: fix sanity check against empty weight-set
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-04 10:03:19 +08:00
Patrick Donnelly
8711d79133
Merge PR #20261 into master
...
* refs/pull/20261/head:
doc: Fix path in ceph-fuse.rst
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-02-03 12:23:30 -08:00
Kefu Chai
acf0b68c22
mgr/mgr_module: do not offer empty default value for choose_args
...
as it should be always available. this also silence a pep8 warning.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-04 01:15:56 +08:00
Kefu Chai
a4d79b5789
mgr/balancer: introduce CRUSHMap.DEFAULT_CHOOSE_ARGS and use it
...
avoid using '-1' as a magic variable.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-04 01:15:56 +08:00
xie xingguo
f10696e7e1
pybind/mgr/balancer: fix sanity check against empty weight-set
...
There are paths get_compat_weight_set_weights() will return a
empty dict, not None.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-03 22:05:02 +08:00
J. Eric Ivancich
18b963cf03
Revert change from commit 8c5fea68cb
...
that introduced a compilation error that was not noticed since the
dmclock support/testing simulators are not built by ceph.
Also, changes below the src/dmclock tree should be made in the dmclock
library and then pulled into ceph.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2018-02-02 14:56:36 -05:00
Jason Dillaman
3ac57a7eb7
Merge pull request #19711 from trociny/wip-20762
...
rbd: unified way to map images using different drivers
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2018-02-02 13:56:13 -05:00
Matt Benjamin
dcdb7aba28
Merge pull request #19902 from linuxbox2/wip-rgw-mploc
...
rgw: return valid Location element, CompleteMultipartUpload
2018-02-02 11:37:01 -05:00
Jianpeng Ma
46c5eaf69e
osd/ReplicatedBackend: only do once encode log_entries for multi MOSDRepOp
...
Encode log_entries is the same work for multi MOSDRepOp and encode is
heavy load.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2018-02-03 00:35:15 +08:00
Jason Dillaman
deeeaebfa4
Merge pull request #20199 from Songweibin/wip-group-cleanup
...
rbd: group misc cleanup and update rbd man page
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-02 10:25:50 -05:00
Matt Benjamin
6a09ad15c6
Merge pull request #20002 from malc0lm/fix-copypart
...
rgw: fix 'copy part' without 'x-amz-copy-source-range'
2018-02-02 09:35:14 -05:00
Jason Dillaman
f0850a99a6
Merge pull request #20222 from trociny/wip-deep-copy-default-format
...
librbd: by default use new format for deep copy destination
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-02 08:32:52 -05:00
Jason Dillaman
bba63db1b4
Merge pull request #20170 from trociny/wip-22803
...
qa/workunits/rbd: remove "trash purge --threshold" test
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-02 08:32:36 -05:00
Jason Dillaman
4b69976510
Merge pull request #20099 from Songweibin/wip-fix-deep-cp
...
librbd: fix deep copy a child-image
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-02-02 08:32:20 -05:00
Jos Collin
5cd3b8c759
doc: Fix path in ceph-fuse.rst
...
This mistake was introduced in 9b6f9da3ce
.
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-02-02 16:18:30 +05:30
Xie Xingguo
d9637b7675
Merge pull request #20178 from xiexingguo/wip-map-version
...
crush, mon: bump up map version only if we truly created a weight-set
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-02 16:37:00 +08:00
Kefu Chai
14a1035a5e
Merge pull request #20197 from xiexingguo/wip-load-ws-from-ms
...
pybind/mgr/balancer: load weight-set from ms
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-02 15:57:14 +08:00
Kefu Chai
ce2413c671
Merge pull request #20196 from yaozongyou/improve-straw2-readability
...
crush: improve straw2 algorithm's readability
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-02 15:56:13 +08:00
Kefu Chai
43a2b00308
Merge pull request #20194 from xiexingguo/wip-badsteps
...
pybind/mgr/balancer: increase bad_steps properly
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-02 15:55:41 +08:00
Kefu Chai
85fe7ef9bd
Merge pull request #20189 from neha-ojha/wip-fix-update_calc_stats
...
PG: primary should not be in the peer_info, skip if it is
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2018-02-02 15:55:02 +08:00
Kefu Chai
c971535f8d
Merge pull request #20151 from badone/wip-run-tox-ceph-disk-deps-failure
...
tests: ceph-disk: Remove sitepackages=True
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-02-02 15:35:59 +08:00