]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoos/bluestore: use hex almost everywhere
Sage Weil [Fri, 6 May 2016 18:36:33 +0000 (14:36 -0400)]
os/bluestore: use hex almost everywhere

It's like going metric, but even better!

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: remove block_map from onode
Sage Weil [Fri, 6 May 2016 18:36:04 +0000 (14:36 -0400)]
os/bluestore: remove block_map from onode

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: convert io path to extent_map
Sage Weil [Fri, 6 May 2016 18:35:49 +0000 (14:35 -0400)]
os/bluestore: convert io path to extent_map

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: add get_blob_ptr helpers
Sage Weil [Fri, 6 May 2016 18:30:45 +0000 (14:30 -0400)]
os/bluestore: add get_blob_ptr helpers

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/KernelDevice: print extents in hex
Sage Weil [Thu, 5 May 2016 17:04:06 +0000 (13:04 -0400)]
os/bluestore/KernelDevice: print extents in hex

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph_test_objectstore: show start and end offsets for buffer mismatch
Sage Weil [Fri, 6 May 2016 18:01:06 +0000 (14:01 -0400)]
ceph_test_objectstore: show start and end offsets for buffer mismatch

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: add blob_map to enode
Sage Weil [Tue, 3 May 2016 20:22:56 +0000 (16:22 -0400)]
os/bluestore: add blob_map to enode

We'll remove the old ref_map once the users go away.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: pass c to _do_read
Sage Weil [Tue, 3 May 2016 19:43:33 +0000 (15:43 -0400)]
os/bluestore: pass c to _do_read

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: add blob_map to onode_t
Sage Weil [Tue, 3 May 2016 19:07:50 +0000 (15:07 -0400)]
os/bluestore: add blob_map to onode_t

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: use pextent_t for releases
Sage Weil [Tue, 3 May 2016 20:22:24 +0000 (16:22 -0400)]
os/bluestore: use pextent_t for releases

Trying to remove the old extent_t

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: use pextent for wal_op
Sage Weil [Tue, 3 May 2016 18:25:07 +0000 (14:25 -0400)]
os/bluestore: use pextent for wal_op

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: print extents in hex
Sage Weil [Wed, 4 May 2016 18:36:49 +0000 (14:36 -0400)]
os/bluestore: print extents in hex

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix blob operator<<
Sage Weil [Fri, 6 May 2016 18:27:41 +0000 (14:27 -0400)]
os/bluestore: fix blob operator<<

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: keep an extent_ref_map for each blob
Sage Weil [Tue, 3 May 2016 20:21:48 +0000 (16:21 -0400)]
os/bluestore: keep an extent_ref_map for each blob

This lets us track which portions of a blob are still in use.  In some
cases, we may be able to split the blob to deallocate a portion of it.
In other cases, we will want this information to know whether to
recompress the blob (or whatever).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: add map and map_bl methods to blob
Sage Weil [Fri, 6 May 2016 18:25:30 +0000 (14:25 -0400)]
os/bluestore: add map and map_bl methods to blob

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: data structure to support compression/checksum verification. Read handl...
Igor Fedotov [Tue, 3 May 2016 14:24:36 +0000 (10:24 -0400)]
os/bluestore: data structure to support compression/checksum verification. Read handler prototype implementation.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9183 from yehudasa/wip-rgw-sync-retry 9410/head
Casey Bodley [Wed, 1 Jun 2016 14:52:24 +0000 (10:52 -0400)]
Merge pull request #9183 from yehudasa/wip-rgw-sync-retry

rgw: sync retry

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9073 from ukernel/wip-posixacl-fix
John Spray [Wed, 1 Jun 2016 14:37:19 +0000 (15:37 +0100)]
Merge pull request #9073 from ukernel/wip-posixacl-fix

client: fix setting empty default ACL

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9422 from liewegas/wip-bluefs
Sage Weil [Wed, 1 Jun 2016 14:28:59 +0000 (10:28 -0400)]
Merge pull request #9422 from liewegas/wip-bluefs

os/bluestore/BlueFS: wait for aios on shutdown

9 years agoMerge pull request #9343 from dachary/wip-13522-ceph-disk
Loic Dachary [Wed, 1 Jun 2016 13:39:10 +0000 (15:39 +0200)]
Merge pull request #9343 from dachary/wip-13522-ceph-disk

ceph-disk: workaround gperftool hang

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore/BlueFS: wait for aios on shutdown 9422/head
Sage Weil [Wed, 1 Jun 2016 13:14:01 +0000 (09:14 -0400)]
os/bluestore/BlueFS: wait for aios on shutdown

