]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon/PGMonitor: fix potential underflow 10739/head
xie xingguo [Thu, 18 Aug 2016 11:54:07 +0000 (19:54 +0800)]
mon/PGMonitor: fix potential underflow

h.h.size() could be 0(theoretically), so "h.h.size() - 1" could underflow.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/PGMonitor: drop redundant loading of dumpcontents
xie xingguo [Wed, 17 Aug 2016 06:34:01 +0000 (14:34 +0800)]
mon/PGMonitor: drop redundant loading of dumpcontents

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/PGMonitor: skip scrub checking if we can
xie xingguo [Wed, 17 Aug 2016 03:22:38 +0000 (11:22 +0800)]
mon/PGMonitor: skip scrub checking if we can

The PG-scrub checking may become expensive once the cluster
is big. Since the scrub-warn related options are defaulted to be off,
we should skip this checking when it is possible, which
is good for performance.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/OSDMonitor: drop redundant check of exists()
xie xingguo [Tue, 16 Aug 2016 06:55:31 +0000 (14:55 +0800)]
osd/OSDMonitor: drop redundant check of exists()

Which is aready included by the is_up() method.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/OSDMonitor: avoid duplicated assignment of oldest_map/newest_map
xie xingguo [Tue, 16 Aug 2016 06:34:49 +0000 (14:34 +0800)]
osd/OSDMonitor: avoid duplicated assignment of oldest_map/newest_map

As build_incremental() has done this for us.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/OSDMonitor: avoid duplicated calls when determining osdmap boundary
xie xingguo [Mon, 15 Aug 2016 09:06:27 +0000 (17:06 +0800)]
mon/OSDMonitor: avoid duplicated calls when determining osdmap boundary

We have caculdated the oldest/newest map epochs already,
so we can use it directly here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/OSDMonitor: get rid of snprintf when formatting output string
xie xingguo [Mon, 15 Aug 2016 09:00:06 +0000 (17:00 +0800)]
mon/OSDMonitor: get rid of snprintf when formatting output string

We can use the standard precision() and fixed method to achieve the same
effect.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomon/OSDMonitor: fix potential division-by-zero error
xie xingguo [Mon, 15 Aug 2016 08:40:11 +0000 (16:40 +0800)]
mon/OSDMonitor: fix potential division-by-zero error

By checking pg_num against 0, we could avoid the risk of
division-by-zero error.

Also, we limit the loop to 50 or pg_num, whichever is smaller,
when trying to generate some pg_temps randomly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10431 from ifed01/wip-bluestore-fix-csum-disable2
Sage Weil [Sat, 13 Aug 2016 20:33:14 +0000 (16:33 -0400)]
Merge pull request #10431 from ifed01/wip-bluestore-fix-csum-disable2

os/bluestore: proper handling for csum enable/disable settings

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10719 from stiopaa1/mon_pgmonitor_moveC_StatsStr
Sage Weil [Sat, 13 Aug 2016 16:56:27 +0000 (12:56 -0400)]
Merge pull request #10719 from stiopaa1/mon_pgmonitor_moveC_StatsStr

mon/PGMonitor: move C_Stats struct to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10208 from BlaXpirit/cmake-py3
Josh Durgin [Fri, 12 Aug 2016 23:30:35 +0000 (16:30 -0700)]
Merge pull request #10208 from BlaXpirit/cmake-py3

Include Python 3 bindings into the cmake build and make packages for them

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agomon/PGMonitor: move C_Stats struct to cc file 10719/head
Michal Jarzabek [Fri, 12 Aug 2016 19:37:01 +0000 (20:37 +0100)]
mon/PGMonitor: move C_Stats struct to cc file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #10685 from liewegas/wip-bluefs-extent
Sage Weil [Fri, 12 Aug 2016 19:38:22 +0000 (15:38 -0400)]
Merge pull request #10685 from liewegas/wip-bluefs-extent

os/bluestore/bluefs_types: fix extent operator<<

9 years agoMerge pull request #10676 from Yan-waller/yj-wip-rgwdocmultisite
Casey Bodley [Fri, 12 Aug 2016 18:57:23 +0000 (14:57 -0400)]
Merge pull request #10676 from Yan-waller/yj-wip-rgwdocmultisite

