]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomsg/async: set close on exec on server sockets
Kefu Chai [Thu, 16 Jun 2016 17:17:05 +0000 (01:17 +0800)]
msg/async: set close on exec on server sockets

mds execv() when handling the "respawn" command, to avoid fd leakage,
and enormous CLOSE_WAIT connections after respawning, we need to set
FD_CLOEXEC flag for the socket fds.

Fixes: http://tracker.ceph.com/issues/16390
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10096 from ceph/wip-dang-cmake
Sage Weil [Fri, 1 Jul 2016 18:46:26 +0000 (14:46 -0400)]
Merge pull request #10096 from ceph/wip-dang-cmake

debian: set libexec dir to correct value as autotools did

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9941 from weiqiaomiao/wqm-wip-fetchobj
Matt Benjamin [Fri, 1 Jul 2016 18:33:40 +0000 (14:33 -0400)]
Merge pull request #9941 from weiqiaomiao/wqm-wip-fetchobj

rgw: fix memory leak in RGWRados::fetch_remote_obj()

lgtm

9 years agodebian - set libexec dir to correct value as autotools did 10096/head
Daniel Gryniewicz [Fri, 1 Jul 2016 18:12:47 +0000 (14:12 -0400)]
debian - set libexec dir to correct value as autotools did

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #10082 from chhabaramesh/bitalloc_warn
Sage Weil [Fri, 1 Jul 2016 17:29:46 +0000 (13:29 -0400)]
Merge pull request #10082 from chhabaramesh/bitalloc_warn

os/bluestore: Remove bit alloc Woverloaded-virtual warnings

9 years agoMerge pull request #10068 from jcsp/wip-cephfs-doc-update
Sage Weil [Fri, 1 Jul 2016 17:28:17 +0000 (13:28 -0400)]
Merge pull request #10068 from jcsp/wip-cephfs-doc-update

doc: update CephFS "early adopters" info

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9584 from chiehtu/fix-16188
pritha-srivastava [Fri, 1 Jul 2016 16:07:12 +0000 (21:37 +0530)]
Merge pull request #9584 from chiehtu/fix-16188

rgw: fix Swift API returns double space usage

Reviewed by: Pritha Srivastava <prsrivas@redhat.com>

9 years agoMerge pull request #10000 from weiqiaomiao/wqm-wip-add-userlist-cli
Matt Benjamin [Fri, 1 Jul 2016 15:40:08 +0000 (11:40 -0400)]
Merge pull request #10000 from weiqiaomiao/wqm-wip-add-userlist-cli

rgw: add "radosgw-admin user list" cli

verified

9 years agoMerge pull request #9838 from xiexingguo/xxg-wip-fix-synthetic-client
John Spray [Fri, 1 Jul 2016 14:31:22 +0000 (15:31 +0100)]
Merge pull request #9838 from xiexingguo/xxg-wip-fix-synthetic-client

client: misc fixes

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10092 from ceph/wip-dang-cmake
Sage Weil [Fri, 1 Jul 2016 14:05:20 +0000 (10:05 -0400)]
Merge pull request #10092 from ceph/wip-dang-cmake

cmake: fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10028 from ceph/wip-cmake-readme-fixes
Sage Weil [Fri, 1 Jul 2016 13:59:53 +0000 (09:59 -0400)]
Merge pull request #10028 from ceph/wip-cmake-readme-fixes

cmake: Removed README.cmake.md, edited README.md

9 years agoinit-ceph - use sbindir, rather than hard coding sbin 10092/head
Daniel Gryniewicz [Fri, 1 Jul 2016 13:07:43 +0000 (09:07 -0400)]
init-ceph - use sbindir, rather than hard coding sbin

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoCMake - add libexecdir to the replaced variables
Daniel Gryniewicz [Fri, 1 Jul 2016 13:04:17 +0000 (09:04 -0400)]
CMake - add libexecdir to the replaced variables

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #10081 from tchaikov/wip-16556
John Spray [Fri, 1 Jul 2016 13:02:19 +0000 (14:02 +0100)]
Merge pull request #10081 from tchaikov/wip-16556

cmake: remove unnecessary linked libs from libcephfs

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10083 from trociny/wip-16539
Jason Dillaman [Fri, 1 Jul 2016 12:29:38 +0000 (08:29 -0400)]
Merge pull request #10083 from trociny/wip-16539

