]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoradosgw-admin: fix 'period push' handling of --url 9146/head
Casey Bodley [Mon, 16 May 2016 13:37:05 +0000 (09:37 -0400)]
radosgw-admin: fix 'period push' handling of --url

was calling send_to_remote_gateway(), but passing 'url' instead of
'remote'. now uses send_to_remote_or_url() to accept either

Fixes: http://tracker.ceph.com/issues/15926
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9166 from chhabaramesh/master
Sage Weil [Wed, 18 May 2016 06:22:06 +0000 (02:22 -0400)]
Merge pull request #9166 from chhabaramesh/master

os/bluestore/BitmapFreelistManager: fix length calculation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agofixing wrong length cal in BitmapFreelist 9166/head
Ramesh Chander [Tue, 17 May 2016 09:51:25 +0000 (02:51 -0700)]
fixing wrong length cal in BitmapFreelist

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #8350 from songbaisen/song17
Kefu Chai [Wed, 18 May 2016 02:11:54 +0000 (10:11 +0800)]
Merge pull request #8350 from songbaisen/song17

mon: do not alloc monmap on heap in Elector::dispatch()

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9026 from badone/wip-log-syslog-info
Samuel Just [Tue, 17 May 2016 19:02:58 +0000 (12:02 -0700)]
Merge pull request #9026 from badone/wip-log-syslog-info

log: Log.cc: Assign LOG_INFO priority to syslog calls

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8727 from liewegas/wip-collection-attr
Samuel Just [Tue, 17 May 2016 19:01:55 +0000 (12:01 -0700)]
Merge pull request #8727 from liewegas/wip-collection-attr

osd: remove collection attr methods from ObjectStore interface

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7638 from asheplyakov/filejournal-open-ret
Samuel Just [Tue, 17 May 2016 18:58:20 +0000 (11:58 -0700)]
Merge pull request #7638 from asheplyakov/filejournal-open-ret

FileJournal::_open: return the correct error code

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9098 from theanalyst/rgw/bucket-unused-ioctx
Casey Bodley [Tue, 17 May 2016 18:57:53 +0000 (14:57 -0400)]
Merge pull request #9098 from theanalyst/rgw/bucket-unused-ioctx

rgw_rados: remove unused ioctx for domain root in create_bucket

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7306 from branch-predictor/bp-fix-osdmap-loaderr
Samuel Just [Tue, 17 May 2016 18:57:15 +0000 (11:57 -0700)]
Merge pull request #7306 from branch-predictor/bp-fix-osdmap-loaderr

OSD/OSDService: make osdmap load error more human-understandable

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7118 from efirs/ef_rwlock_for_index_manager
Samuel Just [Tue, 17 May 2016 18:56:31 +0000 (11:56 -0700)]
Merge pull request #7118 from efirs/ef_rwlock_for_index_manager

os/fileStore: Replace Mutex with RWLock in IndexManager

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7163 from tchaikov/wip-pr-6085
Samuel Just [Tue, 17 May 2016 18:55:34 +0000 (11:55 -0700)]
Merge pull request #7163 from tchaikov/wip-pr-6085

mon: use CephOsdName for osd args instead of CephInt

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoutime.h: fix timezone issue in round_to_* funcs.Reviewed-by: Samuel Just <sjust@redha...
Samuel Just [Tue, 17 May 2016 18:54:12 +0000 (11:54 -0700)]
utime.h: fix timezone issue in round_to_* funcs.Reviewed-by: Samuel Just <sjust@redhat.com>

utime.h: fix timezone issue in round_to_* funcs.

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8259 from theanalyst/rgw/fix-15234
Casey Bodley [Tue, 17 May 2016 18:02:34 +0000 (14:02 -0400)]
Merge pull request #8259 from theanalyst/rgw/fix-15234

rgw: return -EACCESS for system requests also

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8892 from flyd1005/wip-boost-starts_with
Casey Bodley [Tue, 17 May 2016 17:52:52 +0000 (13:52 -0400)]
Merge pull request #8892 from flyd1005/wip-boost-starts_with

rgw: cleanup: use boost::algorithm::starts_with to replace our own implementations

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9109 from cbodley/wip-rgw-dup-zone
Orit Wasserman [Tue, 17 May 2016 13:06:25 +0000 (15:06 +0200)]
Merge pull request #9109 from cbodley/wip-rgw-dup-zone