This fixes segv from unittest_bluefs.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoceph-disk: workaround gperftool hang 9343/head
Loic Dachary [Thu, 26 May 2016 10:55:51 +0000 (12:55 +0200)]
ceph-disk: workaround gperftool hang

Temporary workaround: if ceph-osd --mkfs does not
complete within 5 minutes, assume it is blocked
because of https://github.com/gperftools/gperftools/issues/786

References http://tracker.ceph.com/issues/13522

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoqa/workunits/fs/misc: test for setting empty ACL 9073/head
Yan, Zheng [Wed, 1 Jun 2016 09:42:24 +0000 (17:42 +0800)]
qa/workunits/fs/misc: test for setting empty ACL

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #9299 from cbodley/wip-rgw-vstart-valgrind
Yehuda Sadeh [Wed, 1 Jun 2016 09:10:20 +0000 (12:10 +0300)]
Merge pull request #9299 from cbodley/wip-rgw-vstart-valgrind

vstart: add --valgrind_rgw

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #9375 from dillaman/wip-14937
Mykola Golub [Wed, 1 Jun 2016 07:59:57 +0000 (10:59 +0300)]
Merge pull request #9375 from dillaman/wip-14937

rbd-mirror: replicate cloned images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9162 from xiexingguo/xxg-wip-fixbmap
xiexingguo [Wed, 1 Jun 2016 07:46:06 +0000 (15:46 +0800)]
Merge pull request #9162 from xiexingguo/xxg-wip-fixbmap

os/bluestore: fix bmap allocator relevant issues

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #9415 from ceph/wip-16095-parted
Boris Ranto [Wed, 1 Jun 2016 06:57:38 +0000 (08:57 +0200)]
Merge pull request #9415 from ceph/wip-16095-parted

packaging: move parted requirement to -osd subpkg

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #9406 from tchaikov/wip-doc-hyperlink-of-rados_t
Brad Hubbard [Wed, 1 Jun 2016 05:28:07 +0000 (15:28 +1000)]
Merge pull request #9406 from tchaikov/wip-doc-hyperlink-of-rados_t

doc: add breathe_domain_by_extension to conf.py

9 years agoos/bluestore/BitAllocator: set_bits() in batch 9162/head
xie xingguo [Wed, 18 May 2016 02:34:26 +0000 (10:34 +0800)]
os/bluestore/BitAllocator: set_bits() in batch

Which is simpler and faster.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/BitAllocator: fix race condition for check_bit()
xie xingguo [Wed, 18 May 2016 01:57:30 +0000 (09:57 +0800)]
os/bluestore/BitAllocator: fix race condition for check_bit()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/BitAllocator: use std namespace for atomic_*
xie xingguo [Wed, 18 May 2016 01:24:18 +0000 (09:24 +0800)]
os/bluestore/BitAllocator: use std namespace for atomic_*

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore/BitAllocator: fix is_allocated() may return false positive
xie xingguo [Tue, 17 May 2016 12:35:16 +0000 (20:35 +0800)]
os/bluestore/BitAllocator: fix is_allocated() may return false positive

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoqa/workunits/rbd: basic cloned image test 9375/head
Jason Dillaman [Thu, 26 May 2016 16:49:45 +0000 (12:49 -0400)]
qa/workunits/rbd: basic cloned image test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agopackaging: move parted requirement to -osd subpkg 9415/head
Ken Dreyer [Tue, 31 May 2016 23:50:05 +0000 (17:50 -0600)]
packaging: move parted requirement to -osd subpkg

Prior to this change, ceph-base required the "parted" package, which
meant that any installation of ceph-osd, ceph-mon, or ceph-mds would
pull in the parted package.

Move the parted dependency to ceph-osd, since ceph-disk is the only
thing that uses parted.

The advantage of this change is that Mon and MDS systems will not need
to install the parted package.

Fixes: http://tracker.ceph.com/issues/16095
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agorbd-mirror: copy snapshot parent image settings
Jason Dillaman [Thu, 26 May 2016 12:22:16 +0000 (08:22 -0400)]
rbd-mirror: copy snapshot parent image settings

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: asynchronous helper method to set parent
Jason Dillaman [Thu, 26 May 2016 16:01:15 +0000 (12:01 -0400)]
cls_rbd: asynchronous helper method to set parent

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: add support for cloning images from mirrored parent
Jason Dillaman [Wed, 25 May 2016 21:38:06 +0000 (17:38 -0400)]
rbd-mirror: add support for cloning images from mirrored parent

