Sage Weil
d9fd076960
osd/PG: pass scrub priority to replica
...
If we are scrubbing with high priority on the primary, pass that along
to the replica so that it can schedule its scrub work accordingly.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 07:10:54 -06: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
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
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
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
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
Kefu Chai
af20ea9d5a
Merge pull request #20140 from smithfarm/wip-python3-mopup
...
build/ops: rpm: Python 3-only ceph-disk and ceph-volume
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-02 15:35:05 +08:00
Kefu Chai
5edf84a690
Merge pull request #19953 from badone/wip-c_read_operations-tautological-compare-warning
...
c_read_operations.cc: Silence tautological-compare compiler warning
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-02 15:29:33 +08:00
Jos Collin
9b6f9da3ce
Merge pull request #20071 from joscollin/wip-ceph-fuse-doc
...
doc: Specify mount details in ceph-fuse
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-02-02 12:00:18 +05:30
Jos Collin
025cfe3e53
doc: Specify mount details in ceph-fuse
...
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-02-02 10:56:48 +05:30
shun-s
b1d950ed50
OSDMap: add osdmap epoch info when printing info summary
...
add osdmap epoch info when printing info summary
Signed-off-by: shun-s <song.shun3@zte.com.cn>
2018-02-02 12:45:23 +08:00
Patrick Donnelly
7dabdf526d
Merge PR #19856 into master
...
* refs/pull/19856/head:
qa: synchronize kcephfs suites with fs/multimds
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-02-01 14:50:12 -08:00
Alfredo Deza
22780c7aa8
Merge pull request #20203 from ceph/wip-rm22642
...
ceph-volume: fix usage of the --osd-id flag
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-02-01 11:13:21 -05:00
Mykola Golub
be60490f15
qa/workunits/rbd: remove "trash purge --threshold" test
...
It is difficult to make it work reliably in different environments.
Fixes: http://tracker.ceph.com/issues/22803
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-02-01 17:36:21 +02:00
Sage Weil
fbc4192357
Merge pull request #20090 from liewegas/wip-bluestore-label
...
os/bluestore: make bdev label parsing error more meaningful and less noisy
Reviewed-by: Varada Kari <varada.kari@gmail.com>
2018-02-01 08:51:01 -06:00
Igor Fedotov
0eacf651b1
test/store_test: update Many4KWritesTest* test cases to finalize with fsck
...
Doing that when statfs report doesn't match our expectations will
provide more insight on the mismatch and helps to avoid races if any.
Maybe Fixes: https://tracker.ceph.com/issues/21312
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
2018-02-01 16:10:32 +03:00
Mykola Golub
69e479bd46
Merge pull request #20214 from dillaman/wip-22819
...
librbd: potential crash if object map check encounters error
Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-02-01 12:01:00 +02:00
Radoslaw Zarzynski
64c7f313f9
osd: avoid the config's get_val() overhead on the read path.
...
Profiling shows the overhead of the md_config_t::get_val<T>
can be significant. Unfortunately, it is being used in two
critical places across the read path.
The patch resorts to the legacy config infrastructure to
mitigate the performance penalty. It is expected it will
be superseded with a solution that allows to use the new,
intended routines without hurting performance.
`
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-02-01 10:43:22 +01:00
xie xingguo
ffc06e696b
pybind/mgr/balancer: make 'eval' command can evaluate specific pool
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-01 17:15:52 +08:00
xie xingguo
675c3525b8
mgr/balancer: pool-specific optimization for crush-compat
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-01 17:14:51 +08:00
xie xingguo
9590173242
pybind/mgr/balancer: remove optimization plan properly
...
Should pass in plan name instead of the plan itself.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-01 16:37:41 +08:00
Mykola Golub
452761e5d6
librbd: by default use new format for deep copy destination
...
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-02-01 09:25:06 +02:00
fang yuxiang
ad6039bbab
osd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work
...
Signed-off-by: fang yuxiang <fang.yuxiang@eisoo.com>
2018-02-01 14:18:06 +08:00