rgw: radosgw-admin rejects duplicate zone names in a zonegroup
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agotest/objectstore/CMakeLists.txt: fix unittes_bit_alloc typoReviewed-by: Josh Durgin...
Josh Durgin [Mon, 16 May 2016 23:46:01 +0000 (16:46 -0700)]
test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typoReviewed-by: Josh Durgin <jdurgin@redhat.com>

test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typo

9 years agoMerge pull request #9118 from oritwas/wip-rgw-apache-realm-pull
Yehuda Sadeh [Mon, 16 May 2016 23:41:25 +0000 (16:41 -0700)]
Merge pull request #9118 from oritwas/wip-rgw-apache-realm-pull

rgw: fix realm pull and period pull for apache frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest/objectstore/CMakeLists.txt: fix unittes_bit_alloc typo 9155/head
Samuel Just [Mon, 16 May 2016 23:40:43 +0000 (16:40 -0700)]
test/objectstore/CMakeLists.txt: fix unittes_bit_alloc typo

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9152 from liewegas/wip-bitmap-allocator
Sage Weil [Mon, 16 May 2016 21:53:02 +0000 (17:53 -0400)]
Merge pull request #9152 from liewegas/wip-bitmap-allocator

os/bluestore: bitmap allocator

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: bitmap allocator 9152/head
Ramesh Chander [Tue, 10 May 2016 09:32:24 +0000 (02:32 -0700)]
os/bluestore: bitmap allocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoos/bluestore: pass size to allocator
Ramesh Chander [Mon, 16 May 2016 21:28:57 +0000 (17:28 -0400)]
os/bluestore: pass size to allocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoos/bluestore: add config for allocator
Ramesh Chander [Mon, 16 May 2016 21:30:05 +0000 (17:30 -0400)]
os/bluestore: add config for allocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com
9 years agoMerge pull request #7787 from wjwithagen/patch-1
Yuri Weinstein [Mon, 16 May 2016 20:43:51 +0000 (13:43 -0700)]
Merge pull request #7787 from wjwithagen/patch-1

clang: common/config.cc basename() requires libgen.h includes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8689 from runsisi/wip-fix-ev-sk
Yuri Weinstein [Mon, 16 May 2016 20:40:48 +0000 (13:40 -0700)]
Merge pull request #8689 from runsisi/wip-fix-ev-sk

msg/async/EventSocket: fix missing break statement

Reviewed-by: Haomai Wang <yuyuyu101@163.com>
Reviewed-by: xiexingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8717 from ZhenyuLeng/noneed_op_is_discardable
Yuri Weinstein [Mon, 16 May 2016 20:36:58 +0000 (13:36 -0700)]
Merge pull request #8717 from ZhenyuLeng/noneed_op_is_discardable

osd: make op_is_discardable check optional

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8961 from xiexingguo/xxg-wip-fixepochtrunc
Yuri Weinstein [Mon, 16 May 2016 20:34:49 +0000 (13:34 -0700)]
Merge pull request #8961 from xiexingguo/xxg-wip-fixepochtrunc

osd: don't get inc osdmap name truncated

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8985 from badone/wip-iops-typo
Yuri Weinstein [Mon, 16 May 2016 20:33:57 +0000 (13:33 -0700)]
Merge pull request #8985 from badone/wip-iops-typo

common: obj_bencher.cc add missing ":"

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9011 from stiopaa1/osdmap_removeUnneededIncludeFiles
Yuri Weinstein [Mon, 16 May 2016 20:32:41 +0000 (13:32 -0700)]
Merge pull request #9011 from stiopaa1/osdmap_removeUnneededIncludeFiles

osd/OSDMap.h: remove unneeded include files

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9075 from runsisi/wip-compute-cost
Yuri Weinstein [Mon, 16 May 2016 20:30:49 +0000 (13:30 -0700)]
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>
9 years agoMerge pull request #9077 from liewegas/wip-osd-map-cache
Yuri Weinstein [Mon, 16 May 2016 20:27:40 +0000 (13:27 -0700)]
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>
9 years agoMerge pull request #9078 from liewegas/wip-clean-temps
Yuri Weinstein [Mon, 16 May 2016 20:20:18 +0000 (13:20 -0700)]
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>
9 years agoMerge pull request #8298 from wjwithagen/wip-wjw-freebsd-autobuild-2
Kefu Chai [Mon, 16 May 2016 17:07:17 +0000 (01:07 +0800)]
Merge pull request #8298 from wjwithagen/wip-wjw-freebsd-autobuild-2