rgw/doc: fix indent

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10448 from pritha-srivastava/wip_s3_v2_localauth_rework
Matt Benjamin [Fri, 12 Aug 2016 17:06:17 +0000 (13:06 -0400)]
Merge pull request #10448 from pritha-srivastava/wip_s3_v2_localauth_rework

rgw: Rework of s3 v2 local authentication code.

verfied:  f23, subset of s3tests

9 years agoMerge pull request #10449 from ifed01/wip-bluestore-bluestore-perfcnt
Sage Weil [Fri, 12 Aug 2016 15:03:54 +0000 (11:03 -0400)]
Merge pull request #10449 from ifed01/wip-bluestore-bluestore-perfcnt

os/bluestore: add perf counters for compression effectiveness and space utilization measurements

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10193 from yehudasa/wip-16435
Orit Wasserman [Fri, 12 Aug 2016 14:22:20 +0000 (16:22 +0200)]
Merge pull request #10193 from yehudasa/wip-16435

rgw: fix issue 16435
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #10706 from xiexingguo/xxg-wip-fix-mondbstore
Sage Weil [Fri, 12 Aug 2016 13:40:31 +0000 (09:40 -0400)]
Merge pull request #10706 from xiexingguo/xxg-wip-fix-mondbstore

mon/MonDBStore: fix assert which never fires

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10704 from chhabaramesh/master
Sage Weil [Fri, 12 Aug 2016 13:38:39 +0000 (09:38 -0400)]
Merge pull request #10704 from chhabaramesh/master

os/bluestore/BitAllocator: batch is_allocated bit checks

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10689 from liewegas/wip-bluestore-hex-extents
Sage Weil [Fri, 12 Aug 2016 13:34:54 +0000 (09:34 -0400)]
Merge pull request #10689 from liewegas/wip-bluestore-hex-extents

os/bluestore: print bluefs_extents in hex

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
9 years agorgw: Rework of s3 v2 local authentication code. 10448/head
Pritha Srivastava [Wed, 27 Jul 2016 05:24:22 +0000 (10:54 +0530)]
rgw: Rework of s3 v2 local authentication code.

The v2 local auth code has been reworked based on the new new authentication infrastructure.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
9 years agocmake: Move Python detection back outside of pybind 10208/head
Oleh Prypin [Fri, 12 Aug 2016 09:27:34 +0000 (12:27 +0300)]
cmake: Move Python detection back outside of pybind

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agobatch is_allocated bit checks 10704/head
Ramesh Chander [Fri, 12 Aug 2016 06:27:38 +0000 (23:27 -0700)]
batch is_allocated bit checks

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10621 from tchaikov/wip-doc
Kefu Chai [Fri, 12 Aug 2016 05:21:36 +0000 (13:21 +0800)]
Merge pull request #10621 from tchaikov/wip-doc

doc: silence sphinx warnings

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #10701 from dx9/wip-run-make-cmake-args
Kefu Chai [Fri, 12 Aug 2016 03:17:23 +0000 (11:17 +0800)]
Merge pull request #10701 from dx9/wip-run-make-cmake-args

run-make-check.sh: pass args to do_cmake.sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomon/MonDBStore: fix assert which never fires 10706/head
xie xingguo [Fri, 12 Aug 2016 01:56:54 +0000 (09:56 +0800)]
mon/MonDBStore: fix assert which never fires

The condition is always true and thus the assert never fires,
which is obvious not our plan.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw/doc: fix typo and indent. 10676/head
Yan Jun [Thu, 11 Aug 2016 11:46:57 +0000 (19:46 +0800)]
rgw/doc: fix typo and indent.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
9 years agorun-make-check.sh: pass args to do_cmake.sh 10701/head
John Coyle [Fri, 12 Aug 2016 00:11:40 +0000 (20:11 -0400)]
run-make-check.sh: pass args to do_cmake.sh

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoLowered third example to keep PG count lower.
John Wilkins [Thu, 11 Aug 2016 21:41:54 +0000 (14:41 -0700)]
Lowered third example to keep PG count lower.

Signed-off-by: John Wilkins <jowilkin@redhat.com>
9 years agoMerge pull request #10638 from linuxbox2/rgw-nfs-31
Casey Bodley [Thu, 11 Aug 2016 19:33:17 +0000 (15:33 -0400)]
Merge pull request #10638 from linuxbox2/rgw-nfs-31

