Xie Xingguo
58f329c056
Merge pull request #17966 from xiexingguo/wip-bluefs-kill-block-total
...
os/bluestore/BlueFS: several cleanups
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-28 19:04:31 +08:00
John Spray
37f7fb76af
Merge pull request #18013 from tchaikov/wip-dashboard-favicon
...
mgr/dashboard: use rel="icon" for favicon
Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-28 09:32:17 +01:00
Kefu Chai
af11e5cbf6
Merge pull request #17993 from jcsp/wip-21572
...
mgr/dashboard: sort servers and OSDs in OSD list
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-28 14:38:26 +08:00
Kefu Chai
6b85a0caaf
Merge pull request #17937 from tchaikov/wip-automake-cleanup
...
automake: remove files required by automake
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2017-09-28 14:05:16 +08:00
Kefu Chai
a6e79d91fb
mgr/dashboard: use rel="icon" for favicon
...
shortcut is not a standard compliant link type, see
https://www.w3.org/TR/html5/links.html#linkTypes .
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-28 13:51:27 +08:00
Kefu Chai
cda8d1df20
Merge pull request #17991 from jcsp/wip-21570
...
mgr/dashboard: handle null in format_number
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-28 13:22:22 +08:00
Kefu Chai
68769fab3d
Merge pull request #17986 from tchaikov/wip-doc-rgw-config
...
doc: fix hyper link to radosgw/config-ref
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-28 09:57:07 +08:00
Yuri Weinstein
7b042400a7
Merge pull request #17926 from batrick/ptl-tool
...
scripts: add ptl-tool for scripting merges
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
2017-09-27 15:06:10 -07:00
Sage Weil
2237624846
Merge pull request #17978 from alram/rbdmap-fix
...
rbdmap: fix umount when multiple mounts use the same RBD
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-27 12:57:33 -05:00
Casey Bodley
f3e0e0171d
Merge pull request #17962 from joscollin/wip-test-signed-unsigned-warning
...
test: silence warnings from -Wsign-compare
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-27 10:26:49 -04:00
John Spray
f409099fa2
mgr/dashboard: sort servers and OSDs in OSD list
...
Fixes: http://tracker.ceph.com/issues/21572
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-27 15:14:58 +01:00
John Spray
f43859d4dc
mgr/dashboard: handle null in format_number
...
Fixes: http://tracker.ceph.com/issues/21570
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-27 14:33:58 +01:00
John Spray
409b8923a2
mgr/dashboard: remove ceph.com ref to favicon
...
We have a local copy referenced in the very next line.
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-27 14:30:07 +01:00
Jos Collin
4483bc7c61
Merge pull request #17988 from wumingqiao/wip-rados-update
...
include/rados: fix typo in librados.h
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-27 09:07:29 +00:00
wumingqiao
99d79afe6e
include/rados: fix typo in librados.h
...
opeprate -> operate
Signed-off-by: wumingqiao <wumingqiao@inspur.com>
2017-09-27 16:31:14 +08:00
Kefu Chai
671a4106b3
doc: fix hyper link to radosgw/config-ref
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-27 11:13:35 +08:00
Alexandre Marangone
40825daece
rbdmap: fix umount when multiple mounts use the same RBD
...
When a Kubernetes Pod consumes a RBD it is mounted two
times on the same host. When the host shutdown umount will
fail leading to a hung system
Signed-off-by: Alexandre Marangone <amarango@redhat.com>
2017-09-26 16:19:25 -07:00
Yuri Weinstein
85f3227885
Merge pull request #17063 from bspark8/wip-dynamic-cli-info-f
...
osd: use dmclock library client_info_f function dynamically
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-09-26 16:02:19 -07:00
Yuri Weinstein
cf1bcf5b3b
Merge pull request #17335 from Carudy/cxw
...
crush: safe check for 'ceph osd crush swap-bucket'
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 16:01:14 -07:00
Yuri Weinstein
4d50fb56b8
Merge pull request #17410 from zmedico/PGPool-update-optimize-removed_snaps-comparison-when-possible
...
PGPool::update: optimize removed_snaps comparison when possible
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2017-09-26 15:59:59 -07:00
Sage Weil
36c178feb0
Merge pull request #17980 from liewegas/wip-boost-url
...
make-dist,cmake: move boost tarball location to download.ceph.com
Reviewed-by: Jeff Layton <jlayton@redhat.com>
2017-09-26 17:07:03 -05:00
Sage Weil
19987549e0
make-dist,cmake: move boost tarball location to download.ceph.com
...
Sourceforge is down. Also, we can hammer our servers instead of
theirs.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-26 17:22:36 -04:00
Matt Benjamin
bf99f4d86b
Merge pull request #17589 from myENA/feature/20883-adminapi_sync_stats_master
...
rgw: admin api - add ability to sync user stats from admin api
2017-09-26 12:45:24 -04:00
Matt Benjamin
fcc014cdb0
Merge pull request #17433 from C2python/check_action
...
rgw: Return Error if Bucket Policy Contians Undefined Action
2017-09-26 12:40:08 -04:00
Jason Dillaman
2360bfca75
Merge pull request #17969 from ceph/rbd-mirror-reboot
...
systemd: rbd-mirror does not start on reboot
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-26 12:10:16 -04:00
xie xingguo
ef0c60fe08
os/bluestore/BlueFS: check device id before using hint
...
As we might be allocating space from different devices (though
the chance is rare).
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-26 21:45:54 +08:00
xie xingguo
80e14271db
os/bluestore/BlueFS: drop redundant merge logic of pextents
...
As Allocator will handle it automatically and efficiently!
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-26 21:45:54 +08:00
xie xingguo
6228d5ee22
os/bluestore/BlueFS: kill block_total
...
As block_all will suffice for the same purpose.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-26 21:45:54 +08:00
Sage Weil
62bbfc1b4d
Merge pull request #17929 from renhwztetecs/renhw-wip-mgrmon-command_descs_prefix
...
mon/mgr: sync "mgr_command_descs","osd_metadata" and "mgr_metadata" prefixes to new mons
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 08:38:14 -05:00
Sage Weil
0227c91649
Merge pull request #17932 from jcsp/wip-21197
...
mgr: store declared_types in MgrSession
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-26 08:36:24 -05:00
Sage Weil
03137272eb
Merge pull request #17933 from jcsp/wip-17737
...
mgr: fix crashable DaemonStateIndex::get calls
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 08:35:52 -05:00
Sage Weil
e2aef59dd7
Merge pull request #17944 from thmour/tmour_upmap
...
osd/OSDMap: upmap should respect the osd reweights
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-26 08:35:07 -05:00
Matt Benjamin
637eead62f
Merge pull request #17880 from amitkumar50/cov-rgw-9
...
rgw: Error check on return of read_line()
2017-09-26 08:29:09 -04:00
Sébastien Han
e6cd9570ba
rbd-mirorr: does not start on reboot
...
The current systemd unit file misses 'PartOf=ceph-rbd-mirror.target',
which results in the unit not starting after reboot.
If you have ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0 , it won't start
after reboot even if enabled.
Adding 'PartOf=ceph-rbd-mirror.target' will enable
ceph-rbd-mirror.target when ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0
gets enabled.
Signed-off-by: Sébastien Han <seb@redhat.com>
2017-09-26 14:05:37 +02:00
John Spray
99b15792a3
Merge pull request #17961 from tchaikov/wip-doc-local-pool-in-toc
...
doc/mgr: add "local pool" plugin to toc
Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-26 11:31:09 +01:00
Kefu Chai
dca1306347
Merge pull request #17949 from asomers/nproc_freebsd
...
do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 17:45:56 +08:00
Kefu Chai
d4da5e2063
Merge pull request #17940 from jcsp/wip-21534
...
mon: update get_store_prefixes implementations
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 17:09:54 +08:00
Jos Collin
fdbbe8a32c
test: silence warnings from -Wsign-compare
...
Fixed the warnings:
ceph/src/test/bufferlist.cc:2150:3: required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (lhs == rhs) {
ceph/src/test/bufferlist.cc:2151:3: required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
if (lhs == rhs) {
Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-09-26 10:24:15 +05:30
Kefu Chai
0b831e7886
doc/mgr: add "local pool" plugin to toc
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-26 12:10:28 +08:00
Kefu Chai
7682b50699
automake: remove files required by automake
...
INSTALL, NEWS, README, AUTHORS, and ChangeLog are required by automake,
since we've switched to cmake, remove the empty ones.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-26 12:04:59 +08:00
Kefu Chai
0be2b8baf5
Merge pull request #17842 from MahatiC/fix_example
...
examples: fix link order in librados example Makefile
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-26 11:15:14 +08:00
Jason Dillaman
22149303a5
Merge pull request #17633 from yonghengdexin735/wip-zzz-doc
...
doc/rbd: add info for rbd group
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-25 21:40:32 -04:00
Jason Dillaman
642afd2f5f
Merge pull request #17803 from amitkumar50/cov-librbd-5
...
test: address coverity false positives
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-25 21:33:36 -04:00
Jason Dillaman
12d97f232f
Merge pull request #17800 from amitkumar50/cov-misc-8
...
test/librbd: initialize on_finish,locker,force,snap_id
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-25 21:31:58 -04:00
Alan Somers
44c6a47fb6
do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD
...
Use sysctl(8) instead. Also, there's no longer any need for /bin/bash
on FreeBSD.
Signed-off-by: Alan Somers <asomers@gmail.com>
2017-09-25 16:24:06 -06:00
Sage Weil
e643d5c0fe
Merge pull request #17813 from liewegas/wip-21410-note
...
PendingReleaseNotes: note about upmap mapping change in luminous release notes
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-25 16:36:36 -05:00
Sage Weil
dda1726bcb
PendingReleaseNotes: note about upmap mapping change in luminous release notes
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-25 17:36:14 -04:00
Matt Benjamin
37c8748054
Merge pull request #17809 from yaozongyou/fix-rgw-file-write-error
...
rgw_file: fix write error when the write offset overlaps
2017-09-25 14:45:57 -04:00
Sage Weil
68c6923141
Merge pull request #17947 from batrick/ceph-osd-core-dbg
...
ceph-debug-docker.sh: add ceph-osd-dbg package
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-25 13:37:22 -05:00
Patrick Donnelly
5a20981161
ceph-debug-docker.sh: add ceph-osd-dbg package
...
So we can debug ceph-osd cores.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-25 11:29:20 -07:00