Commit Graph

43301 Commits

Author SHA1 Message Date
Yuri Weinstein
f0e1cde9d6 Merge pull request #9011 from stiopaa1/osdmap_removeUnneededIncludeFiles
osd/OSDMap.h: remove unneeded include files

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-16 13:32:41 -07:00
Yuri Weinstein
ca3d00a99c Merge pull request #9075 from runsisi/wip-compute-cost
osd/ReplicatedBackend: reuse the already computed cost

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-16 13:30:49 -07:00
Yuri Weinstein
4a05803abb Merge pull request #9077 from liewegas/wip-osd-map-cache
osd: instrument map cache hits and misses

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
2016-05-16 13:27:40 -07:00
Yuri Weinstein
a025148c4b Merge pull request #9078 from liewegas/wip-clean-temps
mon, osdmap: optimize check and cleanup of pg_temp for new osdmaps

Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-16 13:20:18 -07:00
Kefu Chai
8980f84078 Merge pull request #8298 from wjwithagen/wip-wjw-freebsd-autobuild-2
build: many fixes for freebsd

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-17 01:07:17 +08:00
Sage Weil
b58173f96f Merge pull request #8480 from songbaisen/song19
crush: When consider rule size use the correct method.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-16 13:02:55 -04:00
Sage Weil
38b8031f62 Merge pull request #8974 from liewegas/wip-addr-cleanup
msg/msg_types: clean up entity_addr_t

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-16 13:02:15 -04:00
John Spray
7d5ca75503 Merge pull request #8452 from jcsp/wip-15266
pybind: fix unicode handling in CephFSVolumeClient::purge

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-16 07:54:16 -05:00
Sage Weil
10f9a1d1b3 Merge pull request #9124 from stiopaa1/osd_someMorePrivate
osd/OSD.h: move some data members under private

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-15 18:47:29 -04:00
Sage Weil
c1e950acf9 Merge pull request #9128 from stiopaa1/osd_constOperatorPGQueueable
osd/OSD: pass op() params by const in PGQueueable

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-15 18:45:59 -04:00
Sage Weil
b759d47aaa Merge pull request #9131 from stiopaa1/compatset_removeConstructor
common: CompatSet.h: Remove unneeded constuctor

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-15 18:43:41 -04:00
Shinobu Kinjo
3c47e48aa2 src/cls/rbd/cls_rbd.cc: fix super trivial typo 2016-05-15 18:01:25 +09:00
Michal Jarzabek
aa3c3f6645 CompatSet.h: Remove unneeded constuctor
We have a constuctor taking a std::string so there is no need for
the constuctor taking char*.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-15 07:27:21 +01:00
Michal Jarzabek
d9bd6654f2 osd/OSD: pass op() params by const in PGQueueable
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-14 16:57:45 +01:00
Michal Jarzabek
b49b8d4ec3 osd/OSD.h: move some data members under private
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-13 22:10:16 +01:00
Sage Weil
f5e9d8e610 Merge pull request #9110 from stiopaa1/osd_moveTickClasses
osd: move tick classes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-13 09:35:46 -04:00
John Spray
a4e440eb44 Merge pull request #8887 from jcsp/wip-15689
osdc: send error to recovery waiters on shutdown

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-05-13 08:25:01 -05:00
John Spray
ae2346579f Merge pull request #8835 from xiaoxichen/implement_fsync_in_pybind
pybind: expose fsync in cephfs binding.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-05-13 08:17:05 -05:00
runsisi
3494a2ac66 osd/ReplicatedBackend: reuse the already computed cost
no need to compute the cost a second time

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-05-13 16:51:06 +08:00
Michal Jarzabek
ef3ea0150b osd/OSD.cc: add override to virtual functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-12 21:13:45 +01:00
Michal Jarzabek
2af377925a osd/OSD: move C_Tick and C_Tick_WithoutOSDLock
Since above classes are implementation detail of OSD class move them
to the .cc file.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-12 21:13:38 +01:00
Sage Weil
c347087e0a Merge pull request #9079 from liewegas/wip-bluestore-freelist
os/bluestore: switch to bitmap freelist by default

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-12 13:56:30 -04:00
Sage Weil
7d8fb8a050 Merge pull request #8956 from shinobu-x/wip-shinobu
os/bluestore: fix permissions on StupidAllocator.cc, cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-12 13:56:03 -04:00
Sage Weil
18d2bb9bc2 osd/OSDMap: fix clean_temps and test
For both pg_temp and primary_temp, we want to calculate what the
mapping *will* be after the inc is applied, and if the mapping is
redundant (it matches what we would have gotten anyway), remove
it.  Removing the mapping might mean putting a 'remove' entry in
the inc, or it might mean removing the proposed addition in the
inc.

