Commit Graph

74999 Commits

Author SHA1 Message Date
xie xingguo
a9a0bc85ec mon/OSDMonitor: tidy up class_map too on crush removal
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
6e6ec9d129 crush: use auto for type safety
class-id, by definition, is of type int32_t, not int.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
906f0b5bcd crush: fix potential class id collision
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
d54722f6ad mon/OSDMonitor: "osd crush ls-osd" support
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
cde4ab096d mon/OSDMonitor: extend "set-device-class" for multiple osds
This is useful for applying changes to entire subtrees.
For example:

./bin/ceph osd crush set-device-class hdd `./bin/ceph osd ls-tree default`
set osd(s) 0,1,2 to class 'hdd'

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
c05bff87df crush: fix error handling
get_bucket() does not return a nullptr on error,
it returns a negative error code instead.

Use the IS_ERR() macro to handle it properly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
0c885d6800 osd/OSD: automatically set device class on start
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
xie xingguo
a7ed837f5c crush: allow "osd crush set-device-class" to create class automatically
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-10 08:45:36 +08:00
Nathan Cutler
b08b485ce8 Merge pull request #16079 from smithfarm/wip-doc-make-check
doc: dev: add notes on PR make check validation test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-09 13:14:42 +02:00
Sage Weil
8b21c6b6fd Merge pull request #16027 from liewegas/wip-crush-rule-class
mon,crush: create crush rules using device classes for replicated and ec pools via cli

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-07-08 21:34:13 -05:00
Sage Weil
0c79c4ffac Merge pull request #16228 from smithfarm/wip-rados-upgrade-2
tests: fix rados/upgrade/jewel-x-singleton and make workunit task handle repo URLs not ending in ".git"

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-08 21:32:36 -05:00
Sage Weil
91e5d5bc20 Merge pull request #15973 from majianpeng/bluefs-async-compact-log
os/bluestore/BlueFS: clear current log entrys before dump all fnode,

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-08 21:29:59 -05:00
Jos Collin
8fbe8b8c0e Merge pull request #16214 from liupan1111/wip-fix-mutex
common/Mutex.cc: fixed the error in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-09 01:02:04 +00:00
Nathan Cutler
98eda9a4dc qa: workunit: handle repo ending in "/ceph-ci"
If the repo ends in "/ceph-ci" it's the same as if it ended in "/ceph-ci.git"

Before this change, the following command was broken if the workunit specified,
e.g., "branch: jewel":

teuthology-suite --ceph-repo https://github.com/ceph/ceph --ceph master
--suite-repo https://github.com/ceph/ceph-ci --suite-branch wip-foo . . .

Fixes: http://tracker.ceph.com/issues/20554
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-08 19:03:30 +02:00
Sage Weil
4bc9f566d0 qa/suites/rados/upgrade: upgrade client.0 node too
Fixes: http://tracker.ceph.com/issues/20368
Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-08 18:56:09 +02:00
Sage Weil
f3e0847c12 Merge pull request #16017 from liewegas/wip-20454
os/bluestore/BlueFS: clean up log_writer aios from compaction
2017-07-08 11:24:07 -05:00
Sage Weil
a0ba660afc Merge pull request #16025 from liewegas/wip-19964
mon: do crushtool test with fork and timeout, but w/o exec of crushtool

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-08 09:01:10 -05:00
Sage Weil
d6c649b3c4 Merge pull request #16121 from shashalu/fix-kerneldevice-size
os/bluestore: clear up redundant size assignment in KerenelDevice

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-08 09:00:47 -05:00
Sage Weil
30262cfbd5 Merge pull request #16205 from javacruft/build-ec-isa-as-module
build: build erasure-code isa lib without versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-08 08:54:34 -05:00
Sage Weil
f17516656e Merge pull request #16212 from dillaman/wip-qa-ceph-task
qa/tasks/ceph: don't hard-code cluster name when copying fsid

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-08 08:54:18 -05:00
Sage Weil
704d13d36f Merge pull request #16213 from liewegas/wip-radosbench-timeout
qa/tasks/radosbench: longer timeout
2017-07-08 08:53:55 -05:00
Pan Liu
e4e8806dca common/Mutex.cc: fixed the error in comment
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
2017-07-08 13:49:28 +08:00
Sage Weil
5d71220838 Merge pull request #16198 from tchaikov/wip-doc-fixes
doc: kill sphinx warnings
2017-07-07 21:39:19 -05:00
Sage Weil
cac588de1d test/cli/crushtool: fix rules.t
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 22:34:58 -04:00
Kefu Chai
fc4d51d603 Merge pull request #16225 from liewegas/wip-mon-auth-caps
qa/suites/rados/singleton/all/mon-auth-caps: more osds so we can go clean

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-08 09:58:21 +08:00
vasukulkarni
018e9f1139 Merge pull request #16216 from ceph/wip-mgr-cd-updates
[qa/ceph-deploy]:  run create mgr nodes as well
2017-07-07 15:45:01 -07:00
Josh Durgin
5cc892166f Merge pull request #15689 from jdurgin/wip-filestore-rand-split
os/filestore/HashIndex: randomize split threshold by a configurable amount

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-07 15:18:49 -07:00
Yuri Weinstein
795eccfe21 Merge pull request #16078 from xiexingguo/wip-misc
mon, osd: misc fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-07 15:15:58 -07:00
Sage Weil
67aa4e8137 Merge pull request #16218 from javacruft/ubuntu-fix-systemd-enable
build: execute dh_systemd_{enable,start} after dh_install

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-07 16:48:14 -05:00
Sage Weil
0ec108983f Merge pull request #15944 from xiexingguo/wip-bluestore-20170627
os/bluestore: reduce some overhead for _do_clone_range() and _do_remove()

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-07 16:47:38 -05:00
Sage Weil
9c85b49e15 Merge pull request #16052 from dzafman/wip-20471
osd: Check for and automatically repair object info soid during scrub

Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-07 16:43:47 -05:00
Sage Weil
91038d44a8 Merge pull request #16147 from Yan-waller/wip-waller-0703radostool
tools/rados: some cleanups