Fixes: http://tracker.ceph.com/issues/14937
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: extend internal API to clone from open parent image
Jason Dillaman [Wed, 25 May 2016 21:36:06 +0000 (17:36 -0400)]
librbd: extend internal API to clone from open parent image

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: asynchronous helper methods to retrieve mirror image metadata
Jason Dillaman [Wed, 25 May 2016 21:13:59 +0000 (17:13 -0400)]
cls_rbd: asynchronous helper methods to retrieve mirror image metadata

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: helper state machine to open remote/read-only images
Jason Dillaman [Wed, 25 May 2016 19:16:28 +0000 (15:16 -0400)]
rbd-mirror: helper state machine to open remote/read-only images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorgw: support size suffixes for --max-size in radosgw-admin command
Casey Bodley [Tue, 31 May 2016 19:41:24 +0000 (15:41 -0400)]
rgw: support size suffixes for --max-size in radosgw-admin command

rgw: support size suffixes for --max-size in radosgw-admin command

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoremove references to `mds destroy` in ceph-deployReviewed-by: John Wilkins
John Wilkins [Tue, 31 May 2016 19:31:19 +0000 (12:31 -0700)]
remove references to `mds destroy` in ceph-deployReviewed-by: John Wilkins

remove references to `mds destroy` in ceph-deploy

Reviewed-by: John Wilkins jowilkin@redhat.com
9 years agounittest_bluefs: debug bdev, bluefs
Sage Weil [Tue, 31 May 2016 19:01:45 +0000 (15:01 -0400)]
unittest_bluefs: debug bdev, bluefs

Hopefully this will catch the intermittent segv we are
seeing.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodoc: ceph-deploy man: remove references to mds destroy. Not implemented 9163/head
Alfredo Deza [Tue, 17 May 2016 13:33:19 +0000 (09:33 -0400)]
doc: ceph-deploy man: remove references to mds destroy. Not implemented

Signed-off-by: Alfredo Deza <adeza@redhat.com>
9 years agodoc: style fixes for gen_state_diagram
Alfredo Deza [Wed, 23 Dec 2015 16:25:13 +0000 (11:25 -0500)]
doc: style fixes for gen_state_diagram

9 years agoMerge pull request #8915 from Vicente-Cheng/wip-clean-client-lock
John Spray [Tue, 31 May 2016 17:00:46 +0000 (18:00 +0100)]
Merge pull request #8915 from Vicente-Cheng/wip-clean-client-lock

client: correct the client_lock order when cleanup

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9214 from bniver/wip-bniver-9904
John Spray [Tue, 31 May 2016 15:42:33 +0000 (16:42 +0100)]
Merge pull request #9214 from bniver/wip-bniver-9904

mds: log on bad seq

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9391 from Adirl/bug_fix_xcon
Matt Benjamin [Tue, 31 May 2016 13:41:29 +0000 (09:41 -0400)]
Merge pull request #9391 from Adirl/bug_fix_xcon

xio: clean xcon on connection teardown

Looks good--taking the new guidance as authoritative.

9 years agoMerge pull request #9137 from majianpeng/common-blkdev-accept-symbolic-link
Sage Weil [Tue, 31 May 2016 13:13:45 +0000 (09:13 -0400)]
Merge pull request #9137 from majianpeng/common-blkdev-accept-symbolic-link

common/blkdev: accept symbolic link

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agodoc: add breathe_domain_by_extension to conf.py 9406/head
Kefu Chai [Tue, 31 May 2016 10:33:08 +0000 (18:33 +0800)]
doc: add breathe_domain_by_extension to conf.py

so it can render the doxygen generated objects with the proper domain by
checking the extension of rendered source file.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9350 from rzarzynski/wip-rgw-remove-unused-token_tag
Orit Wasserman [Mon, 30 May 2016 14:00:46 +0000 (16:00 +0200)]
Merge pull request #9350 from rzarzynski/wip-rgw-remove-unused-token_tag

rgw, cleanup: drop unused variable token_tag in rgw_swift_auth.cc
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoxio: clean xcon on connection teardown 9391/head
Roi Dayan [Wed, 6 Apr 2016 05:53:10 +0000 (08:53 +0300)]
xio: clean xcon on connection teardown

Accelio could raise connection teardown event without
a disconnected/closed/refused/error event before it which will
leave the xcon reference in XioMessenger entity map and conn list
which will also cause an assertion from boost.