rgw file: remove busy-wait in RGWLibFS::gc()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw file: remove busy-wait in RGWLibFS::gc() 10638/head
Matt Benjamin [Tue, 9 Aug 2016 20:49:41 +0000 (16:49 -0400)]
rgw file: remove busy-wait in RGWLibFS::gc()

This is a background thread.  However, CPU is wasted.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoos/bluestore: print bluefs_extents in hex 10689/head
Sage Weil [Thu, 11 Aug 2016 17:19:04 +0000 (13:19 -0400)]
os/bluestore: print bluefs_extents in hex

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10670 from ceph/wip-cmake
Ali Maredia [Thu, 11 Aug 2016 17:00:22 +0000 (13:00 -0400)]
Merge pull request #10670 from ceph/wip-cmake

cmake: cleanup Findgperftools.cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10632 from ryneli/fix_ceph_buffer_list
Josh Durgin [Thu, 11 Aug 2016 16:57:42 +0000 (09:57 -0700)]
Merge pull request #10632 from ryneli/fix_ceph_buffer_list

librados: use bufferlist instead of buffer::list in public header

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10633 from dx9/wip-sig
Kefu Chai [Thu, 11 Aug 2016 16:20:33 +0000 (00:20 +0800)]
Merge pull request #10633 from dx9/wip-sig

global/signal_handler: use sig_str instead of sys_siglist

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore/bluefs_types: fix extent operator<< 10685/head
Sage Weil [Thu, 11 Aug 2016 16:16:46 +0000 (12:16 -0400)]
os/bluestore/bluefs_types: fix extent operator<<

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10634 from dx9/wip-bit-allocator
Sage Weil [Thu, 11 Aug 2016 16:17:54 +0000 (12:17 -0400)]
Merge pull request #10634 from dx9/wip-bit-allocator

bluestore/BitAllocator: Fix deadlock with musl libc

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10675 from chiehtu/fix-16996
Kefu Chai [Thu, 11 Aug 2016 16:14:40 +0000 (00:14 +0800)]
Merge pull request #10675 from chiehtu/fix-16996

doc: fix broken link in SHEC erasure code plugin

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: fix whitespace
Sage Weil [Thu, 11 Aug 2016 15:54:15 +0000 (11:54 -0400)]
os/bluestore: fix whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10215 from ifed01/wip-bluestore-blob-release-fix
Sage Weil [Thu, 11 Aug 2016 15:50:34 +0000 (11:50 -0400)]
Merge pull request #10215 from ifed01/wip-bluestore-blob-release-fix

os/bluestore: refactor dirty blob tracking along with some related fixes

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10680 from ifed01/wip-bluestore-somefix
Sage Weil [Thu, 11 Aug 2016 14:22:14 +0000 (09:22 -0500)]
Merge pull request #10680 from ifed01/wip-bluestore-somefix

os/bluestore: fix improper local var variable in collection_list meth…

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix improper local var variable in collection_list method causing Store... 10680/head
Igor Fedotov [Thu, 11 Aug 2016 14:18:42 +0000 (17:18 +0300)]
os/bluestore: fix improper local var variable in collection_list method causing StoreTest.Synthetic to fail.

Signed-off-by: Igor Fedotov <ifed@mirantis.com>
9 years agoMerge pull request #10493 from Yan-waller/yj-wip-librados-0728
Sage Weil [Thu, 11 Aug 2016 14:09:57 +0000 (09:09 -0500)]
Merge pull request #10493 from Yan-waller/yj-wip-librados-0728

rados/client: fix typo

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10669 from cbodley/wip-rgw-ldap-auth
Matt Benjamin [Thu, 11 Aug 2016 14:07:15 +0000 (10:07 -0400)]
Merge pull request #10669 from cbodley/wip-rgw-ldap-auth

rgw: fix for s3tests failure when ldap auth is not applied