Reviewed-by: David Zafman <dzafman@redhat.com>
2017-07-07 16:43:26 -05:00
Sage Weil
492d44eb3a Merge pull request #16217 from liewegas/wip-class-luminous
mon/OSDMonitor: guard 'osd crush set-device-class'
2017-07-07 16:43:08 -05:00
Sage Weil
e30b32bca4 qa/suites/rados/singleton/all/mon-auth-caps: more osds so we can go clean
and scrub

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 17:39:22 -04:00
David Zafman
22f4d0cc01 osd: Check for and automatically repair object info soid during scrub
Fixes: http://tracker.ceph.com/issues/20471

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-07-07 14:18:10 -07:00
Sage Weil
8b08bd580d Merge remote-tracking branch 'gh/luminous' 2017-07-07 14:19:47 -04:00
Sage Weil
7dc5eb5cac mon/OSDMonitor: clean up error messages
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 12:52:53 -04:00
Casey Bodley
4a21de9d95 Merge pull request #15997 from pritha-srivastava/wip-rgw-assert-correction
rgw: Correcting the condition in ceph_assert while parsing an AWS Principal

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-07-07 12:45:58 -04:00
Yuri Weinstein
76df8306ee Merge pull request #15703 from DHB-liuhong/website-lh
rgw: fix the subdir without slash of s3 website url

Reviewed-by: Robin H. Johnson <robbat2@gentoo.org>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-07 09:38:37 -07:00
Yuri Weinstein
748798838c Merge pull request #15916 from oritwas/wip-rgw-fix-prefix-list
Wip rgw fix prefix list

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-07 09:35:52 -07:00
Yuri Weinstein
76d32b7e7a Merge pull request #15996 from mikulely/rgw-rest-complain
rgw: silence compile warning from -Wmaybe-uninitialized

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-07 09:33:37 -07:00
Casey Bodley
a64ced7f1d Merge pull request #16062 from YangFanlinux/myceph1
rgw: Replace get_zonegroup().is_master_zonegroup() with is_meta_master() in RGWBulkDelete::Deleter::delete_single()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-07 12:29:14 -04:00
Yuri Weinstein
c649d570a7 Merge pull request #15998 from mdw-at-linuxbox/fixmarker
rgw: fix marker encoding problem.

Reviewed-by:  Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-07-07 09:26:58 -07:00
Vasu Kulkarni
71e0922cfa create rbd pool since its not created by default anymore
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-07-07 09:23:43 -07:00
Yuri Weinstein
457b443f2a Merge pull request #16095 from zhaochao/rgw-add-a-new-errcode-for-non-existed-subuser
rgw: add a new error code for non-existed subuser.

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-07 09:23:10 -07:00
James Page
8d0ebe217c build: execute dh_systemd_{enable,start} after dh_install
Ensure that dh_systemd_* debhelpers are executed after dh_install
has installed the systemd unit and target definitions.

This ensures that targets are enabled by default once installed,
resolving issues with startup of ceph daemons on server reboot.

Fixes: http://tracker.ceph.com/issues/19585
Signed-off-by: James Page <james.page@ubuntu.com>
2017-07-07 17:18:27 +01:00
Sage Weil
b0335e05ba mon/OSDMonitor: guard 'osd crush set-device-class'
Requires luminous.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 12:17:36 -04:00
Sage Weil
8b5640d093 Merge pull request #16148 from liewegas/wip-20434
mon: collect mon metdata as part of the election

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-07 10:35:19 -05:00
Sage Weil
49c1be8774 mon: collect mon metadata as part of election
Previously each peon would send a message to teh leader with its metadata
immediately after the election was won.  However, at that point paxos
usually wasn't writeable, which meant the old update_mon_metadata() method
didn't persist reliably, updates would race, and generally speaking
metadata wasn't reliably updated.

Fix this by including metadata as part of the election ack, and persisting
the whole quorum when the election is won.  This ensures it is up to date.

Fixes: http://tracker.ceph.com/issues/20434
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 11:34:47 -04:00
Sage Weil
b47db49b5a mon: keep mon metadata in ram
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-07 11:34:47 -04:00