Signed-off-by: Roi Dayan <roid@mellanox.com>
9 years agoMerge pull request #9360 from dillaman/wip-16045
Mykola Golub [Sat, 28 May 2016 19:21:25 +0000 (22:21 +0300)]
Merge pull request #9360 from dillaman/wip-16045

rbd-mirror: support multiple replicated pools

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: cluster-level asok commands need to support multiple pools 9360/head
Jason Dillaman [Fri, 27 May 2016 15:40:58 +0000 (11:40 -0400)]
rbd-mirror: cluster-level asok commands need to support multiple pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9284 from tchaikov/wip-cmake-doc
Kefu Chai [Sat, 28 May 2016 16:05:21 +0000 (00:05 +0800)]
Merge pull request #9284 from tchaikov/wip-cmake-doc

cmake,make: speed up man page generation

Reviewed-by: François Lafont <francois.lafont@ac-versailles.fr>
9 years agoMerge pull request #8738 from xiexingguo/xxg-wip-fstool
Yuri Weinstein [Sat, 28 May 2016 15:57:42 +0000 (08:57 -0700)]
Merge pull request #8738 from xiexingguo/xxg-wip-fstool

tool/cephfs: make EventOutput::binary() idempotent

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8778 from ukernel/wip-open-symlink
Yuri Weinstein [Sat, 28 May 2016 15:56:58 +0000 (08:56 -0700)]
Merge pull request #8778 from ukernel/wip-open-symlink

mds: fix open symlink and truncate bugs

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9187 from liewegas/wip-cppool
Yuri Weinstein [Sat, 28 May 2016 15:52:43 +0000 (08:52 -0700)]
Merge pull request #9187 from liewegas/wip-cppool

rados: refuse to cppool if there are snaps; warn about user_version

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert
Yuri Weinstein [Sat, 28 May 2016 15:50:09 +0000 (08:50 -0700)]
Merge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert

mon: fix assert triggerred by the deprecated "scrubq" state

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9233 from vumrao/wip-vumrao-15809
Yuri Weinstein [Sat, 28 May 2016 15:49:20 +0000 (08:49 -0700)]
Merge pull request #9233 from vumrao/wip-vumrao-15809

mon : Display full flag in ceph status if full flag is set

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9234 from stiopaa1/osd_osdcap_preventCopyingVectorInConstructor
Yuri Weinstein [Sat, 28 May 2016 15:48:31 +0000 (08:48 -0700)]
Merge pull request #9234 from stiopaa1/osd_osdcap_preventCopyingVectorInConstructor

osd/OSDCap: prevent copying vector/strings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9262 from songbaisen/song27
Yuri Weinstein [Sat, 28 May 2016 15:46:38 +0000 (08:46 -0700)]
Merge pull request #9262 from songbaisen/song27

mon: remove the redundant judge on dispatch_op function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9298 from liewegas/wip-16012
Yuri Weinstein [Sat, 28 May 2016 15:44:53 +0000 (08:44 -0700)]
Merge pull request #9298 from liewegas/wip-16012

osd: reject rados ops with bad PARALLELEXEC flag

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9379 from ceph/wip-cmake
Kefu Chai [Sat, 28 May 2016 14:57:32 +0000 (22:57 +0800)]
Merge pull request #9379 from ceph/wip-cmake

cmake: add ObjectMapIterate.cc to librbd

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix build when WITH_RADOSGW is set OFF 9379/head
Ali Maredia [Sat, 28 May 2016 14:23:09 +0000 (10:23 -0400)]
cmake: fix build when WITH_RADOSGW is set OFF

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9382 from xiexingguo/xxg-wip-fixrbdut
Jason Dillaman [Sat, 28 May 2016 10:55:10 +0000 (06:55 -0400)]
Merge pull request #9382 from xiexingguo/xxg-wip-fixrbdut

test: fix ut failure caused by rbd usage update

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: fix ut failure caused by rbd usage update 9382/head
xie xingguo [Sat, 28 May 2016 06:32:30 +0000 (14:32 +0800)]
test: fix ut failure caused by rbd usage update

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocmake: librbd missing source file
Ali Maredia [Fri, 27 May 2016 22:06:10 +0000 (18:06 -0400)]
cmake: librbd missing source file

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9347 from tchaikov/wip-cmake
Ali Maredia [Fri, 27 May 2016 21:09:49 +0000 (17:09 -0400)]
Merge pull request #9347 from tchaikov/wip-cmake

