Commit Graph

56699 Commits

Author SHA1 Message Date
Mykola Golub
b1180740fe Merge pull request #10667 from dillaman/wip-16980
rbd-mirror: potential race condition during failure shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-11 16:04:26 +03:00
Kefu Chai
9bcc3aa7aa 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>
2016-08-11 17:13:11 +08:00
Mykola Golub
f7bfba8060 Merge pull request #10629 from ceph/dillaman-rbd-glance-docs
doc: update rbd glance configuration notes

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-11 09:16:46 +03:00
Mykola Golub
c6e561a538 Merge pull request #10627 from dillaman/wip-16970
rbd-mirror: replaying state should include flush action

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-11 09:15:38 +03:00
Sage Weil
f440aec1ba 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>
2016-08-10 17:42:18 -04:00
Sage Weil
7e19d0e728 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>
2016-08-10 17:06:54 -04:00
Jason Dillaman
74ec7c91f1 rbd-mirror: potential race condition during failure shutdown
Fixes: http://tracker.ceph.com/issues/16980
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-10 14:19:10 -04:00
Casey Bodley
fa127898c7 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>
2016-08-10 14:12:00 -04:00
Kefu Chai
ffe2c05de3 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>
2016-08-11 01:32:24 +08:00
Abhishek Lekshmanan
831640bb46 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>
2016-08-10 18:33:27 +02:00
John Spray
f83da172e0 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>
2016-08-10 17:17:51 +01:00
Kefu Chai
5444721b1d 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>
2016-08-11 00:14:17 +08:00
Casey Bodley
8662d77237 Merge pull request #10602 from smanjara/wip-16935
rgw: raise log levels for common radosgw-admin errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-10 11:33:08 -04:00
Casey Bodley
d89873b076 Merge pull request #10110 from Yan-waller/yj-wip-rgwrados-0702
rgw: remove possible duplicate setting

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-10 11:00:21 -04:00
Jason Dillaman
02d91db7b6 Merge pull request #9585 from vshankar/wip-15321
librbd: asynchronous v2 image creation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-10 09:56:02 -04:00
Jason Dillaman
a10dddc439 Merge pull request #10034 from VictorDenisov/consistency_groups_images
librbd: add consistency groups operations with images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-08-10 09:54:59 -04:00
Jason Dillaman
593558f27b doc: update rbd glance configuration notes
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-10 09:48:46 -04:00
Kefu Chai
c805ab35e8 Merge pull request #10643 from tchaikov/wip-cmake
cmake: fix wrong path introduced by bb163e9

Reviewed-by: Oleh Prypin <oleh@pryp.in>
2016-08-10 17:26:08 +08:00
Kefu Chai
2209a8c68f 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>
2016-08-10 16:47:20 +08:00
Kefu Chai
300aedd8a6 cmake: fix wrong path introduced by bb163e9
s/CYTHON_MODULE_LIB/CYTHON_MODULE_DIR/

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-08-10 15:59:30 +08:00
Shilpa Jagannath
8ff2b8e71a 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>
2016-08-10 12:17:43 +05:30
Kefu Chai
0911db3b73 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>
2016-08-10 12:07:02 +08:00
Kefu Chai
2bebfa4b25 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>
2016-08-10 11:33:40 +08:00
wenjunhuang
c97906f571 libcephfs: Fix the incorrect integer conversion in libcephfs_jni.cc
Signed-off-by: wenjunhuang <wenjunhuang@tencent.com>
2016-08-10 10:45:11 +08:00
Kefu Chai
0d41383887 Merge pull request #10568 from tchaikov/wip-cmake
cmake: specify distutils build path explicitly

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2016-08-10 10:39:25 +08:00
Kefu Chai
f4085aab91 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>
2016-08-10 10:35:59 +08:00
Kefu Chai
bb163e98c0 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>
2016-08-10 09:58:22 +08:00
Casey Bodley
253f28556c Merge pull request #10635 from linuxbox2/rgw-file-aiee
rgw_file: unlock() must precede out label

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-09 14:54:39 -04:00
Matt Benjamin
9f64f34e48 rgw_file: unlock() must precede out label
In lookup_handle(...).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-08-09 14:24:24 -04:00
Josh Durgin
2f460b7b50 Merge pull request #10623 from tchaikov/wip-16940
admin/build-doc: bypass sanity check if building doc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-08-09 08:35:24 -07:00
Kefu Chai
14f105c908 Merge pull request #10417 from wjwithagen/wip-wjw-freebsd-clang
changes for Clang and yasm

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-09 22:55:45 +08:00
Casey Bodley
aef59d5538 Merge pull request #10232 from weiqiaomiao/wqm-wip-rgw-cleanbl
rgw:clean unuse bufferlist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-09 09:43:28 -04:00
Mykola Golub
67b86b8c77 Merge pull request #10613 from dillaman/wip-16956
rbd-mirror: potential assertion failure during error-induced shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-08-09 16:18:49 +03:00
Jason Dillaman
7246f1b771 rbd-mirror: replaying state should include flush action
Fixes: http://tracker.ceph.com/issues/16970
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-08-09 08:13:30 -04:00
John Spray
b6d6fdfd01 Merge pull request #10622 from xiexingguo/xxg-wip-kill-cephfs-warn
libcephfs: kill compiling warning