9 years agorpm: Add packages for Python 3 bindings
Oleh Prypin [Tue, 9 Aug 2016 10:26:30 +0000 (13:26 +0300)]
rpm: Add packages for Python 3 bindings

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agodebian: Add packages for Python 3 bindings
Oleh Prypin [Tue, 9 Aug 2016 10:20:29 +0000 (13:20 +0300)]
debian: Add packages for Python 3 bindings

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agopybind: Make ceph_volume_client's syntax compatible with Python 3
Oleh Prypin [Mon, 8 Aug 2016 19:37:07 +0000 (22:37 +0300)]
pybind: Make ceph_volume_client's syntax compatible with Python 3
(just so it passes the bytecompilation step)

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agocmake: Also build Python bindings for Python 3
Oleh Prypin [Wed, 13 Jul 2016 12:57:30 +0000 (15:57 +0300)]
cmake: Also build Python bindings for Python 3

Signed-off-by: Oleh Prypin <oleh@pryp.in>
9 years agorgw: don't overwrite auth result if ldap is not applicable 10669/head
Casey Bodley [Wed, 10 Aug 2016 20:23:32 +0000 (16:23 -0400)]
rgw: don't overwrite auth result if ldap is not applicable

this was causing the following s3tests failure:

======================================================================
FAIL: s3tests.functional.test_s3.test_list_buckets_invalid_auth
----------------------------------------------------------------------
AssertionError: u'AccessDenied' != 'InvalidAccessKeyId'

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10667 from dillaman/wip-16980
Mykola Golub [Thu, 11 Aug 2016 13:04:26 +0000 (16:04 +0300)]
Merge pull request #10667 from dillaman/wip-16980

rbd-mirror: potential race condition during failure shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoos/bluestore: collect 'dirty' blobs on per-transaction basis to avoid onode::blob_map... 10215/head
Igor Fedotov [Thu, 7 Jul 2016 17:50:56 +0000 (20:50 +0300)]
os/bluestore: collect 'dirty' blobs on per-transaction basis to avoid onode::blob_map enumeration

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: migrate to refcounting for Blob class instances
Igor Fedotov [Thu, 7 Jul 2016 17:26:14 +0000 (20:26 +0300)]
os/bluestore: migrate to refcounting for Blob class instances

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: remove internal structures from Bluestore.h
Igor Fedotov [Thu, 7 Jul 2016 17:12:24 +0000 (20:12 +0300)]
os/bluestore: remove internal structures from Bluestore.h

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/blueStore: fix discard_unallocated for compressed blob
Igor Fedotov [Fri, 8 Jul 2016 16:29:50 +0000 (19:29 +0300)]
os/blueStore: fix discard_unallocated for compressed blob

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #10486 from badone/wip-double-free-global-static-test
Kefu Chai [Thu, 11 Aug 2016 09:13:11 +0000 (17:13 +0800)]
Merge pull request #10486 from badone/wip-double-free-global-static-test

tests: Add test for global static non-POD segfault

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix broken link in SHEC erasure code plugin 10675/head
Albert Tu [Thu, 11 Aug 2016 07:39:29 +0000 (15:39 +0800)]
doc: fix broken link in SHEC erasure code plugin

Fixes: http://tracker.ceph.com/issues/16996
Signed-off-by: Albert Tu <albert.t@inwinstack.com>
9 years agocmake: cleanup Findxio.cmake 10670/head
Kefu Chai [Thu, 11 Aug 2016 06:48:56 +0000 (14:48 +0800)]
cmake: cleanup Findxio.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: cleanup Findleveldb.cmake
Kefu Chai [Thu, 11 Aug 2016 06:48:35 +0000 (14:48 +0800)]
cmake: cleanup Findleveldb.cmake

* and reference leveldb library and include dir with fullpath

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10629 from ceph/dillaman-rbd-glance-docs
Mykola Golub [Thu, 11 Aug 2016 06:16:46 +0000 (09:16 +0300)]
Merge pull request #10629 from ceph/dillaman-rbd-glance-docs

doc: update rbd glance configuration notes

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10627 from dillaman/wip-16970
Mykola Golub [Thu, 11 Aug 2016 06:15:38 +0000 (09:15 +0300)]
Merge pull request #10627 from dillaman/wip-16970

rbd-mirror: replaying state should include flush action

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: cleanup Findgperftools.cmake
Kefu Chai [Wed, 10 Aug 2016 16:12:05 +0000 (00:12 +0800)]
cmake: cleanup Findgperftools.cmake

* remove Findtcmalloc.cmake, use Findgperftools.cmake instead.
* tcmalloc is packaged in gperftools-dev, so we can check them in a single
  place.
* fix the check of heap-profiler.h, we should enable the check as long
  as tcmalloc is enabled or profiler is enabled.