build: many fixes for freebsd

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8480 from songbaisen/song19
Sage Weil [Mon, 16 May 2016 17:02:55 +0000 (13:02 -0400)]
Merge pull request #8480 from songbaisen/song19

crush: When consider rule size use the correct method.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8974 from liewegas/wip-addr-cleanup
Sage Weil [Mon, 16 May 2016 17:02:15 +0000 (13:02 -0400)]
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>
9 years agoMerge pull request #9027 from roidayan/make-debs_avoid_creating_recursive_conf_dir
Sage Weil [Mon, 16 May 2016 17:01:26 +0000 (13:01 -0400)]
Merge pull request #9027 from roidayan/make-debs_avoid_creating_recursive_conf_dir

make-debs.sh: avoid creating recursive conf dir

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9144 from vumrao/wip-vumrao-15899
Kefu Chai [Mon, 16 May 2016 12:58:34 +0000 (20:58 +0800)]
Merge pull request #9144 from vumrao/wip-vumrao-15899

doc : adding explanation of --no-increasing for

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8452 from jcsp/wip-15266
John Spray [Mon, 16 May 2016 12:54:16 +0000 (07:54 -0500)]
Merge pull request #8452 from jcsp/wip-15266

pybind: fix unicode handling in CephFSVolumeClient::purge

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc : adding explanation of --no-increasing for 9144/head
Vikhyat Umrao [Mon, 16 May 2016 12:09:34 +0000 (17:39 +0530)]
doc : adding explanation of --no-increasing for
reweight-by-utilization and test-reweight-by-utilization
commands

Fixes: http://tracker.ceph.com/issues/15899
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agodoc/changelog: missed v10.2.1 changelog
Sage Weil [Mon, 16 May 2016 09:57:45 +0000 (05:57 -0400)]
doc/changelog: missed v10.2.1 changelog

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9141 from liewegas/wip-10.2.1
Loic Dachary [Mon, 16 May 2016 08:50:04 +0000 (10:50 +0200)]
Merge pull request #9141 from liewegas/wip-10.2.1

doc/release-notes: v10.2.1 release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc/release-notes: v10.2.1 release notes 9141/head
Sage Weil [Mon, 16 May 2016 08:37:42 +0000 (04:37 -0400)]
doc/release-notes: v10.2.1 release notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9135 from flaf/master
Sage Weil [Mon, 16 May 2016 07:48:48 +0000 (03:48 -0400)]
Merge pull request #9135 from flaf/master

doc: improvement of the "tunables" part

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: improvement of the "tunables" part 9135/head
lafont [Sun, 15 May 2016 20:31:53 +0000 (22:31 +0200)]
doc: improvement of the "tunables" part

* Some CRUSH_TUNABLES$N references were false.
* The explanations concerning the warning when tunables are
  non-optimal were false or confusing.
* Make the definition of the "default" profile clearer.

Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
9 years agoThe function op_is_discardable introduces lock overhead which can 8717/head
ZhenyuLeng [Sat, 23 Apr 2016 10:45:55 +0000 (18:45 +0800)]
The function op_is_discardable introduces lock overhead which can
The function op_is_discardable introduces lock overhead which can
not be ignored.It would be better to judge if to discard op when
the connection disconnected as a parameter whether the network is
believable or extremely unlikelihood.

add g_conf osd_discard_disconnected_ops to control whether to
discard op when the connection disconnected
Waiting for test

Signed-off-by: ZhenyuLeng <lengzhenyu@ict.ac.cn>
9 years agoMerge pull request #9124 from stiopaa1/osd_someMorePrivate
Sage Weil [Sun, 15 May 2016 22:47:29 +0000 (18:47 -0400)]
Merge pull request #9124 from stiopaa1/osd_someMorePrivate

osd/OSD.h: move some data members under private

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9128 from stiopaa1/osd_constOperatorPGQueueable
Sage Weil [Sun, 15 May 2016 22:45:59 +0000 (18:45 -0400)]
Merge pull request #9128 from stiopaa1/osd_constOperatorPGQueueable

osd/OSD: pass op() params by const in PGQueueable

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9131 from stiopaa1/compatset_removeConstructor
Sage Weil [Sun, 15 May 2016 22:43:41 +0000 (18:43 -0400)]
Merge pull request #9131 from stiopaa1/compatset_removeConstructor

