PCzhangPC
192f937aff
rbd:rm unnecessary conversion from string to char* in image-meta function
...
the APIs in librbd receive string type as parameter, so there is no need to convert string to char* in image-meta function
Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
2017-08-23 18:11:53 +08:00
xie xingguo
bc3e6e2cea
osd/PG: calc_replicated_acting - better tips
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-23 16:41:26 +08:00
xie xingguo
fe1b57da31
osd/PG: calc_ec_acting - kill "usable"
...
which has no consumers.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-23 16:41:26 +08:00
Kefu Chai
1c18b5cb0c
osd/PGBackend: delete reply if fails to complete delete request
...
if any of the objects fails to be deleted due to pg reset after latest
osdmap, the pg recovery delete reply won't be sent to the primary OSD.
in that case, we should delete the reply.
Fixes: http://tracker.ceph.com/issues/20913
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-23 16:37:04 +08:00
Mykola Golub
78ca0fde22
test/librados_test_stub: pass snap context to zero op
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-08-23 09:46:42 +02:00
Kefu Chai
12dcd74538
common/obj_bencher: set {min,max}_iops if runtime < 1 sec
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-23 15:31:32 +08:00
xie xingguo
e128a1e913
mon/OSDMonitor: fix improper input/testing range of crush somke testing
...
CrushTester::test() will reset testing range to [0, 1023] whenever
min_x or max_x is negative and the constructor of CrushTester will
always default min_x and max_x to -1.
Thus to set the test range correctly, you have to specify both min_x and max_x.
Local test shows this patch shall decrease the time consumed by the crush
smoke testing to approximate 1/20 of those without this.
For exmaple:
crush somke test duration: 0.668354 seconds ->
crush somke test duration: 0.012592 seconds
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-23 13:50:29 +08:00
mychoxin
dfa88474b8
os/bluestore: move assert of read/write to base class
...
Signed-off-by: mychoxin <mychoxin@gmail.com>
2017-08-23 13:29:36 +08:00
Kefu Chai
a3c9389e5e
Merge pull request #17154 from ktdreyer/doc-cat
...
doc: eliminate useless cat statement
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-23 12:35:00 +08:00
Patrick Donnelly
94a62a3dff
mon: get writeable osdmap for added data pool
...
Continuation of: 435717791e
Fixes: http://tracker.ceph.com/issues/21064
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-08-22 21:26:00 -07:00
Zhu Shangzhong
0cb4d379fd
client: add blank space between function name and inode number for log
...
Fixes: http://tracker.ceph.com/issues/21069
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
2017-08-23 10:20:17 +08:00
Yuri Weinstein
2476469074
Merge pull request #16127 from ZVampirEM77/wip-obj-acl-bug
...
rgw: fix obj copied from remote gateway acl full_control issue
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-22 19:17:55 -07:00
Yuri Weinstein
7281f59444
Merge pull request #17041 from dengxiafubi/EAS-1
...
rgw: exit early if rgw_bucket_set_attrs() fails
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-08-22 19:16:18 -07:00
Kefu Chai
c5ee5d1faa
Merge pull request #17065 from tchaikov/wip-20785
...
mon/OSDMonitor: do not send_pg_creates with stale info
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-08-23 10:02:37 +08:00
Dan Mick
05f16b490e
Merge pull request #17168 from ceph/wip-volume-man-fix
...
doc: include ceph-disk and ceph-disk-volume man pages in index
Reviewed-by: Dan Mick <dmick@redhat.com>
2017-08-22 16:37:35 -07:00
Alfredo Deza
10c75e225b
doc add ceph-volume and ceph-volume-systemd man pages to CMakeLists file
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 18:05:03 -04:00
Alfredo Deza
1c5b99b2f3
doc: include ceph-disk and ceph-disk-volume man pages in index
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 17:56:40 -04:00
Yuri Weinstein
e004685520
Merge pull request #16836 from heyingstar/bug-ms_dump_on_send-doubledata
...
messages/MOSDOp: a fixes of encode_payload
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2017-08-22 13:39:12 -07:00
Yuri Weinstein
294dec300c
Merge pull request #17079 from joscollin/wip-use-after-free
...
msg: drop the unnecessary polling_stop()
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-08-22 13:17:48 -07:00
Casey Bodley
5e67c681f7
Merge pull request #16344 from rzarzynski/wip-rgwqa-tempest
...
rgw, qa: integrate Tempest to verify RadosGW's compliance with Swift API
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-08-22 15:02:15 -04:00
Casey Bodley
568c3f3a23
qa/rgw: enable 'rgw' application on created pools
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-08-22 14:37:02 -04:00
Casey Bodley
7c865effd8
qa: add optional 'application' to pool creation helpers
...
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-08-22 14:37:02 -04:00
Yuri Weinstein
c5ee282dcb
Merge pull request #16818 from theanalyst/rgw-lc-add-filter-2
...
rgw_lc: add support for optional filter argument and make ID optional
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-08-22 10:04:23 -07:00
Yuri Weinstein
fb90cbbd95
Merge pull request #17116 from Synesis-LLC/fix-20934
...
rgw: Prevent overflow of cached stats values
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-08-22 09:56:34 -07:00
Alfredo Deza
e62a28ccd5
Merge pull request #17152 from ceph/wip-rm21030
...
create the ceph-volume and ceph-volume-systemd man pages
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-22 11:49:13 -04:00
Alfredo Deza
3ffae03df6
rpm: include ceph-volume and ceph-volume-systemd man pages
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 11:22:52 -04:00
Alfredo Deza
a20015636c
debian: include ceph-volume and ceph-volume-systemd man pages
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 11:20:47 -04:00
Ken Dreyer
3abc975985
doc: eliminate useless cat statement
...
Useless Use of Cat Award!
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-22 09:15:31 -06:00
Kefu Chai
85b63670d9
Merge pull request #17039 from dzafman/wip-18206
...
osd: Fixes for osd_scrub_during_recovery handling
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-22 22:50:24 +08:00
xie xingguo
507f970b56
crush: fix type mismatch
...
Pool IDs are of type int64_t instead of uint64_t.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:45:49 +08:00
xie xingguo
d62c9f16cb
crush: fix bucket_adjust_item_weight() won't update weight-set correctly
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:45:49 +08:00
xie xingguo
dc8f925cb4
crush: CrushWrapper::add_bucket - do not allow caller pass in null 'idout'
...
*** Caught signal (Segmentation fault) **
in thread 7f495c0f6300 thread_name:crushtool
ceph version 12.1.2-768-gab69125 (ab6912523e779174f92f0b0fc10372bd0b645415) mimic (dev)
1: (()+0x1a3d1) [0x7f495c1343d1]
2: (()+0xf370) [0x7f4951deb370]
3: (CrushWrapper::add_bucket(int, int, int, int, int, int*, int*, int*)+0x84) [0x7f49538ba084]
4: (CrushCompiler::parse_bucket(__gnu_cxx::__normal_iterator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >*, std::vector<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >, std::allocator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> > > > > const&)+0xef0) [0x7f49538dc170]
5: (CrushCompiler::parse_crush(__gnu_cxx::__normal_iterator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >*, std::vector<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> >, std::allocator<boost::spirit::tree_node<boost::spirit::node_val_data<char const*, boost::spirit::nil_t> > > > > const&)+0x130) [0x7f49538dcba0]
6: (CrushCompiler::compile(std::istream&, char const*)+0xb93) [0x7f49538deaa3]
7: (main()+0x2615) [0x7f495c126015]
8: (__libc_start_main()+0xf5) [0x7f49507ccb35]
9: (()+0xf4b0) [0x7f495c1294b0]
2017-08-14 13:31:25.498050 7f495c0f6300 -1 *** Caught signal (Segmentation fault) **
in thread 7f495c0f6300 thread_name:crushtool
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:45:48 +08:00
Alfredo Deza
1e2d9f1438
doc index the ceph-volume and ceph-volume-systemd man pages
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 10:36:33 -04:00
Alfredo Deza
2e08bee8ca
doc/man create the ceph-volume man page
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 10:35:45 -04:00
Alfredo Deza
7c714e397d
doc/man create the ceph-volume-systemd man page
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 10:35:33 -04:00
xie xingguo
0c8ca02727
crush: update crush_choose_arg_map size on resizing
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:14:28 +08:00
xie xingguo
0e1d37f6f3
crush: fix bucket_remove_item() won't update weight-set simultaneously
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:14:27 +08:00
xie xingguo
475bddab51
crush: fix bucket_add_item() won't update weight-set simultaneously
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:14:27 +08:00
xie xingguo
859b066adf
crush: fix bucket index to weight-set
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 22:14:27 +08:00
Zhu Shangzhong
6b75f2d840
doc/cephfs: s/rados_max_object_size/osd_max_object_size
...
Signed-off-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>
2017-08-22 21:51:28 +08:00
songweibin
77e735bb00
osd/PG: drop unused variable "oldest_update"
...
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2017-08-22 20:32:15 +08:00
Alfredo Deza
9aa44969c6
Merge pull request #17127 from tchaikov/wip-doc-cleanups
...
doc/conf.py: do not set html_use_smartypants explicitly
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 07:07:21 -04:00
Xie Xingguo
df978b0172
Merge pull request #17131 from scienceluo/wip-luo-check-fix-branch
...
osd: Drop the unused code in OSD::_collect_metadata
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 18:50:31 +08:00
Luo Kexue
2ca6a3bc49
osd: Drop the unused code in OSD::_collect_metadata
...
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
2017-08-22 14:25:30 +08:00
xie xingguo
1ea448ac75
common/types: make numbers a bit nicer when displaying space usage
...
Was:
----------------------------------------------------------------------------
GLOBAL:
SIZE AVAIL RAW USED %RAW USED
30911M 27050M 3861M 12.49
POOLS:
NAME ID USED %USED MAX AVAIL OBJECTS
rbd 0 101216k 1.10 8913M 1178
cephfs_data_a 1 0 0 8913M 0
cephfs_metadata_a 2 892 0 8913M 21
----------------------------------------------------------------------------
Now:
----------------------------------------------------------------------------
GLOBAL:
SIZE AVAIL RAW USED %RAW USED
30.2G 26.4G 3.77G 12.50
POOLS:
NAME ID USED %USED MAX AVAIL OBJECTS
rbd 0 99.2M 1.10 8.70G 1180
cephfs_data_a 1 0 0 8.70G 0
cephfs_metadata_a 2 892 0 8.70G 21
----------------------------------------------------------------------------
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 12:33:10 +08:00
Kefu Chai
335205bafa
doc/conf.py: do not set html_use_smartypants explicitly
...
because it's deprecated, and is on by default in the specified sphinx
version (v1.6.3):
this change silences following warning:
build-doc/virtualenv/local/lib/python2.7/site-packages/sphinx/environment/__init__.py:683:
RemovedInSphinx17Warning: html_use_smartypants option is deprecated.
Smart quotes are on by default; if you want to disable or customize
them, use the smart_quotes option in docutils.conf.
RemovedInSphinx17Warning)
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-22 11:24:13 +08:00
Kefu Chai
c6056be36a
doc: remove manpage-howto.txt
...
since manpages are built as part of "make" process, we can dispense with
the manual steps.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-08-22 11:11:17 +08:00
Xie Xingguo
f3d01c1a59
Merge pull request #17115 from amitkumar50/cov-osd-1
...
osd: Initialization of pointer cls
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-08-22 08:19:49 +08:00
David Zafman
367c32c69a
osd: Fixes for osd_scrub_during_recovery handling
...
Fixes: http://tracker.ceph.com/issues/18206
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-21 17:08:14 -07:00
David Zafman
9f3d970a0d
tests: osd-scrub-snaps.sh minor cleanup
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-08-21 17:08:14 -07:00