* only check gperftools headers in "include/gperftools", and do not
  "include/google" anymore. as we only support the distros which
  shipping recent gperftools-dev package with "include/gperftools".
  and "google/*.h" are deprecated.
* set ALLOC_LIBS with GPERFTOOLS_TCMALLOC_LIBRARY, so we can link
  against tcmalloc with full path.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrados: use bufferlist instead of buffer::list 10632/head
Ryne Li [Tue, 9 Aug 2016 17:27:07 +0000 (13:27 -0400)]
librados: use bufferlist instead of buffer::list

Signed-off-by: Ryne Li <lizhenqiangsnake@gmail.com>
9 years agoMerge pull request #10410 from xiexingguo/xxg-wip-bluestore-2016-07-23
Sage Weil [Wed, 10 Aug 2016 21:42:18 +0000 (17:42 -0400)]
Merge pull request #10410 from xiexingguo/xxg-wip-bluestore-2016-07-23

os/bluestore: narrow lock scope for cache trim()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10362 from xiexingguo/xxg-wip-bluefs-2016-07-20
Sage Weil [Wed, 10 Aug 2016 21:06:54 +0000 (17:06 -0400)]
Merge pull request #10362 from xiexingguo/xxg-wip-bluefs-2016-07-20

os/bluestore: fix potential access violation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agorbd-mirror: potential race condition during failure shutdown 10667/head
Jason Dillaman [Wed, 10 Aug 2016 16:50:53 +0000 (12:50 -0400)]
rbd-mirror: potential race condition during failure shutdown

Fixes: http://tracker.ceph.com/issues/16980
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10425 from theanalyst/rgw/sync-paren-warn
Casey Bodley [Wed, 10 Aug 2016 18:12:00 +0000 (14:12 -0400)]
Merge pull request #10425 from theanalyst/rgw/sync-paren-warn

rgw: kill a compile warning for rgw_sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10666 from ceph/wip-cmake
Kefu Chai [Wed, 10 Aug 2016 17:32:24 +0000 (01:32 +0800)]
Merge pull request #10666 from ceph/wip-cmake

cmake: install platlib into a subdir of build-base dir

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorgw: kill a compile warning for rgw_sync 10425/head
Abhishek Lekshmanan [Mon, 25 Jul 2016 09:21:11 +0000 (11:21 +0200)]
rgw: kill a compile warning for rgw_sync

killing the compile warning for

```
/ceph/src/rgw/rgw_sync.cc:1462:12:
warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses]
         if (can_adjust_marker) yield {
            ^
```

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10640 from vmcloud/libcephfs_jni_overflow
John Spray [Wed, 10 Aug 2016 16:17:51 +0000 (17:17 +0100)]
Merge pull request #10640 from vmcloud/libcephfs_jni_overflow

libcephfs: Fix the incorrect integer conversion in libcephfs_jni.cc

Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
9 years agocmake: install platlib into a subdir of build-base dir 10666/head
Kefu Chai [Wed, 10 Aug 2016 14:23:05 +0000 (22:23 +0800)]
cmake: install platlib into a subdir of build-base dir

distutils' install command installs all stuff under $build-base, which
includes the temporary files. and rpm packaging does not like::
  Installed (but unpackaged) file(s)
and to support both py2 and py3, we should encode the python version
into the path, otherwise the built files will be overwritten.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10602 from smanjara/wip-16935
Casey Bodley [Wed, 10 Aug 2016 15:33:08 +0000 (11:33 -0400)]
Merge pull request #10602 from smanjara/wip-16935

rgw: raise log levels for common radosgw-admin errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10110 from Yan-waller/yj-wip-rgwrados-0702
Casey Bodley [Wed, 10 Aug 2016 15:00:21 +0000 (11:00 -0400)]
Merge pull request #10110 from Yan-waller/yj-wip-rgwrados-0702

rgw: remove possible duplicate setting

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9585 from vshankar/wip-15321
Jason Dillaman [Wed, 10 Aug 2016 13:56:02 +0000 (09:56 -0400)]
Merge pull request #9585 from vshankar/wip-15321

librbd: asynchronous v2 image creation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10034 from VictorDenisov/consistency_groups_images
Jason Dillaman [Wed, 10 Aug 2016 13:54:59 +0000 (09:54 -0400)]
Merge pull request #10034 from VictorDenisov/consistency_groups_images