rbd-mirror: remove ceph_test_rbd_mirror_image_replay test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10065 from dillaman/wip-16558
Mykola Golub [Fri, 1 Jul 2016 11:19:28 +0000 (14:19 +0300)]
Merge pull request #10065 from dillaman/wip-16558

rbd-mirror: gracefully fail if object map is unavailable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: remove unnecessary linked libs from libcephfs 10081/head
Kefu Chai [Fri, 1 Jul 2016 03:09:09 +0000 (11:09 +0800)]
cmake: remove unnecessary linked libs from libcephfs

* some of the libs shares the same .cc which has static C++ variables. if
  we link against the different libs sharing the same static C++
  variables, and the dtor of the C++ variables has side-effects, among
  other things, deallocates a memory chunk. then, we are in the trouble of
  double free. so "osd" lib is removed.
* some of the libs are referenced by the linked lib, so no need to link
  against them again. for example, BLKID_LIBRARIES are linked by
  libcommon, so we can remove it from the linked libs list.
* and lib "os" and "cls_references_objs" are not used by libcephfs at all,
  so remove them.

Fixes: http://tracker.ceph.com/issues/16556
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoRemove bit alloc Woverloaded-virtual warnings 10082/head
Ramesh Chander [Fri, 1 Jul 2016 05:06:12 +0000 (22:06 -0700)]
Remove bit alloc Woverloaded-virtual warnings

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agorgw: fix double counting in RGWRados::update_containers_stats() 9584/head
Albert Tu [Tue, 28 Jun 2016 02:38:07 +0000 (10:38 +0800)]
rgw: fix double counting in RGWRados::update_containers_stats()

Fixes: http://tracker.ceph.com/issues/16188
Signed-off-by: Albert Tu <albert.t@inwinstack.com>
9 years agodoc/cephfs: rename early-adopters to best-practices 10068/head
John Spray [Thu, 30 Jun 2016 15:20:20 +0000 (16:20 +0100)]
doc/cephfs: rename early-adopters to best-practices

...and give it a link in the TOC (in addition
to where it is referenced from the top of index.rst)

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agodoc/cephfs: remove some scary warnings
John Spray [Thu, 30 Jun 2016 15:18:46 +0000 (16:18 +0100)]
doc/cephfs: remove some scary warnings

...and restructure the "early adopters" page
into a "best practices" guide.  Early adopters
are now just adopters :-)

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agocmake: Removed README.cmake.md, edited README.md 10028/head
Ali Maredia [Wed, 29 Jun 2016 20:05:26 +0000 (16:05 -0400)]
cmake: Removed README.cmake.md, edited README.md

Deleted README.cmake.md and put any helpful
information it had into README.md.

Also a added note about which tests get executed
by ctest.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9891 from diluga/rgw_socket_backlog_with_sign
Matt Benjamin [Thu, 30 Jun 2016 20:50:31 +0000 (16:50 -0400)]
Merge pull request #9891 from diluga/rgw_socket_backlog_with_sign

RGW : setting socket backlog for via ceph.conf

9 years agoMerge pull request #9852 from dx9/wip-rgw-ldap-link
Matt Benjamin [Thu, 30 Jun 2016 20:28:05 +0000 (16:28 -0400)]
Merge pull request #9852 from dx9/wip-rgw-ldap-link

rgw-ldap: add ldap lib to rgw lib deps based on build config

9 years agoMerge pull request #9931 from Yan-waller/yj-wip-rgwmainccfix
Matt Benjamin [Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)]
Merge pull request #9931 from Yan-waller/yj-wip-rgwmainccfix

rgw: remove uneccessary temporary variable and fix some indents

cosmetic changes only--build verified, f23

9 years agoMerge pull request #9979 from Yan-waller/yj-wip-rgwrests3cc
Matt Benjamin [Thu, 30 Jun 2016 19:53:02 +0000 (15:53 -0400)]
Merge pull request #9979 from Yan-waller/yj-wip-rgwrests3cc

rgw: fix potential memory leaks and remove unnecessary assignment

lgtm--should backport

9 years agoMerge pull request #10031 from yehudasa/wip-16530
Casey Bodley [Thu, 30 Jun 2016 19:02:54 +0000 (15:02 -0400)]
Merge pull request #10031 from yehudasa/wip-16530

rgw: finish error_repo cr in stop_spawned_services()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorbd-mirror: remove ceph_test_rbd_mirror_image_replay test case 10083/head
Mykola Golub [Thu, 30 Jun 2016 13:18:56 +0000 (16:18 +0300)]
rbd-mirror: remove ceph_test_rbd_mirror_image_replay test case