common: CompatSet.h: Remove unneeded constuctor

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9132 from shinobu-x/wip-shinobu
Sage Weil [Sun, 15 May 2016 22:42:38 +0000 (18:42 -0400)]
Merge pull request #9132 from shinobu-x/wip-shinobu

cls_rbd: fix comment typo

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agosrc/cls/rbd/cls_rbd.cc: fix super trivial typo 9132/head
Shinobu Kinjo [Sun, 15 May 2016 09:01:25 +0000 (18:01 +0900)]
src/cls/rbd/cls_rbd.cc: fix super trivial typo

9 years agoCompatSet.h: Remove unneeded constuctor 9131/head
Michal Jarzabek [Sat, 14 May 2016 17:25:25 +0000 (18:25 +0100)]
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>
9 years agoosd/OSD: pass op() params by const in PGQueueable 9128/head
Michal Jarzabek [Sat, 14 May 2016 15:57:45 +0000 (16:57 +0100)]
osd/OSD: pass op() params by const in PGQueueable

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #8767 from jjhuo/org_jianjian
Loic Dachary [Sat, 14 May 2016 07:16:37 +0000 (09:16 +0200)]
Merge pull request #8767 from jjhuo/org_jianjian

.mailmap and .orgmap: organization affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd/OSD.h: move some data members under private 9124/head
Michal Jarzabek [Sun, 8 May 2016 19:30:41 +0000 (20:30 +0100)]
osd/OSD.h: move some data members under private

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9123 from idryomov/wip-qa-rbd-dont-chown
Jason Dillaman [Fri, 13 May 2016 19:52:01 +0000 (15:52 -0400)]
Merge pull request #9123 from idryomov/wip-qa-rbd-dont-chown

qa: rbd: don't modprobe, chown sysfs files or udevadm settle

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa: rbd/simple_big.sh: drop extraneous sudo 9123/head
Ilya Dryomov [Fri, 13 May 2016 15:57:12 +0000 (17:57 +0200)]
qa: rbd/simple_big.sh: drop extraneous sudo

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoqa: rbd/concurrent.sh: suppress rbd map output
Ilya Dryomov [Fri, 13 May 2016 13:05:53 +0000 (15:05 +0200)]
qa: rbd/concurrent.sh: suppress rbd map output

rbd_map_image() echoes the id of the image and is used in command
substitution:

    id=$(rbd_map_image "${image}")

Output from rbd map isn't consumed and clobbers the return.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoqa: rbd: don't modprobe, chown sysfs files or udevadm settle
Ilya Dryomov [Thu, 12 May 2016 13:07:12 +0000 (15:07 +0200)]
qa: rbd: don't modprobe, chown sysfs files or udevadm settle