librbd: add consistency groups operations with images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc: update rbd glance configuration notes 10629/head
Jason Dillaman [Tue, 9 Aug 2016 13:51:18 +0000 (09:51 -0400)]
doc: update rbd glance configuration notes

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10643 from tchaikov/wip-cmake
Kefu Chai [Wed, 10 Aug 2016 09:26:08 +0000 (17:26 +0800)]
Merge pull request #10643 from tchaikov/wip-cmake

cmake: fix wrong path introduced by bb163e9

Reviewed-by: Oleh Prypin <oleh@pryp.in>
9 years agoMerge pull request #10557 from wjwithagen/wip-wjw-test-onexit
Kefu Chai [Wed, 10 Aug 2016 08:47:20 +0000 (16:47 +0800)]
Merge pull request #10557 from wjwithagen/wip-wjw-test-onexit

test: More portable use of mmap(MAP_ANON)

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix wrong path introduced by bb163e9 10643/head
Kefu Chai [Wed, 10 Aug 2016 07:59:28 +0000 (15:59 +0800)]
cmake: fix wrong path introduced by bb163e9

s/CYTHON_MODULE_LIB/CYTHON_MODULE_DIR/

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: raise log levels for common radosgw-admin errors 10602/head
Shilpa Jagannath [Sat, 6 Aug 2016 08:55:48 +0000 (14:25 +0530)]
rgw: raise log levels for common radosgw-admin errors

Currently while running radosgw-admin command we see these messages thrown at
the endusers since debug level is set to 0:

2016-08-02 14:48:28.687251 7f9e630639c0  0 Cannot find zone
id=7a2a89b9-4f5e-4f60-a29e-451ac9acc5a8 (name=us-west), switching to local
zonegroup configuration
2016-08-02 14:48:35.742185 7f9e630639c0  0 error read_lastest_epoch
.rgw.root:periods.a3db7884-2445-4bab-a165-6730f8573b8f:staging.latest_epoch

Raising the log level to 1.

Fixes: http://tracker.ceph.com/issues/16935
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
9 years agoMerge pull request #9848 from dx9/wip-ac-boost
Kefu Chai [Wed, 10 Aug 2016 04:07:02 +0000 (12:07 +0800)]
Merge pull request #9848 from dx9/wip-ac-boost

configure.ac: add _LIBS variables for boost_system and boost_iostreams

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10478 from wjwithagen/wip-wjw-freebsd-cmake-excludes
Kefu Chai [Wed, 10 Aug 2016 03:33:40 +0000 (11:33 +0800)]
Merge pull request #10478 from wjwithagen/wip-wjw-freebsd-cmake-excludes

src/CMakeLists.txt: remove unneeded libraries from ceph-dencoder target

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibcephfs: Fix the incorrect integer conversion in libcephfs_jni.cc 10640/head
wenjunhuang [Wed, 10 Aug 2016 02:45:11 +0000 (10:45 +0800)]
libcephfs: Fix the incorrect integer conversion in libcephfs_jni.cc

Signed-off-by: wenjunhuang <wenjunhuang@tencent.com>
9 years agoMerge pull request #10568 from tchaikov/wip-cmake
Kefu Chai [Wed, 10 Aug 2016 02:39:25 +0000 (10:39 +0800)]
Merge pull request #10568 from tchaikov/wip-cmake

cmake: specify distutils build path explicitly

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #10455 from wjwithagen/wip-wjw-clang-NULL
Kefu Chai [Wed, 10 Aug 2016 02:35:59 +0000 (10:35 +0800)]
Merge pull request #10455 from wjwithagen/wip-wjw-clang-NULL

src/kv/MemDB.cc: the type of the parameter of push_back() does not match the ops's value_type

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: specify distutils build path explicitly 10568/head
Kefu Chai [Thu, 4 Aug 2016 09:18:07 +0000 (17:18 +0800)]
cmake: specify distutils build path explicitly

so we don't need to replicate the logic in distutils/command/build.py
at different places.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10635 from linuxbox2/rgw-file-aiee
Casey Bodley [Tue, 9 Aug 2016 18:54:39 +0000 (14:54 -0400)]
Merge pull request #10635 from linuxbox2/rgw-file-aiee