Fixes: http://tracker.ceph.com/issues/16539
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9985 from Yan-waller/yj-wiph-rgwopccfixstring
Matt Benjamin [Thu, 30 Jun 2016 18:05:23 +0000 (14:05 -0400)]
Merge pull request #9985 from Yan-waller/yj-wiph-rgwopccfixstring

rgw: use string::npos while 'string::find()' find nothing

lgtm--build verified, f23

9 years agoMerge pull request #9898 from liewegas/wip-bluefs-async-flush
Sage Weil [Thu, 30 Jun 2016 17:50:46 +0000 (13:50 -0400)]
Merge pull request #9898 from liewegas/wip-bluefs-async-flush

os/bluestore/BlueFS: do not hold internal lock while waiting for IO

9 years agoMerge pull request #10002 from Yan-waller/yj-wip-rgwradosccremoveunused
Matt Benjamin [Thu, 30 Jun 2016 17:49:00 +0000 (13:49 -0400)]
Merge pull request #10002 from Yan-waller/yj-wip-rgwradosccremoveunused

rgw: remove uneccessary temporary variable 'r'

lgtm--build verified, f23

9 years agoMerge pull request #10067 from liewegas/wip-do-cmake
Sage Weil [Thu, 30 Jun 2016 17:45:30 +0000 (13:45 -0400)]
Merge pull request #10067 from liewegas/wip-do-cmake

do_cmake.sh: set up initial plugin dir

9 years agoos/bluestore/BlueFS: debug statements to check log_fnode size in super block 9898/head
Varada Kari [Wed, 29 Jun 2016 13:16:04 +0000 (18:46 +0530)]
os/bluestore/BlueFS: debug statements to check log_fnode size in super block

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
9 years agoos/bluestore/Bluefs: Unit test cases for bluefs async flush
Varada Kari [Wed, 29 Jun 2016 13:13:55 +0000 (18:43 +0530)]
os/bluestore/Bluefs: Unit test cases for bluefs async flush

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
9 years agoos/bluestore/BlueFS: Make fysnc return the status
Varada Kari [Wed, 29 Jun 2016 13:12:24 +0000 (18:42 +0530)]
os/bluestore/BlueFS: Make fysnc return the status

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
9 years agoos/bluestore/BlueFS: make _sync_and_flush_log smarter
Sage Weil [Fri, 24 Jun 2016 13:43:52 +0000 (09:43 -0400)]
os/bluestore/BlueFS: make _sync_and_flush_log smarter

If we know what event we need to wait for, only wait long enough for it
to flush.  This helps the situation where another thread flushed what we
needed, and more dirty stuff was added to log_t, but we don't need to
wait for that too for our caller to be happy.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: drop lock while we flush the log
Sage Weil [Fri, 24 Jun 2016 13:23:21 +0000 (09:23 -0400)]
os/bluestore: drop lock while we flush the log

Handle cases where we have multiple racing threads trying to flush the
log by only allowing one concurrent log flush to be in progress at a time,
and behave if, after flushing, there are no more dirty records to flush.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: use existing IOContext for _write_super
Sage Weil [Thu, 23 Jun 2016 15:23:46 +0000 (11:23 -0400)]
os/bluestore/BlueFS: use existing IOContext for _write_super

We need to be careful with IOContext destruction racing with the bdev
io completion thread.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: pass unique_lock down through _fsync and log flush
Sage Weil [Fri, 24 Jun 2016 13:21:24 +0000 (09:21 -0400)]
os/bluestore/BlueFS: pass unique_lock down through _fsync and log flush

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: carry lock for mkfs
Sage Weil [Thu, 23 Jun 2016 14:10:17 +0000 (10:10 -0400)]
os/bluestore/BlueFS: carry lock for mkfs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/KernelDevice: rebuild buffer if we exceed IOV_MAX
Sage Weil [Thu, 23 Jun 2016 14:00:17 +0000 (10:00 -0400)]
os/bluestore/KernelDevice: rebuild buffer if we exceed IOV_MAX

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/buffer: assert that we do not exceed IOV_MAX in prepare_iov
Sage Weil [Thu, 23 Jun 2016 14:00:01 +0000 (10:00 -0400)]
common/buffer: assert that we do not exceed IOV_MAX in prepare_iov

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agounittest_bluefs: don't silence log
Sage Weil [Thu, 23 Jun 2016 13:55:20 +0000 (09:55 -0400)]
unittest_bluefs: don't silence log

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: _flush_bdev -> flush_bdev
Sage Weil [Thu, 23 Jun 2016 13:48:21 +0000 (09:48 -0400)]
os/bluestore/BlueFS: _flush_bdev -> flush_bdev