Update the unit test to test both cases.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:30 -04:00
Sage Weil
1a255b9252 osd/OSDMap: consolidate into clean_temps
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:30 -04:00
Sage Weil
94f414a684 osd/OSDMap: move primary_temp checks to check_down_temps
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:30 -04:00
Sage Weil
bf9a9e241a osd/OSDMap: move redundant pg_temp check to remove_down_temps
Better to do this on the future map value.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:30 -04:00
Sage Weil
eeeec9772b osd/OSDMap: move old pool check to remove_down_temps
Better to do this on the projected map state.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:29 -04:00
Sage Weil
ddcf1a9a33 osd/OSDMap: minor optimization of remove_down_temps
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-12 09:59:29 -04:00
Jason Dillaman
82af391cea Merge pull request #9024 from trociny/fixup-rbd-mirror-asok
rbd-mirror: don't unregister asok commands if image replayer start failed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-11 17:13:11 -04:00
Jason Dillaman
221ea5e2fe Merge pull request #9025 from trociny/fixup-rbd-mirror-status
rbd-mirror: avoid potential deadlock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-11 17:00:39 -04:00
Jason Dillaman
6ba2195124 Merge pull request #9043 from fullerdj/wip-djf-fsx-fix
test/rbd: document fsx option to keep data on success

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-11 16:36:17 -04:00
Jason Dillaman
490c5623e7 Merge pull request #9071 from runsisi/wip-rbd-mirror-minor-cleanup
rbd-mirror: minor cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-11 16:28:48 -04:00
Yuri Weinstein
62ad33e567 Merge pull request #8924 from xiexingguo/xxg-wip-monitor
mon/Monitor: fix memory leak; add leaked key to tracked_conf_key

Reviewed-by: Joao Eduardo Luis <joao@suse.de>	
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Marcel Lauhoff <lauhoff@uni-mainz.de>
2016-05-11 11:47:36 -07:00
Yuri Weinstein
a3d84dae04 Merge pull request #8952 from badone/wip-i-am-osd-fix
osd: Trivial grammatical fix 'i' to 'I'

Reviewed-by: songbaisen <song.baisen@zte.com.cn>
2016-05-11 11:36:07 -07:00
Yuri Weinstein
a42a6d97eb Merge pull request #8993 from XinzeChi/wip-copy-get
osd: fix ReplicatedPG::fill_in_copy_get logic

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-11 11:33:03 -07:00
Yuri Weinstein
3bad8c91fa Merge pull request #8995 from xiexingguo/xxg-wip-fixpingreply
osd: fix potential access violation during handling PING_REPLY

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-11 11:31:03 -07:00
Sage Weil
305c2defd0 Merge pull request #8990 from tchaikov/wip-13990
osd: remove all stale osdmaps in handle_osd_map()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-11 14:21:03 -04:00
Sage Weil
95b32b147a Merge pull request #8998 from kylinstorage/wip-fix-wrong-raw-pointer-conversion
librados: fix wrong raw pointer conversion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-11 14:17:52 -04:00
Sage Weil
d227759d79 os/bluestore: switch to bitmap freelist by default
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 13:51:26 -04:00
Sage Weil
c68c5ce563 common/address_helper: drop entity_addr_from_sockaddr
entity_addr_t::set_sockaddr() does this.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 12:40:18 -04:00
Sage Weil
c19d2cebf9 msg/xio: use set_sockaddr
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 12:39:48 -04:00
Sage Weil
863672c546 common/address_helper: use set_sockaddr
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 12:39:42 -04:00
Sage Weil
93e77701ed Merge pull request #8377 from vshankar/bs-alloc-cleanup
bluefs: use Allocator::create() to instantiate allocator

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-11 12:31:15 -04:00
John Spray
e590f4d05f pybind: fix unicode handling in CephFSVolumeClient::purge
os.path.join is sensitive to string encoding, but
just doing a straight substitution should not be.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-05-11 16:53:16 +01:00
Sage Weil
5168d912bf Merge pull request #8482 from majianpeng/bluestore-prefallocate
os/bluestore/BlueStore: preallocate space when use file instead of blockdevice

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-11 10:52:42 -04:00
Sage Weil
c50b0b2398 msg/msg_types: drop sockaddr_storage from entity_addr_t
This reduces the struct size by a ton!  136 -> 36 bytes.

Encode to sockaddr_storage is now slightly slower.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 10:41:49 -04:00
Sage Weil
f987e8f3ba msg/async/AsyncConnection: do not use sizeof(entity_addr_t)
Protocol is defined in terms of ceph_entity_addr.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 10:41:48 -04:00
Sage Weil
7374ce9de5 msg/simple/Pipe: do not use sizeof(entity_addr_t)
The protocol is defined in terms of ceph_entity_addr; use that.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 10:41:48 -04:00
Sage Weil
fc450d0c52 msg/msg_types: put sockaddr_* fields in a union
No functional change here, just a rename.

Name the fields after the struct prefixes (e.g., sockaddr_in.sin_ -> sin).

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 10:41:48 -04:00