Commit Graph

78649 Commits

Author SHA1 Message Date
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
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
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
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
Theofilos Mouratidis
b8561cefa7 osd: upmap should respect osd reweights
Modify OSDMap::calc_pg_upmaps to take the osd reweight into account when
computing the size of each OSD.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
Fixes: http://tracker.ceph.com/issues/21538
2017-09-25 19:56:28 +02:00
Theofilos Mouratidis
ff9e024a59 test/cli/osdmaptool: test upmap with an out osd
Test upmap with one osd marked out.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
2017-09-25 19:56:27 +02:00
Sage Weil
61799c4c8c Merge pull request #17810 from hjwsm1989/wip-21294
qa/ceph_manager: check pg state again before timedout

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-25 12:33:34 -05:00
Sage Weil
a79c78c1a4 Merge pull request #17661 from yunfeiguan/master
librados: Fix a potential risk of buffer::list::claim_prepend(list& b…

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-25 12:33:18 -05:00
Sage Weil
2c3ec1082d Merge pull request #17790 from joscollin/wip-test-warning-signed-unsigned
test: silence warning from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-25 12:32:53 -05:00
Sage Weil
e82d298db6 Merge pull request #17928 from xiexingguo/wip-more-interval-set-size
osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-25 12:32:29 -05:00
Sage Weil
07fe4fd5b5 Merge pull request #17528 from liewegas/wip-mgr-localpool
pybind/mgr/localpool: module to automagically create localized pools

Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-25 12:30:05 -05:00
Sage Weil
6383fa5b30 qa/workunits/mgr/test_localpool: simple test for localpool mode
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-25 12:34:53 -04:00
Theofilos Mouratidis
bd75a78187 osdmaptool: add --mark-out option
Add a --mark-down <id> option which sets the reweight for a given
osd id to 0.0.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
2017-09-25 16:14:09 +02:00
Mahati Chamarthy
5b027155b4 examples: fix link order in librados example Makefile
The library link order in librados example Makefile is incorrect
and as a result 'make' throws an error. This change fixes the order.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
2017-09-25 19:20:58 +05:30
huanwen ren
13f6aa3aaa mon/mgr: sync mgr_command_descs table and mgr_metadata table
sync mgr_command_descs table and mgr_metadata table to new mons

Fixes: http://tracker.ceph.com/issues/21527

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-09-25 19:42:08 +08:00
huanwen ren
6c20433bfb mon/osd_metadata: sync osd_metadata table
sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-09-25 18:32:28 +08:00
John Spray
ade4827d86 mgr: fix crashable DaemonStateIndex::get calls
This function was recently fixed to return null
on missing entries: handle that properly.

Fixes: http://tracker.ceph.com/issues/17737
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-25 06:20:54 -04:00
John Spray
a3c317b406 mon: implement MDSMonitor::get_store_prefixes
Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-25 10:54:27 +01:00
John Spray
889ac5166a mon/OSDMonitor: tidy prefix definitions
We should define them in one place to make it easy
when updating get_store_prefixes.

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-25 10:54:02 +01:00
huanwen ren
755ec73510 mon/osd_metadata: sync osd_metadata table
sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-09-25 10:53:42 +01:00
Sage Weil
4466fb6058 Merge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds
mon: osd feature checks with 0 up osds

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-24 21:18:51 -05:00
Sage Weil
e0beb1e02a Merge pull request #17848 from liewegas/wip-ruleset-errors
mon/OSDMonitor: error out if setting ruleset-* ec profile property

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-09-24 21:15:42 -05:00
Sage Weil
af5032e729 Merge pull request #17902 from tchaikov/wip-21474
qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-24 21:14:58 -05:00
Sage Weil
98631e35a2 Merge pull request #17903 from lixiaoy1/add_func_log
os/bluestore: Add missing __func__ in dout

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-24 21:14:35 -05:00
Sage Weil
947e975465 Merge pull request #17905 from tchaikov/wip-osd_types-cleanup
osd/osd_types: object_info_t: remove unused function

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-24 21:14:09 -05:00
Sage Weil
f49dbe8c89 Merge pull request #17927 from liewegas/wip-21511
qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

Reviewed-by: David Zafman <dzafman@redhat.com>
2017-09-24 21:13:03 -05:00
Patrick Donnelly
3d90ec5a4d
Merge PR #17919 into master
* refs/remotes/upstream/pull/17919/head:
	qa: whitelist cache too large in client-limits

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-24 17:07:34 -07:00
Patrick Donnelly
a1185383b8
Merge PR #17918 into master
* refs/remotes/upstream/pull/17918/head:
	qa: whitelist failover log warnings

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-24 17:07:32 -07:00
Patrick Donnelly
e5dc7d0f55
Merge PR #17917 into master
* refs/remotes/upstream/pull/17917/head:
	qa: ignore evicted client in client-recovery

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-24 17:07:27 -07:00
Sage Weil
6376d75eda mon/OSDMonitor: error out if setting ruleset-* ec profile property
We change ruleset -> crush back in dc7a2aaf7a.
If someone tries to use the old property, error out early, instead of
silently not doing the thing they thought they told us to do.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-24 11:25:01 -04:00
Yao Zongyou
872d73f945 rgw_file: fix write error when the write offset overlaps.
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-09-24 22:11:22 +08:00