Xie Xingguo
4d8bae0625
Merge pull request #20347 from Songweibin/wip-osd-cleanup
...
osd: drop redundant comment
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-02-07 15:34:04 +08:00
songweibin
dd07c22a1d
osd: drop redundant comment
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-02-07 13:53:21 +08:00
Patrick Donnelly
a33659d604
Merge PR #20288 into master
...
* refs/pull/20288/head:
ptl-tool: open githubmap with utf-8 code
Reviewed-by: Jos Collin <jcollin@redhat.com>
2018-02-06 20:38:14 -08:00
Sage Weil
03c8a828ea
Merge pull request #20313 from guzhongyan/fix-22350
...
osd/OSDMap: misleading message in print_oneline_summary()
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-06 14:01:41 -06:00
Sage Weil
0ebbb1c62c
Merge pull request #20317 from liewegas/wip-pg-scrub-priority
...
osd/PG: pass scrub priority to replica
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:01:19 -06:00
Sage Weil
b2467f02c5
Merge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup
...
osd: pass ops_blocked_by_scrub() to requeue_scrub()
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-06 14:00:53 -06:00
Sage Weil
3ca0e0c565
Merge pull request #20279 from liewegas/wip-idempotent-sequence
...
ceph_test_filestore_idempotent_sequence: many fixes
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-02-06 10:53:35 -06:00
Kefu Chai
797b7c0a87
Merge pull request #20267 from liewegas/wip-22847
...
mon/OSDMonitor: filter out pgs that shouldn't exist from force-create-pg
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:49:35 +08:00
Kefu Chai
12e3cbd13d
Merge pull request #20259 from guzhongyan/rados-cleanup
...
rados: clean up rados_getxattrs() and rados_striper_getxattrs()
Reviewed-by: Sage Weil <sage@redhat.com>
2018-02-06 14:48:42 +08:00
Kefu Chai
221d8a1df2
Merge pull request #20260 from guzhongyan/fix-22042
...
librados: invalid free() in rados_getxattrs_next()
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:45:03 +08:00
Kefu Chai
ccf99d5e82
Merge pull request #20255 from david-z/wip-fix-kv-max-option
...
config: Change bluestore_cache_kv_max to type INT64
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:41:11 +08:00
Kefu Chai
5de47e1b63
Merge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc
...
libradosstriper: fix the function declaration of rados_striper_trunc
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:40:28 +08:00
Kefu Chai
439cf82aad
Merge pull request #20233 from cbodley/wip-test-log-nullptr
...
test/log: fix for crash with libc++
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-06 14:35:18 +08:00
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
Sage Weil
6f5a952fb7
os/filestore: add replay guards for omap operations
...
These were not guarded, meaning they could get replayed onto an object
that was cloned or renamed. Eek!
Fixes: http://tracker.ceph.com/issues/22920
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 18:08:28 -06:00
Sage Weil
13af247a92
test/objectstore/run_seed_to_range: stop on first error
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 18:08:28 -06:00
Sage Weil
9d0a193ea1
ceph_test_idempotent_sequence: use coll_entry_t
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 18:08:28 -06:00
Sage Weil
1c4bb2a52d
ceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 18:08:28 -06:00
Sage Weil
135ccf8790
qa/tasks/filestore_idempotent: run failure tests later in sequence
...
We want to get past the initial colleciton and object creation steps,
which don't include interesting ops.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-05 18:08:28 -06: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
Kefu Chai
0274a46225
osd: pass ops_blocked_by_scrub() to requeue_scrub()
...
less nesting levels, and less repeatings.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-05 22:14:44 +08:00
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
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
Gu Zhongyan
7004b35f71
osd/OSDMap: misleading message in print_oneline_summary()
...
The output scared people as showing so many osds were full/nearfull
Improve the output to make the message clearer
Fixes: http://tracker.ceph.com/issues/22350
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
2018-02-05 18:53:24 +08: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
Gu Zhongyan
b79107d53a
test/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs
...
to cover attribute with empty value case.
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
2018-02-05 12:14:42 +08:00
Gu Zhongyan
015736d484
librados: invalid free() in rados_getxattrs_next()
...
Invalid free() can cause corruption when getting an object
attribute with empty value.
Check the validity of the pointer before free(). Also move
the free() call at the start of rados_getxattrs_next() to
avoid memory leak.
Fixes: http://tracker.ceph.com/issues/22042
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
2018-02-05 12:06:12 +08:00
yuelongguang
417720f2b4
libradosstriper: fix the function declaration of rados_striper_trunc
...
change the type of first parameter from rados_ioctx_t to rados_striper_t
Signed-off-by: yuelongguang <yuelongguang@gmail.com>
2018-02-05 11:33:25 +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