rgw_file: unlock() must precede out label

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw_file: unlock() must precede out label 10635/head
Matt Benjamin [Tue, 9 Aug 2016 18:23:00 +0000 (14:23 -0400)]
rgw_file: unlock() must precede out label

In lookup_handle(...).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agobluestore/BitAllocator: Fix deadlock with musl libc 10634/head
John Coyle [Tue, 9 Aug 2016 17:57:42 +0000 (13:57 -0400)]
bluestore/BitAllocator: Fix deadlock with musl libc

pthread_rwlock_wrlock() behaviour is undefined when calling thread holds lock. Added unlock() in shutdown() to avoid deadlock in destructor.

http://pubs.opengroup.org/onlinepubs/7908799/xsh/pthread_rwlock_wrlock.html

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoglobal/signal_handler: use sig_str instead of sys_siglist 10633/head
John Coyle [Tue, 9 Aug 2016 17:37:14 +0000 (13:37 -0400)]
global/signal_handler: use sig_str instead of sys_siglist

musl libc does not provide sys_siglist[]

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoMerge pull request #10623 from tchaikov/wip-16940
Josh Durgin [Tue, 9 Aug 2016 15:35:24 +0000 (08:35 -0700)]
Merge pull request #10623 from tchaikov/wip-16940

admin/build-doc: bypass sanity check if building doc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10417 from wjwithagen/wip-wjw-freebsd-clang
Kefu Chai [Tue, 9 Aug 2016 14:55:45 +0000 (22:55 +0800)]
Merge pull request #10417 from wjwithagen/wip-wjw-freebsd-clang

changes for Clang and yasm

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10232 from weiqiaomiao/wqm-wip-rgw-cleanbl
Casey Bodley [Tue, 9 Aug 2016 13:43:28 +0000 (09:43 -0400)]
Merge pull request #10232 from weiqiaomiao/wqm-wip-rgw-cleanbl

rgw:clean unuse bufferlist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10613 from dillaman/wip-16956
Mykola Golub [Tue, 9 Aug 2016 13:18:49 +0000 (16:18 +0300)]
Merge pull request #10613 from dillaman/wip-16956

rbd-mirror: potential assertion failure during error-induced shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: replaying state should include flush action 10627/head
Jason Dillaman [Tue, 9 Aug 2016 12:13:30 +0000 (08:13 -0400)]
rbd-mirror: replaying state should include flush action

Fixes: http://tracker.ceph.com/issues/16970
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10622 from xiexingguo/xxg-wip-kill-cephfs-warn
John Spray [Tue, 9 Aug 2016 11:13:16 +0000 (12:13 +0100)]
Merge pull request #10622 from xiexingguo/xxg-wip-kill-cephfs-warn

libcephfs: kill compiling warning

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9744 from SUSE/wip-16345
Nathan Cutler [Tue, 9 Aug 2016 09:18:24 +0000 (11:18 +0200)]
Merge pull request #9744 from SUSE/wip-16345

rpm: fix shared library devel package names and dependencies

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoadmin/build-doc: s/iquote /iquote/ 10623/head
Kefu Chai [Tue, 9 Aug 2016 07:55:30 +0000 (15:55 +0800)]
admin/build-doc: s/iquote /iquote/

currently this works fine, but we ran into this problem before. and
technically "-iquote<dir>" is the valid syntax, and "-iquote <dir>"
is not. see https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodoc,pybind: bypass sanity check if building doc
Kefu Chai [Tue, 9 Aug 2016 07:17:18 +0000 (15:17 +0800)]
doc,pybind: bypass sanity check if building doc

the empty .so file does not compile at all, so we need to bypass the
sanity check, if we are building docs. and what sphinx needs is just the
docstrings.

Fixes: http://tracker.ceph.com/issues/16940
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10612 from tchaikov/wip-16955
Kefu Chai [Tue, 9 Aug 2016 09:08:44 +0000 (17:08 +0800)]
Merge pull request #10612 from tchaikov/wip-16955

test/ceph_test_msgr: fix circular locking dependency

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10620 from dachary/wip-16961-subman
Kefu Chai [Tue, 9 Aug 2016 08:50:26 +0000 (16:50 +0800)]
Merge pull request #10620 from dachary/wip-16961-subman

subman: use replace instead of format

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