cmake: some fixes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #8562 from ceph/wip-djf-object-map-check
Yuri Weinstein [Fri, 27 May 2016 20:07:20 +0000 (13:07 -0700)]
Merge pull request #8562 from ceph/wip-djf-object-map-check

rbd: add rbd object-map check

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9280 from zhuangzeqiang/wip15522
Yuri Weinstein [Fri, 27 May 2016 20:06:12 +0000 (13:06 -0700)]
Merge pull request #9280 from zhuangzeqiang/wip15522

rbd: check value of config override when setting image-meta

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd: check value of config override when setting image-meta 9280/head
zhuangzeqiang [Sat, 7 Oct 2017 08:52:07 +0000 (16:52 +0800)]
rbd: check value of config override when setting image-meta

Fixes: http://tracker.ceph.com/issues/15522
Signed-off-by: zhuangzeqiang <zhuang.zeqiang@h3c.com>
9 years agoMerge pull request #9326 from marcan/rbd-aio-completion
Yuri Weinstein [Fri, 27 May 2016 20:04:47 +0000 (13:04 -0700)]
Merge pull request #9326 from marcan/rbd-aio-completion

librbd: only mark async completion as done after callback

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agopybind: misc fixesReviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 27 May 2016 20:03:14 +0000 (13:03 -0700)]
pybind: misc fixesReviewed-by: Josh Durgin <jdurgin@redhat.com>

pybind: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9322 from trociny/wip-16011
Jason Dillaman [Fri, 27 May 2016 19:04:42 +0000 (15:04 -0400)]
Merge pull request #9322 from trociny/wip-16011

test: failure in journal.sh workunit test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: remove cls_lock_client from libcephfs 9347/head
Kefu Chai [Fri, 27 May 2016 15:24:17 +0000 (23:24 +0800)]
cmake: remove cls_lock_client from libcephfs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove duplicated src in osd_srcs
Kefu Chai [Fri, 27 May 2016 10:40:21 +0000 (18:40 +0800)]
cmake: remove duplicated src in osd_srcs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add libcommon to libmds
Kefu Chai [Fri, 27 May 2016 08:00:43 +0000 (16:00 +0800)]
cmake: add libcommon to libmds

MDSDaemon is using cpu_profiler_handle_command() offered by libcommon

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/ENABLE_SHARED/BUILD_SHARED_LIBS/
Kefu Chai [Thu, 26 May 2016 10:59:35 +0000 (18:59 +0800)]
cmake: s/ENABLE_SHARED/BUILD_SHARED_LIBS/

* BUILD_SHARED_LIB is a cmake variable respected by add_library().
  so we can simply expose it as an option instead of reinventing our own.
* and mark internal libraries as STATIC explicitly
* and add keyutil to librbd as secret.cc is using it. and secret.cc is
  linked into librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add dl to libcommon
Kefu Chai [Fri, 27 May 2016 05:14:20 +0000 (13:14 +0800)]
cmake: add dl to libcommon

PluginRegistry.cc uses dlopen() functions, so added it to libcommon.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add missing obj to libosd
Kefu Chai [Thu, 26 May 2016 12:54:03 +0000 (20:54 +0800)]
cmake: add missing obj to libosd

* add common_util_obj as OSD::_collect_metadata() is calling collect_sys_info(), which lives
  in util.c
* add global_common_objs as OSD::_committed_osd_maps() is calling
  queue_async_signal(), which lives in signal_handler.cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use GNUInstallDirs for defining install dest directories
Kefu Chai [Thu, 26 May 2016 10:14:35 +0000 (18:14 +0800)]
cmake: use GNUInstallDirs for defining install dest directories

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install include/memory.h also
Kefu Chai [Thu, 26 May 2016 09:26:03 +0000 (17:26 +0800)]
cmake: install include/memory.h also

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install librbd headers
Kefu Chai [Thu, 26 May 2016 09:25:28 +0000 (17:25 +0800)]
cmake: install librbd headers

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install libradosstriper headers
Kefu Chai [Thu, 26 May 2016 09:25:09 +0000 (17:25 +0800)]
cmake: install libradosstriper headers

also respect BUILD_SHARED_LIBS instead of always building this lib as a
static library. and we install .so in rpm/deb packaging scripts.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: compile rbd-fuse
Kefu Chai [Thu, 26 May 2016 08:36:20 +0000 (16:36 +0800)]
cmake: compile rbd-fuse

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install debug tools into usr/bin
Kefu Chai [Thu, 26 May 2016 08:36:02 +0000 (16:36 +0800)]
cmake: install debug tools into usr/bin