It is safe to call without a lock.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: drop lock while waiting for user io to complete
Sage Weil [Thu, 23 Jun 2016 13:39:31 +0000 (09:39 -0400)]
os/bluestore/BlueFS: drop lock while waiting for user io to complete

_flush_wait is safe to call without a lock, as long as our reference is
stable.  Rename it wait_for_aio() to be more clear about what it does and
the fact that it doesn't require a lock.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: track dirty by log_seq, log_seq_stable
Sage Weil [Thu, 23 Jun 2016 13:33:09 +0000 (09:33 -0400)]
os/bluestore/BlueFS: track dirty by log_seq, log_seq_stable

Note when we dirty a file, and clean it only if that seq has been
committed.  Currently this is always the case because we don't drop the
lock, but that will change shortly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: do not dirty log file when size changes
Sage Weil [Thu, 23 Jun 2016 13:26:16 +0000 (09:26 -0400)]
os/bluestore/BlueFS: do not dirty log file when size changes

We only need to dirty the log file if the allocate changes.  Replay is
smart enough to learn the file size as it goes.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: track log_seq_stable
Sage Weil [Wed, 22 Jun 2016 21:42:32 +0000 (17:42 -0400)]
os/bluestore/BlueFS: track log_seq_stable

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlueFS: _flush_log -> _flush_and_sync_log
Sage Weil [Wed, 22 Jun 2016 21:18:20 +0000 (17:18 -0400)]
os/bluestore/BlueFS: _flush_log -> _flush_and_sync_log

Be accurate.

No functional change.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10018 from ifed01/wip-bluestore-squeeze-lextents
Sage Weil [Thu, 30 Jun 2016 16:42:14 +0000 (12:42 -0400)]
Merge pull request #10018 from ifed01/wip-bluestore-squeeze-lextents

os/bluestore: apply "small encoding" for onode_t::extents map

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10059 from tchaikov/wip-cmake
Ali Maredia [Thu, 30 Jun 2016 16:30:35 +0000 (12:30 -0400)]
Merge pull request #10059 from tchaikov/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10035 from Yan-waller/yj-wip-rgwradoscc-0630
Matt Benjamin [Thu, 30 Jun 2016 16:18:18 +0000 (12:18 -0400)]
Merge pull request #10035 from Yan-waller/yj-wip-rgwradoscc-0630

rgw: fix the missing return value and remove temporary variables

lgtm, build verified f23

9 years agocmake: install rbd-replay-many and its manpage 10059/head
Kefu Chai [Thu, 30 Jun 2016 14:41:49 +0000 (22:41 +0800)]
cmake: install rbd-replay-many and its manpage

rpm packaging needs it explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10029 from wjwithagen/patch-1
Sage Weil [Thu, 30 Jun 2016 15:47:15 +0000 (11:47 -0400)]
Merge pull request #10029 from wjwithagen/patch-1

msg/async/net_handler.cc: make it more compatible with BSDs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10030 from stiopaa1/msg_asyncmess_removeCodeDup
Sage Weil [Thu, 30 Jun 2016 15:46:20 +0000 (11:46 -0400)]
Merge pull request #10030 from stiopaa1/msg_asyncmess_removeCodeDup

msg/AsyncMessenger.cc: remove code duplication

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10066 from Ved-vampir/isal_submodule
Sage Weil [Thu, 30 Jun 2016 15:39:57 +0000 (11:39 -0400)]
Merge pull request #10066 from Ved-vampir/isal_submodule

isa-l: add isa-l library as a submodule

9 years agoMerge pull request #9999 from xiexingguo/xxg-wip-bluestore-2016-06-29
Sage Weil [Thu, 30 Jun 2016 15:23:20 +0000 (11:23 -0400)]
Merge pull request #9999 from xiexingguo/xxg-wip-bluestore-2016-06-29

os/bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9946 from xiexingguo/xxg-wip-bluestore-cache
Sage Weil [Thu, 30 Jun 2016 15:22:56 +0000 (11:22 -0400)]
Merge pull request #9946 from xiexingguo/xxg-wip-bluestore-cache