This is a followup to 38a572011dbb ("qa: rbd/map-snapshot-io.sh: don't
chown sysfs files") for the rest of the workunits:

- /sys/bus/rbd/add_single_major is used if present, so chown'ing
  /sys/bus/rbd/add doesn't help.  Use sudo on rbd map instead.

- Don't modprobe or udevadm settle - rbd CLI tool takes care of that.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoos: remove collection attr methods 8727/head
Sage Weil [Fri, 22 Apr 2016 13:45:56 +0000 (09:45 -0400)]
os: remove collection attr methods

These have been deprecated since hammer, and were only kept so that you
could do an offline upgrade from firefly.  Bye bye!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/PG: drop pre-jewel pg attr method
Sage Weil [Thu, 21 Apr 2016 23:35:40 +0000 (19:35 -0400)]
osd/PG: drop pre-jewel pg attr method

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9070 from liewegas/doc-ct
Sage Weil [Fri, 13 May 2016 15:00:00 +0000 (11:00 -0400)]
Merge pull request #9070 from liewegas/doc-ct

doc: words of caution about cache tiering

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nick Fisk <nick@fisk.me.uk>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc/rados: adjust example cache tiering settings 9070/head
Sage Weil [Fri, 13 May 2016 14:27:31 +0000 (10:27 -0400)]
doc/rados: adjust example cache tiering settings

These are saner values.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/rados: words of caution about cache tiering
Sage Weil [Fri, 13 May 2016 14:27:10 +0000 (10:27 -0400)]
doc/rados: words of caution about cache tiering

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorgw: fix realm pull and period pull for apache frontend 9118/head
Orit Wasserman [Fri, 13 May 2016 13:39:32 +0000 (15:39 +0200)]
rgw: fix realm pull and period pull for apache frontend

add missing content-type and content-length headers

Fixes: http://tracker.ceph.com/issues/15846
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9110 from stiopaa1/osd_moveTickClasses
Sage Weil [Fri, 13 May 2016 13:35:46 +0000 (09:35 -0400)]
Merge pull request #9110 from stiopaa1/osd_moveTickClasses

osd: move tick classes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8887 from jcsp/wip-15689
John Spray [Fri, 13 May 2016 13:25:01 +0000 (08:25 -0500)]
Merge pull request #8887 from jcsp/wip-15689

osdc: send error to recovery waiters on shutdown

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #8835 from xiaoxichen/implement_fsync_in_pybind
John Spray [Fri, 13 May 2016 13:17:05 +0000 (08:17 -0500)]
Merge pull request #8835 from xiaoxichen/implement_fsync_in_pybind

pybind: expose fsync in cephfs binding.

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoosd/ReplicatedBackend: reuse the already computed cost 9075/head
runsisi [Wed, 11 May 2016 13:28:53 +0000 (21:28 +0800)]
osd/ReplicatedBackend: reuse the already computed cost

no need to compute the cost a second time

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agoosd/OSD.cc: add override to virtual functions 9110/head
Michal Jarzabek [Thu, 12 May 2016 19:53:16 +0000 (20:53 +0100)]
osd/OSD.cc: add override to virtual functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoosd/OSD: move C_Tick and C_Tick_WithoutOSDLock
Michal Jarzabek [Thu, 12 May 2016 19:51:55 +0000 (20:51 +0100)]
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>
9 years agorgw: RGWZoneGroup::add_zone rejects duplicate zone names 9109/head
Casey Bodley [Thu, 12 May 2016 19:13:06 +0000 (15:13 -0400)]
rgw: RGWZoneGroup::add_zone rejects duplicate zone names

Fixes: http://tracker.ceph.com/issues/15613
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoradosgw-admin: 'zone create' doesn't need to load RGWRealm
Casey Bodley [Thu, 12 May 2016 14:21:54 +0000 (10:21 -0400)]
radosgw-admin: 'zone create' doesn't need to load RGWRealm

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9079 from liewegas/wip-bluestore-freelist
Sage Weil [Thu, 12 May 2016 17:56:30 +0000 (13:56 -0400)]
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>
9 years agoMerge pull request #8956 from shinobu-x/wip-shinobu
Sage Weil [Thu, 12 May 2016 17:56:03 +0000 (13:56 -0400)]
Merge pull request #8956 from shinobu-x/wip-shinobu

os/bluestore: fix permissions on StupidAllocator.cc, cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9074 from tchaikov/wip-cmake-manpages
Kefu Chai [Thu, 12 May 2016 14:14:18 +0000 (22:14 +0800)]
Merge pull request #9074 from tchaikov/wip-cmake-manpages

cmake: build man pages

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw_rados: remove unused ioctx for domain root in create_bucket 9098/head
Abhishek Lekshmanan [Thu, 12 May 2016 14:09:23 +0000 (16:09 +0200)]
rgw_rados: remove unused ioctx for domain root in create_bucket

In `create_bucket`, we open an ioctx for domain root pool and never use
it later, removing this.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoosd/OSDMap: fix clean_temps and test 9078/head
Sage Weil [Thu, 12 May 2016 13:58:57 +0000 (09:58 -0400)]
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>
9 years agoosd/OSDMap: consolidate into clean_temps
Sage Weil [Tue, 10 May 2016 14:22:32 +0000 (10:22 -0400)]
osd/OSDMap: consolidate into clean_temps

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/OSDMap: move primary_temp checks to check_down_temps
Sage Weil [Tue, 10 May 2016 14:20:27 +0000 (10:20 -0400)]
osd/OSDMap: move primary_temp checks to check_down_temps

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/OSDMap: move redundant pg_temp check to remove_down_temps
Sage Weil [Wed, 11 May 2016 17:27:47 +0000 (13:27 -0400)]
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>
9 years agoosd/OSDMap: move old pool check to remove_down_temps
Sage Weil [Tue, 10 May 2016 14:11:41 +0000 (10:11 -0400)]
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>
9 years agoosd/OSDMap: minor optimization of remove_down_temps
Sage Weil [Tue, 10 May 2016 14:09:56 +0000 (10:09 -0400)]
osd/OSDMap: minor optimization of remove_down_temps

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocmake: restructure and add missing manpages 9074/head
Kefu Chai [Thu, 12 May 2016 05:47:49 +0000 (13:47 +0800)]
cmake: restructure and add missing manpages

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: build man pages
Kefu Chai [Wed, 11 May 2016 13:29:15 +0000 (21:29 +0800)]
cmake: build man pages

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9024 from trociny/fixup-rbd-mirror-asok
Jason Dillaman [Wed, 11 May 2016 21:13:11 +0000 (17:13 -0400)]
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>
9 years agoMerge pull request #9025 from trociny/fixup-rbd-mirror-status
Jason Dillaman [Wed, 11 May 2016 21:00:39 +0000 (17:00 -0400)]
Merge pull request #9025 from trociny/fixup-rbd-mirror-status

rbd-mirror: avoid potential deadlock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9043 from fullerdj/wip-djf-fsx-fix
Jason Dillaman [Wed, 11 May 2016 20:36:17 +0000 (16:36 -0400)]
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>
9 years agoMerge pull request #9071 from runsisi/wip-rbd-mirror-minor-cleanup
Jason Dillaman [Wed, 11 May 2016 20:28:48 +0000 (16:28 -0400)]
Merge pull request #9071 from runsisi/wip-rbd-mirror-minor-cleanup

rbd-mirror: minor cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8924 from xiexingguo/xxg-wip-monitor
Yuri Weinstein [Wed, 11 May 2016 18:47:36 +0000 (11:47 -0700)]
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>
9 years agoMerge pull request #8952 from badone/wip-i-am-osd-fix
Yuri Weinstein [Wed, 11 May 2016 18:36:07 +0000 (11:36 -0700)]
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>
9 years agoMerge pull request #8993 from XinzeChi/wip-copy-get
Yuri Weinstein [Wed, 11 May 2016 18:33:03 +0000 (11:33 -0700)]
Merge pull request #8993 from XinzeChi/wip-copy-get

osd: fix ReplicatedPG::fill_in_copy_get logic

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8995 from xiexingguo/xxg-wip-fixpingreply
Yuri Weinstein [Wed, 11 May 2016 18:31:03 +0000 (11:31 -0700)]
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>
9 years agoMerge pull request #8990 from tchaikov/wip-13990
Sage Weil [Wed, 11 May 2016 18:21:03 +0000 (14:21 -0400)]
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>
9 years agoMerge pull request #8998 from kylinstorage/wip-fix-wrong-raw-pointer-conversion
Sage Weil [Wed, 11 May 2016 18:17:52 +0000 (14:17 -0400)]
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>
9 years agoqa: rbd/map-snapshot-io.sh: don't chown sysfs files
Josh Durgin [Wed, 11 May 2016 18:14:36 +0000 (11:14 -0700)]
qa: rbd/map-snapshot-io.sh: don't chown sysfs files

qa: rbd/map-snapshot-io.sh: don't chown sysfs files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa: rbd/map-snapshot-io.sh: don't chown sysfs files 9080/head
Ilya Dryomov [Wed, 11 May 2016 15:26:39 +0000 (17:26 +0200)]
qa: rbd/map-snapshot-io.sh: don't chown sysfs files

/sys/bus/rbd/add_single_major is used if present, so chown'ing
/sys/bus/rbd/add doesn't help.  Use sudo on rbd map instead.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
9 years agoos/bluestore: switch to bitmap freelist by default 9079/head
Sage Weil [Wed, 11 May 2016 17:51:26 +0000 (13:51 -0400)]
os/bluestore: switch to bitmap freelist by default

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc/release-notes: v0.94.7 hammer
Sage Weil [Wed, 11 May 2016 17:44:53 +0000 (13:44 -0400)]
doc/release-notes: v0.94.7 hammer

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/address_helper: drop entity_addr_from_sockaddr 8974/head
Sage Weil [Wed, 11 May 2016 16:40:18 +0000 (12:40 -0400)]
common/address_helper: drop entity_addr_from_sockaddr

entity_addr_t::set_sockaddr() does this.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomsg/xio: use set_sockaddr
Sage Weil [Wed, 11 May 2016 16:39:48 +0000 (12:39 -0400)]
msg/xio: use set_sockaddr

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/address_helper: use set_sockaddr
Sage Weil [Wed, 11 May 2016 16:39:42 +0000 (12:39 -0400)]
common/address_helper: use set_sockaddr

Signed-off-by: Sage Weil <sage@redhat.com>