otherwise dh_install won't find them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install mount.ceph into /sbin
Kefu Chai [Thu, 26 May 2016 08:28:56 +0000 (16:28 +0800)]
cmake: install mount.ceph into /sbin

should use absolute path otherwise it is installed into /usr/sbin, and
dh_install won't find it this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install bash-completion scripts also
Kefu Chai [Thu, 26 May 2016 08:13:28 +0000 (16:13 +0800)]
cmake: install bash-completion scripts also

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add missing installs
Kefu Chai [Thu, 26 May 2016 08:12:52 +0000 (16:12 +0800)]
cmake: add missing installs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: make shared library of lttng tracing instead
Kefu Chai [Thu, 26 May 2016 08:11:49 +0000 (16:11 +0800)]
cmake: make shared library of lttng tracing instead

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: revamp on lttng support
Kefu Chai [Thu, 26 May 2016 06:32:48 +0000 (14:32 +0800)]
cmake: revamp on lttng support

* Findlttng-ust.cmake: detect lttng-gen-tp, and make it a required var
* Findlttng-ust.cmake: fix the detection of lttng
* src/tracing/CMakeLists.txt:
  - do not put the generated header files into ${CMAKE_SOURCE_DIR}/src/tracing,
    instead we should put the generated files into ${PROJECT_BINARY_DIR}/include.
  - do not compile the tracing library using the .c files in the repo,
    instead, we should generate them at compile time using lttng-gen-tp,
    and compile the genererated .c files.
* CMakeLists.txt: make the lttng-use package REQUIRED if WITH_LTTNG=ON
* src/CMakeLists.txt: let librados depend on librados-tp if LTTNG is
  enabled: librados includes tracing/librados.h. the same applies to
  librbd, libos and libosd. cmake could deduce the dependencies if we
  add the lttng header files under include/tracing into the
  corresponding target, as the lttng header files are already listed
  as OUTPUT and GENERATED files, but this requires us to put all the
  involved targets in the same CMakeLists.txt. in this case, three
  CMakeLists.txts are impacted. so we create a new target for each
  lttng header, and let the impacted target depend on it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9344 from renhwztetecs/renhw-wip-mdsdaemon
John Spray [Fri, 27 May 2016 10:55:37 +0000 (11:55 +0100)]
Merge pull request #9344 from renhwztetecs/renhw-wip-mdsdaemon

mds: mds-daemon init fixup

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9112 from renhwztetecs/renhw-wip-mdbalancer
John Spray [Fri, 27 May 2016 10:35:46 +0000 (11:35 +0100)]
Merge pull request #9112 from renhwztetecs/renhw-wip-mdbalancer

mds/mdbalancer: fixup assignment type in the hit_dir

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9335 from ceph/wip-16032-radosgw-flask
Boris Ranto [Fri, 27 May 2016 08:53:27 +0000 (10:53 +0200)]
Merge pull request #9335 from ceph/wip-16032-radosgw-flask

packaging: drop python-flask dependency from radosgw

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #9309 from dillaman/wip-15949
Mykola Golub [Fri, 27 May 2016 07:28:32 +0000 (10:28 +0300)]
Merge pull request #9309 from dillaman/wip-15949

journal: support asynchronous shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: replayer should only handle a single pool
Jason Dillaman [Fri, 27 May 2016 03:26:20 +0000 (23:26 -0400)]
rbd-mirror: replayer should only handle a single pool

The pool watcher now only needs to scan a single pool for
its associated replayer since a peer is inherently tied to
a single pool.

Fixes: http://tracker.ceph.com/issues/16045
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: group peers by local pools
Jason Dillaman [Thu, 26 May 2016 20:03:59 +0000 (16:03 -0400)]
rbd-mirror: group peers by local pools

The peer structure is automatically unique per pool due to its
UUID, so grouping local pools by a single peer doesn't work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: stop stale replayers before starting new replayers
Jason Dillaman [Wed, 25 May 2016 18:00:34 +0000 (14:00 -0400)]
rbd-mirror: stop stale replayers before starting new replayers

If the connection details are tweaked for a remote peer, stop
the existing replayer before potentially starting a new replayer
against the same remote.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: normalize debug log message prefix
Jason Dillaman [Thu, 26 May 2016 17:29:49 +0000 (13:29 -0400)]
rbd-mirror: normalize debug log message prefix

Signed-off-by: Jason Dillaman <dillaman@redhat.com>