os/bluestore: make trim() of 2Q cache more fine-grained

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9968 from ceph/wip-no-start-update
Sage Weil [Thu, 30 Jun 2016 15:22:08 +0000 (11:22 -0400)]
Merge pull request #9968 from ceph/wip-no-start-update

rpm: Do not start targets on update

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agocmake: add compressor_plugins as dep for libos 10067/head
Sage Weil [Thu, 30 Jun 2016 15:05:56 +0000 (11:05 -0400)]
cmake: add compressor_plugins as dep for libos

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/PluginRegistry: try $plugin_dir/$foo if $plugin_dir/$type/$foo fails
Sage Weil [Thu, 30 Jun 2016 14:54:26 +0000 (10:54 -0400)]
common/PluginRegistry: try $plugin_dir/$foo if $plugin_dir/$type/$foo fails

This is helpful for running out of a build dir, where e.g. cmake puts
stuff in lib/* and type separated into subdirs by type.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agodo_cmake.sh: create initial ceph.conf setting dirs
Sage Weil [Thu, 30 Jun 2016 14:51:55 +0000 (10:51 -0400)]
do_cmake.sh: create initial ceph.conf setting dirs

This is enough for unit tests to run.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoisa-l: add isa-l library as a submodule 10066/head
Ved-vampir [Thu, 30 Jun 2016 14:47:16 +0000 (17:47 +0300)]
isa-l: add isa-l library as a submodule
Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
9 years agoMerge pull request #9935 from xiexingguo/xxg-wip-make-zone-configurable
Sage Weil [Thu, 30 Jun 2016 14:43:38 +0000 (10:43 -0400)]
Merge pull request #9935 from xiexingguo/xxg-wip-make-zone-configurable

os/bluestore: fix memory leak during bit_alloc testing

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agorbd-mirror: gracefully fail if object map is unavailable 10065/head
Jason Dillaman [Thu, 30 Jun 2016 14:24:01 +0000 (10:24 -0400)]
rbd-mirror: gracefully fail if object map is unavailable

If the exclusive lock was lost due to a watch failure from an
overloaded cluster, gracefully abort the image sync.

Fixes: http://tracker.ceph.com/issues/16558
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9789 from batrick/i16164
John Spray [Thu, 30 Jun 2016 11:47:15 +0000 (12:47 +0100)]
Merge pull request #9789 from batrick/i16164

mds: add maximum fragment size constraint

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoos/bluestore: check against if tail_pad is already 0 9999/head
xie xingguo [Thu, 30 Jun 2016 11:31:45 +0000 (19:31 +0800)]
os/bluestore: check against if tail_pad is already 0

So we may skip the potential has_any_lextents() check.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocmake: use selinux/devel/Makefile for building selinux policy
Kefu Chai [Thu, 30 Jun 2016 05:10:58 +0000 (13:10 +0800)]
cmake: use selinux/devel/Makefile for building selinux policy

was using selinux/devel/include/Makefile, which was wrong.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install libs into ${CMAKE_INSTALL_LIBDIR}
Kefu Chai [Thu, 30 Jun 2016 07:39:52 +0000 (15:39 +0800)]
cmake: install libs into ${CMAKE_INSTALL_LIBDIR}

this address rpm build failures on amd64 platforms:

Directory not found:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/rados-classes
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/rados-classes/*
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/libos_tp.so*
File not found by glob:
/srv/autobuild-ceph/gitbuilder.git/build/rpmbuild/BUILDROOT/ceph-11.0.0-119.gcd3ee3c.x86_64/usr/lib64/libosd_tp.so*

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install systemd files
Kefu Chai [Thu, 30 Jun 2016 08:01:08 +0000 (16:01 +0800)]
cmake: install systemd files

add an option "WITH_SYSTEMD", off by default

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install ceph_test_keyvaluedb
Kefu Chai [Thu, 30 Jun 2016 10:53:02 +0000 (18:53 +0800)]
cmake: install ceph_test_keyvaluedb

qa task rados/objectstore/keyvaluedb.yaml uses it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9351 from Yan-waller/yj-hwip-rgwfixlisterr
Orit Wasserman [Thu, 30 Jun 2016 10:14:17 +0000 (12:14 +0200)]
Merge pull request #9351 from Yan-waller/yj-hwip-rgwfixlisterr

rgw/rados: remove confused error printout
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoos/bluestore: remove duplicated initialization of max_alloc_size
xie xingguo [Thu, 30 Jun 2016 03:01:18 +0000 (11:01 +0800)]
os/bluestore: remove duplicated initialization of max_alloc_size

_set_alloc_sizes() already did this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: merge _rm_buffer() to reduce code redundancy
xie xingguo [Wed, 29 Jun 2016 08:53:26 +0000 (16:53 +0800)]
os/bluestore: merge _rm_buffer() to reduce code redundancy

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: kill unused buffer state "read"
xie xingguo [Wed, 29 Jun 2016 08:07:07 +0000 (16:07 +0800)]
os/bluestore: kill unused buffer state "read"

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix potential access violation
xie xingguo [Thu, 30 Jun 2016 05:51:42 +0000 (13:51 +0800)]
os/bluestore: fix potential access violation

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix incorrect skipping of partial hole reading
xie xingguo [Thu, 30 Jun 2016 07:47:19 +0000 (15:47 +0800)]
os/bluestore: fix incorrect skipping of partial hole reading

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9700 from JiYou/fix-monitor-crush
Sage Weil [Thu, 30 Jun 2016 03:12:30 +0000 (23:12 -0400)]
Merge pull request #9700 from JiYou/fix-monitor-crush

mon: Monitor: validate prefix on handle_command()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agorgw: fix the missing return value 10035/head
Yan Jun [Thu, 30 Jun 2016 02:49:41 +0000 (10:49 +0800)]
rgw: fix the missing return value

If `get_bucket_index_object` returns an error code (-ENOTSUP)
with ivalid `hash_type`, we should return this negative error code
that resulting in `BucketShard::init` failed as expected,
oherwise it will go wrong.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agorgw: remove uneccessary temporary variable
Yan Jun [Thu, 30 Jun 2016 02:29:01 +0000 (10:29 +0800)]
rgw: remove uneccessary temporary variable

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agoos/bluestore: make trim() of 2Q cache more fine-grained 9946/head
xie xingguo [Wed, 29 Jun 2016 04:41:23 +0000 (12:41 +0800)]
os/bluestore: make trim() of 2Q cache more fine-grained

1. count total bytes as per buffer types respectively,
   so we know the exact size of each kind of buffer.

2. evict by list actual size against expected size,
   which is more accurate.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw: finish error_repo cr in stop_spawned_services() 10031/head
Yehuda Sadeh [Wed, 29 Jun 2016 21:50:12 +0000 (14:50 -0700)]
rgw: finish error_repo cr in stop_spawned_services()

Fixes: http://tracker.ceph.com/issues/16530
Need to call finish, otherwise drain_all() wouldn't be able to
drain it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #9993 from weiqiaomiao/wqm-wip-clean-bufferlist
Matt Benjamin [Wed, 29 Jun 2016 20:52:14 +0000 (16:52 -0400)]
Merge pull request #9993 from weiqiaomiao/wqm-wip-clean-bufferlist

rgw: remove unused bufferlist

(build verified, provably unused/not aliased)

9 years agoMerge pull request #10025 from tchaikov/wip-cmake
Ali Maredia [Wed, 29 Jun 2016 20:34:57 +0000 (16:34 -0400)]
Merge pull request #10025 from tchaikov/wip-cmake

cmake: install ceph_test_cls_rgw

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agorgw-ldap: add ldap lib to rgw lib deps based on build config 9852/head
John Coyle [Mon, 21 Mar 2016 14:03:56 +0000 (10:03 -0400)]
rgw-ldap: add ldap lib to rgw lib deps based on build config

Fixes autotools and Cmake linking on Alpine.

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agonet_handler.cc: make it more compatible with BSDs 10029/head
Willem Jan Withagen [Wed, 29 Jun 2016 20:34:38 +0000 (22:34 +0200)]
net_handler.cc: make it more compatible with BSDs

According the Linux manual page:
POSIX.1-2001 does not require the inclusion of <sys/types.h>, and this header file is not required on Linux.  However, some historical (BSD) implementations required this header file, and portable applications are probably wise to include it.

Submitted-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #9745 from weiqiaomiao/wqm-wip-rgw-usage
Matt Benjamin [Wed, 29 Jun 2016 19:58:24 +0000 (15:58 -0400)]
Merge pull request #9745 from weiqiaomiao/wqm-wip-rgw-usage

rgw:add missing "--staging" to radosgw-admin usage

lgtm (build verified f23)

9 years agomsg/AsyncMessenger.cc: remove code duplication 10030/head
Michal Jarzabek [Wed, 29 Jun 2016 19:57:38 +0000 (20:57 +0100)]
msg/AsyncMessenger.cc: remove code duplication

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agodebian: package etc/init.d/ceph in ceph-base 10025/head
Kefu Chai [Wed, 29 Jun 2016 18:00:29 +0000 (02:00 +0800)]
debian: package etc/init.d/ceph in ceph-base

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9606 from gregsfortytwo/wip-16002
Gregory Farnum [Wed, 29 Jun 2016 17:59:14 +0000 (10:59 -0700)]
Merge pull request #9606 from gregsfortytwo/wip-16002

ObjectCacher: fix bh_read_finish offset logic

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agocmake: install ceph_test_cls_rgw
Kefu Chai [Wed, 29 Jun 2016 17:53:12 +0000 (01:53 +0800)]
cmake: install ceph_test_cls_rgw

it is used by cls/test_cls_rgw.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9754 from dx9/wip-fix-rgw-include
Matt Benjamin [Wed, 29 Jun 2016 17:43:24 +0000 (13:43 -0400)]
Merge pull request #9754 from dx9/wip-fix-rgw-include

rgw/rgw_http_client: add compat.h include for TEMP_FAILURE_RETRY

lgtm (build verified, f23)

9 years agoMerge pull request #9994 from xiexingguo/xxg-wip-kill-client-warn
Gregory Farnum [Wed, 29 Jun 2016 17:41:13 +0000 (10:41 -0700)]
Merge pull request #9994 from xiexingguo/xxg-wip-kill-client-warn

client: kill compiling warning

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9831 from linuxbox2/wip-ssl3
Kefu Chai [Wed, 29 Jun 2016 17:34:09 +0000 (01:34 +0800)]
Merge pull request #9831 from linuxbox2/wip-ssl3

cmake: rework NSS and SSL

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9807 from Yan-waller/yj-wip-rgwtoolsadderrnostr
Matt Benjamin [Wed, 29 Jun 2016 17:29:17 +0000 (13:29 -0400)]
Merge pull request #9807 from Yan-waller/yj-wip-rgwtoolsadderrnostr

rgw: ext_mime_map_init add string describing for error number

lgtm  (build verified)

9 years agoautomake, ssl: real openssl detection, fix ssl linkage w/NSS 9831/head
Matt Benjamin [Tue, 21 Jun 2016 19:59:18 +0000 (15:59 -0400)]
automake, ssl:  real openssl detection, fix ssl linkage w/NSS

This change mainly intends to prevent linking with libssl when the
crypto provider is NSS, which provides an SSL implementation (the
implementation we must use and prefer when NSS is selected).

Secondarily, actually detect openssl when it is selected, which
happens by default and co-selects with cryptopp.  To do this, we
import the ax_check_openssl.m4 from the automake archive.

Since upstream builds now prefer NSS crypto, make this the default.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocmake: rework NSS and SSL
Matt Benjamin [Mon, 20 Jun 2016 21:21:53 +0000 (17:21 -0400)]
cmake: rework NSS and SSL

The cmake build should select NSS or CryptoPP consistently with
current autoconf logic, as used in our RHEL builds (-DWITH_NSS),
and the SSL linkage must match (for NSS, -lssl3).

With this change, there is no direct linkage with libssl when NSS
is selected (I still see indirect linkage via libcurl, in turn
via libssh2, looking into that).

With guidance from upstream and downstream, NSS builds are now
selected by default.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #9851 from cbodley/wip-rgw-tombstone-pgver
Matt Benjamin [Wed, 29 Jun 2016 15:50:50 +0000 (11:50 -0400)]
Merge pull request #9851 from cbodley/wip-rgw-tombstone-pgver

rgw: add pg_ver to tombstone_cache

9 years agoMerge pull request #9995 from tchaikov/wip-cmake
Kefu Chai [Wed, 29 Jun 2016 14:52:48 +0000 (22:52 +0800)]
Merge pull request #9995 from tchaikov/wip-cmake

cmake changes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocmake: build install libcls_numops 9995/head
Kefu Chai [Wed, 29 Jun 2016 13:37:07 +0000 (21:37 +0800)]
cmake: build install libcls_numops

test_cls_numops uses it.

Signed-off-by: Kefu Chai <kchai@redhat.com>