Reviewed-by: John Spray <john.spray@redhat.com>
2016-08-09 12:13:16 +01:00
Nathan Cutler
1ab77924df 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>
2016-08-09 11:18:24 +02:00
Kefu Chai
133d2f9fb4 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>
2016-08-09 17:08:45 +08:00
Kefu Chai
333877023e 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>
2016-08-09 17:08:45 +08:00
Kefu Chai
2c7ec0730e Merge pull request #10612 from tchaikov/wip-16955
test/ceph_test_msgr: fix circular locking dependency

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-08-09 17:08:44 +08:00
Kefu Chai
ad2c64fc28 Merge pull request #10620 from dachary/wip-16961-subman
subman: use replace instead of format

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-09 16:50:26 +08:00
xie xingguo
954a999e22 libcephfs: kill compiling warning
As below:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1499:20: warning: ‘struct flock’ declared inside parameter list [enabled by default]
     Fh *fh, struct flock *fl, uint64_t owner);
                    ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1499:20: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
/home/jenkins-build/build/workspace/ceph-pull-requests/src/include/cephfs/libcephfs.h:1501:20: warning: ‘struct flock’ declared inside parameter list [enabled by default]
     Fh *fh, struct flock *fl, uint64_t owner, int sleep);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-08-09 16:34:21 +08:00
Loic Dachary
b006c13676 subman: use replace instead of format
Otherwise all {} are assumed to be substituted. Add a test.

Fixes: http://tracker.ceph.com/issues/16961

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2016-08-09 10:20:05 +02:00
Kefu Chai
a9a5bbe0b1 Merge pull request #10454 from SUSE/wip-quick-start
doc: add openSUSE instructions to quick-start-preflight

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-09 11:22:21 +08:00
weiqiaomiao
0a6e8486a9 rgw:clean unuse bufferlist
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-08-09 08:44:26 +08:00
Yuri Weinstein
aa5ef1dc1a Merge pull request #10526 from xiexingguo/xxg-wip-misc-2016-07-30
osd: minor performance improvements and fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-08 16:25:07 -07:00
Yuri Weinstein
94b5837b59 Merge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02
osd: more cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-08 16:24:16 -07:00
Yuri Weinstein
9efb0187ed Merge pull request #10559 from xiexingguo/xxg-wip-osd-2016-08-03
osd: drop unused variables/methods

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-08-08 16:23:46 -07:00
Nathan Cutler
d566b96ed1 doc: add openSUSE instructions to quick-start-preflight
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-08 22:59:40 +02:00
Casey Bodley
28d5af49ca Merge pull request #10212 from rzarzynski/wip-rgw-cleanup-auth
rgw: clean-up in the authentication infrastructure

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-08 15:32:31 -04:00
Casey Bodley
0fd8ad868c Merge pull request #10233 from weiqiaomiao/wqm-wip-ver_check
rgw: fix wrong  variable definition in cls_version_check func

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-08 15:30:22 -04:00