Kefu Chai
5b3224aeff
Merge pull request #18651 from aermolaev/patch-1
...
doc: fix typo in radosgw/dynamicresharding.rst
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-01 18:01:14 +08:00
Alexander Ermolaev
231b9ab610
doc: fix typo in dynamicresharding.rst: admon => admin
...
Signed-off-by: Alexander Ermolaev <ave@integros.com>
2017-11-01 12:52:14 +03:00
Haomai Wang
ffb129ef2b
Merge pull request #18660 from ownedu/wip-fix-async-rdma-typo
...
msg/async/rdma: a tiny typo fix.
Reviewed-by: Kefu Chai <kefu@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-11-01 01:14:53 -05:00
Kefu Chai
f225a32c83
Merge pull request #18268 from jcsp/wip-20629
...
mon: handle monitor lag when killing mgrs
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-01 14:10:03 +08:00
ownedu
4b4e499b4e
msg/async/rdma: a tiny typo fix.
...
Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
2017-11-01 11:38:27 +08:00
Kefu Chai
db89b2c1b0
Merge pull request #18329 from ifed01/wip-fix-mempool-dump
...
mempool: fix lack of pool names in mempool:dump output for JSON format
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-11-01 10:54:26 +08:00
Kefu Chai
d07ba9016b
Merge pull request #18575 from majianpeng/msg-cleanup-2
...
msg/async: misc cleanup.
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-11-01 10:53:43 +08:00
Kefu Chai
cc484b2606
Merge pull request #18581 from wzliao/wip-drop-unused-parameter
...
osd/PrimaryLogPG: drop unused parameters
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-11-01 10:53:09 +08:00
Kefu Chai
c5fdce5422
Merge pull request #18588 from mogeb/rados-bench-clock
...
tools/rados: use the monotonic clock in rados bench
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-01 10:52:40 +08:00
Kefu Chai
737ef1b275
Merge pull request #18595 from batrick/mon-clock
...
mon: a few conversions to monotonic clock
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-01 10:50:52 +08:00
Kefu Chai
8818a1939d
Merge pull request #18636 from tchaikov/wip-osdmap-cleanup
...
osd/OSDMap: remove the unnecessary checks for null
Reviewed-by: Sage Weil <sage@redhat.com>
2017-11-01 10:48:56 +08:00
Kefu Chai
0827af8f4d
Merge pull request #18647 from tchaikov/wip-pgmap-cleanup
...
mon/PGMap: use new-style options and cleanup
Reviewed-by: John Spray <john.spray@redhat.com>
2017-11-01 10:48:24 +08:00
Kefu Chai
5632c23838
Merge pull request #18648 from tchaikov/wip-vstart-drop-num-opts
...
vstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-11-01 10:48:03 +08:00
Patrick Donnelly
f2efd4de4d
Merge PR #18618 into master
...
* refs/pull/18618/head:
mds: pass a reference of function to sanitize() not a copy
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-10-31 16:27:44 -07:00
Casey Bodley
be3990c2f5
Merge pull request #18572 from linuxbox2/wip-rgwfile-env
...
rgw_log, rgw_file: account for new required envvars
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-10-31 16:57:42 -04:00
Yuri Weinstein
20a62e1c91
Merge pull request #18327 from PCzhangPC/clonelostmeta
...
librbd: cannot clone all image-metas if we have more than 64 key/value pairs
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-31 13:56:56 -07:00
Yuri Weinstein
87cfeae774
Merge pull request #18546 from liewegas/wip-deprecate-features
...
include/ceph_features: deprecate a bunch of features
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-10-31 13:56:20 -07:00
Yuri Weinstein
85bef1e107
Merge pull request #18616 from xiexingguo/wip-hunt-scrub-mismatch
...
osd/PrimaryLogPG: more oi.extents fixes
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-31 13:51:31 -07:00
vasukulkarni
e12f7a980b
Merge pull request #18634 from tchaikov/wip-qa-add-restful
...
qa: add "restful" to ceph_mgr_modules in ceph-ansible suite
2017-10-31 12:36:06 -07:00
Sage Weil
9db3ef8d05
Merge pull request #18520 from alram/kube-helm-doc
...
doc: Kube + Helm installation
2017-10-31 12:09:18 -05:00
Sage Weil
6b3b0afc28
Merge pull request #18639 from yaozongyou/make-readme-properly-align
...
doc: make the commands in README.md properly aligned
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-10-31 11:44:33 -05:00
Jos Collin
42b2cc1a2a
Merge pull request #18499 from batrick/ptl-tool-testing-time
...
ptl-tool: make branch name configurable
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-31 15:42:20 +00:00
Patrick Donnelly
9902f5c51d
ptl-tool: make branch name configurable
...
Also, include hours/minutes in branch so multiple branches in a day have
different names.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-31 08:01:03 -07:00
Casey Bodley
7d3023d8e6
Merge pull request #18642 from zhangsw/cleanup-rgwputobj-getdata
...
rgw: add logs if get_data returns error in RGWPutObj::execute.
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
2017-10-31 10:14:52 -04:00
Jason Dillaman
a4ae621fb7
Merge pull request #18645 from tchaikov/wip-cmake-Findgperftools
...
cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-31 07:56:21 -04:00
Kefu Chai
b4ffd03ca3
Merge pull request #18283 from tchaikov/wip-laggy-mgr
...
qa: reduce mon-client-hunt-interval-max-multiple to 2
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-10-31 19:03:13 +08:00
Kefu Chai
eb022652c6
vstart.sh: drop --{mon,osd,mds,rgw,mgr}_num options
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 18:53:16 +08:00
Kefu Chai
84ec741673
mon/PGMap: drop unused PGMap::update_global_delta()
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 18:45:13 +08:00
Kefu Chai
7a23097c34
mon/PGMap: use new-style options
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 18:44:13 +08:00
Kefu Chai
70b5b4bfbf
cmake: should check the availability of aligned_alloc() by running the test
...
this mimics the failure of rocksdb without a working
aligned_alloc()/free().
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 17:39:09 +08:00
Kefu Chai
599a9ef3ca
cmake: should use the value of GPERFTOOLS_LIBRARIES as REQUIRED_VARS
...
otherwise it's always true, even if the libaries are not found. also
the cmake output will be wrong without this change:
without this change, it is:
-- Found gperftools: GPERFTOOLS_TCMALLOC_LIBRARY;GPERFTOOLS_TCMALLOC_MINIMAL_LIBRARY;GPERFTOOLS_PROFILER_LIBRARY (found version "2.5.93")
with this change, it would be:
-- Found gperftools: /tmp/gperf/lib/libtcmalloc.so (found version "2.5.93")
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 16:58:04 +08:00
Zhang Shaowen
cbf81b925b
rgw: add logs if get_data returns error in RGWPutObj::execute.
...
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
2017-10-31 14:42:52 +08:00
Yao Zongyou
18d17706bf
doc: make the commands in README.md properly aligned
...
The commands in README.md are aligned using one tab or eight spaces,
the github markdown engine not handle this properly, so using one tab
universely.
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-10-31 13:44:23 +08:00
Liao Weizhong
8ed2457ccb
osd/PrimaryLogPG: drop unused parameters
...
Signed-off-by: Liao Weizhong <liaoweizhong@unionpay.com>
2017-10-31 13:13:37 +08:00
Kefu Chai
733e11d7de
osd/OSDMap: remove the unnecessary checks for null
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 12:29:54 +08:00
Jos Collin
ca7492dc00
Merge pull request #18547 from batrick/ptl-tool-trackers
...
ptl-tool: print bzs/tickets cited in commit msgs/comments
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-31 04:18:35 +00:00
Kefu Chai
c41da89c72
Merge pull request #18495 from ceph/wip-da-SCA-20171013
...
osd,rgw,librbd: SCA fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-31 12:13:28 +08:00
Kefu Chai
529f036b1b
Merge pull request #18535 from yanghonggang/master
...
os/bluestore/bluestore_tool: add log-dump command to dump bluefs's log
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-10-31 12:04:09 +08:00
Kefu Chai
ae81011767
Merge pull request #18574 from shashalu/fix-strict-strtol
...
common: strict_strtol INT_MAX and INT_MIN is valid
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-31 12:02:37 +08:00
Kefu Chai
7d583f1ec4
Merge pull request #18577 from tchaikov/wip-kill-clang-warning
...
ceph-syn: silence clang analyzer warning
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-10-31 12:02:10 +08:00
Kefu Chai
caf9ee5c60
qa: add "restful" to ceph_mgr_modules in ceph-ansible suite
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-31 11:21:58 +08:00
Patrick Donnelly
010ece1d78
ptl-tool: print bzs/tickets cited in commit msgs
...
This makes it easier to update issues after a merge.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-30 20:11:35 -07:00
Sage Weil
87f4c36107
Merge pull request #18631 from gohighsec/cleanup
...
os/bluestore: delete redundant header file in KernelDevice.cc
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-30 21:18:38 -05:00
lijing
6914ab2109
bluestore: delete redundant header file in KernelDevice.cc
...
Signed-off-by: Jing Li <lijing@gohighsec.com>
2017-10-31 09:44:14 +08:00
Sage Weil
ce6ba63e14
Merge pull request #18603 from batrick/i21945
...
mon/MDSMonitor: wait for readable OSDMap before sanitizing
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-30 15:43:11 -05:00
Patrick Donnelly
456b68c375
Merge PR #18039 into master
...
* refs/pull/18039/head:
mgr/dashboard: redirect away if viewed filesystem is removed
mgr/dashboard: 404 instead of 500 on missing filesystem
mds: fix FSMap copy constructor
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-30 12:24:23 -07:00
Yehuda Sadeh
ca4f10b3ee
Merge pull request #18477 from ZVampirEM77/wip-em-cleanup
...
rgw: drop unused variable in copy_obj_data()
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-10-30 11:20:05 -07:00
Ilya Dryomov
91b8fd5ee4
Merge pull request #18579 from idryomov/wip-doc-kclient-snapshots
...
doc/cephfs/experimental-features: kernel client snapshots limit
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-10-30 17:42:23 +01:00
Alfredo Deza
9421c87944
Merge pull request #18513 from ceph/ceph-volume-zap
...
ceph-volume: adds the ceph-volume lvm zap subcommand
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-10-30 10:57:33 -04:00
xie xingguo
8c630a040e
osd/PrimaryLogPG: add_object_context_to_pg_stat - fix stat
...
There might be holes in the extents map, thus it is not always
consistent to calc the clone bytes this way.
Instead we could switch to its own (simpler and consistent) way to
count used bytes for head-object and clone respectively.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-30 21:32:43 +08:00