]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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 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 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>
9 years agolibcephfs: kill compiling warning 10622/head
xie xingguo [Tue, 9 Aug 2016 08:34:21 +0000 (16:34 +0800)]
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>
9 years agosubman: use replace instead of format 10620/head
Loic Dachary [Tue, 9 Aug 2016 07:13:17 +0000 (09:13 +0200)]
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>
9 years agoMerge pull request #10454 from SUSE/wip-quick-start
Kefu Chai [Tue, 9 Aug 2016 03:22:21 +0000 (11:22 +0800)]
Merge pull request #10454 from SUSE/wip-quick-start

doc: add openSUSE instructions to quick-start-preflight

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw:clean unuse bufferlist 10232/head
weiqiaomiao [Mon, 11 Jul 2016 01:50:54 +0000 (09:50 +0800)]
rgw:clean unuse bufferlist

Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
9 years agoMerge pull request #10526 from xiexingguo/xxg-wip-misc-2016-07-30
Yuri Weinstein [Mon, 8 Aug 2016 23:25:07 +0000 (16:25 -0700)]
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>
9 years agoMerge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02
Yuri Weinstein [Mon, 8 Aug 2016 23:24:16 +0000 (16:24 -0700)]
Merge pull request #10548 from xiexingguo/xxg-wip-osd-2016-08-02

osd: more cleanups

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10559 from xiexingguo/xxg-wip-osd-2016-08-03
Yuri Weinstein [Mon, 8 Aug 2016 23:23:46 +0000 (16:23 -0700)]
Merge pull request #10559 from xiexingguo/xxg-wip-osd-2016-08-03

osd: drop unused variables/methods

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agodoc: add openSUSE instructions to quick-start-preflight 10454/head
Nathan Cutler [Wed, 27 Jul 2016 14:37:05 +0000 (16:37 +0200)]
doc: add openSUSE instructions to quick-start-preflight

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10212 from rzarzynski/wip-rgw-cleanup-auth
Casey Bodley [Mon, 8 Aug 2016 19:32:31 +0000 (15:32 -0400)]
Merge pull request #10212 from rzarzynski/wip-rgw-cleanup-auth

rgw: clean-up in the authentication infrastructure

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10233 from weiqiaomiao/wqm-wip-ver_check
Casey Bodley [Mon, 8 Aug 2016 19:30:22 +0000 (15:30 -0400)]
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>
9 years agoMerge pull request #10594 from michelmno/forpull2
Nathan Cutler [Mon, 8 Aug 2016 18:56:10 +0000 (20:56 +0200)]
Merge pull request #10594 from michelmno/forpull2

rpm: ExclusiveArch for suse_version

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10122 from Yan-waller/yj-wiph-rgwradoscc-0704
Casey Bodley [Mon, 8 Aug 2016 18:51:28 +0000 (14:51 -0400)]
Merge pull request #10122 from Yan-waller/yj-wiph-rgwradoscc-0704

rgw: fix the missing return value

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10194 from Yan-waller/yj-wip-rgwrados-0708
Casey Bodley [Mon, 8 Aug 2016 18:46:27 +0000 (14:46 -0400)]
Merge pull request #10194 from Yan-waller/yj-wip-rgwrados-0708

rgw: remove unused bufferlist variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10203 from Yan-waller/yj-wip-rgwcache-0708
Casey Bodley [Mon, 8 Aug 2016 18:45:48 +0000 (14:45 -0400)]
Merge pull request #10203 from Yan-waller/yj-wip-rgwcache-0708

rgw: merge setting flags operation together and cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10214 from theanalyst/rgw/multisite-fwd-log-cleanup
Casey Bodley [Mon, 8 Aug 2016 18:42:32 +0000 (14:42 -0400)]
Merge pull request #10214 from theanalyst/rgw/multisite-fwd-log-cleanup

rgw: drop create_bucket in fwd_request log message

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10226 from Yan-waller/yj-wip-rgwrests3-0709
Casey Bodley [Mon, 8 Aug 2016 18:41:39 +0000 (14:41 -0400)]
Merge pull request #10226 from Yan-waller/yj-wip-rgwrests3-0709

rgw: use the standard usage of string.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorbd-mirror: potential assertion failure during error-induced shutdown 10613/head
Jason Dillaman [Mon, 8 Aug 2016 18:41:00 +0000 (14:41 -0400)]
rbd-mirror: potential assertion failure during error-induced shutdown

Fixes: http://tracker.ceph.com/issues/16956
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715
Casey Bodley [Mon, 8 Aug 2016 18:35:48 +0000 (14:35 -0400)]
Merge pull request #10299 from Yan-waller/yj-wiph-rgwmetadata-0715

rgw: miscellaneous cleanups

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10408 from weiqiaomiao/wqm-wip-rgw-lc-set
Casey Bodley [Mon, 8 Aug 2016 18:34:25 +0000 (14:34 -0400)]
Merge pull request #10408 from weiqiaomiao/wqm-wip-rgw-lc-set

rgw: fix wrong variable definition in rgw_cls_lc_set_entry function

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10562 from aclamk/wip-rgw-s3-keystone-cache-mutex
Casey Bodley [Mon, 8 Aug 2016 18:26:29 +0000 (14:26 -0400)]
Merge pull request #10562 from aclamk/wip-rgw-s3-keystone-cache-mutex

rgw: Got rid of recursive mutex.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10424 from theanalyst/rgw/mp-complete-error-msg
Casey Bodley [Mon, 8 Aug 2016 18:25:20 +0000 (14:25 -0400)]
Merge pull request #10424 from theanalyst/rgw/mp-complete-error-msg

rgw: log mp upload failures due to parts mismatch

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10475 from yonghengdexin735/wip-zzz-rgw
Casey Bodley [Mon, 8 Aug 2016 18:14:35 +0000 (14:14 -0400)]
Merge pull request #10475 from yonghengdexin735/wip-zzz-rgw

rgw/rgw_main: fix unnecessary variables defined

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805
Casey Bodley [Mon, 8 Aug 2016 18:08:37 +0000 (14:08 -0400)]
Merge pull request #10589 from Yan-waller/yj-wip-rgwcls-0805

rgw: remove unused variables

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10611 from linuxbox2/rgw-nfs-28
Casey Bodley [Mon, 8 Aug 2016 17:56:27 +0000 (13:56 -0400)]
Merge pull request #10611 from linuxbox2/rgw-nfs-28

Rgw nfs 28

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agotest/ceph_test_msgr: better looking log 10612/head
Kefu Chai [Mon, 8 Aug 2016 15:35:08 +0000 (23:35 +0800)]
test/ceph_test_msgr: better looking log

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest/ceph_test_msgr: fix a mem leak
Kefu Chai [Mon, 8 Aug 2016 15:33:34 +0000 (23:33 +0800)]
test/ceph_test_msgr: fix a mem leak

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest/ceph_test_msgr: fix circular locking dependency
Kefu Chai [Mon, 8 Aug 2016 15:20:58 +0000 (23:20 +0800)]
test/ceph_test_msgr: fix circular locking dependency

* do not acquire lock when sending message
* remove lock in session
* reduce the scope guarded by locks for better performance.

Fixes: http://tracker.ceph.com/issues/16955
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorgw nfs: fix write continuations 10611/head
Matt Benjamin [Sun, 7 Aug 2016 22:39:33 +0000 (18:39 -0400)]
rgw nfs: fix write continuations

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw nfs: don't leak fh->mtx in lookup_handle()
Matt Benjamin [Fri, 5 Aug 2016 14:03:33 +0000 (10:03 -0400)]
rgw nfs: don't leak fh->mtx in lookup_handle()

This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw file: refuse to rename directories
Matt Benjamin [Mon, 8 Aug 2016 14:18:35 +0000 (10:18 -0400)]
rgw file: refuse to rename directories

The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agorgw_file: refuse ops on deleted targets
Matt Benjamin [Wed, 3 Aug 2016 17:53:15 +0000 (13:53 -0400)]
rgw_file: refuse ops on deleted targets

Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #10598 from dillaman/wip-16882
Kefu Chai [Mon, 8 Aug 2016 04:01:49 +0000 (12:01 +0800)]
Merge pull request #10598 from dillaman/wip-16882

cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9566 from ffilz/master
John Spray [Sun, 7 Aug 2016 14:49:20 +0000 (15:49 +0100)]
Merge pull request #9566 from ffilz/master

Add ceph_ll_setlk and ceph_ll_getlk

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10452 from jcsp/wip-16556
John Spray [Sun, 7 Aug 2016 14:48:49 +0000 (15:48 +0100)]
Merge pull request #10452 from jcsp/wip-16556

test: break out librados-using cephfs test

9 years agojournaler: remove ununsed synchronous API routines 9585/head
Venky Shankar [Thu, 7 Jul 2016 06:50:52 +0000 (12:20 +0530)]
journaler: remove ununsed synchronous API routines

Synchronous callers now call the asynchronous version wrapped
around C_SaferCond. Also take care of mocked methods.

Fixes: http://tracker.ceph.com/issues/15321
Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agotest: fix CreateImageRequest unit test case
Venky Shankar [Wed, 22 Jun 2016 02:14:24 +0000 (07:44 +0530)]
test: fix CreateImageRequest unit test case

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agorbd-mirror: asynchronously create mirror images
Venky Shankar [Tue, 7 Jun 2016 11:47:54 +0000 (17:17 +0530)]
rbd-mirror: asynchronously create mirror images

Use the newly instroduced asynchronous image creation state
machine (CreateRequest) to create mirrored images.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd: minor refactor in create_v1()
Venky Shankar [Wed, 29 Jun 2016 08:25:20 +0000 (13:55 +0530)]
librbd: minor refactor in create_v1()

create_v2() uses util::generate_image_id() therefore not
requiring 'bid' to be passed in as parameter. This makes
bid generation in create() unnecessary -- hence move this
call to create_v1().

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agocls / librbd: use asynchronous image creation state machine
Venky Shankar [Mon, 27 Jun 2016 06:46:32 +0000 (12:16 +0530)]
cls / librbd: use asynchronous image creation state machine

... plus changes in rbd class library to use helpers methods.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd: helper to generate unique image id
Venky Shankar [Mon, 27 Jun 2016 06:41:45 +0000 (12:11 +0530)]
librbd: helper to generate unique image id

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd: asynchronous image creation state machine
Venky Shankar [Thu, 2 Jun 2016 17:14:21 +0000 (22:44 +0530)]
librbd: asynchronous image creation state machine

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd / journal: async journal creation state machine
Venky Shankar [Mon, 4 Jul 2016 05:13:28 +0000 (10:43 +0530)]
librbd / journal: async journal creation state machine

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agojournaler: async journal object creation
Venky Shankar [Sun, 3 Jul 2016 06:31:01 +0000 (12:01 +0530)]
journaler: async journal object creation

Introduce asynchronous journal object creation. This is
a prerequisite for asynchronous creation of rbd image
journals.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd / journal: async journal removal state machine
Venky Shankar [Tue, 5 Jul 2016 13:20:31 +0000 (18:50 +0530)]
librbd / journal: async journal removal state machine

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agojournaler: implement asynchronous remove()
Venky Shankar [Wed, 6 Jul 2016 14:18:22 +0000 (19:48 +0530)]
journaler: implement asynchronous remove()

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agojournaler: implement asynchronous exists()
Venky Shankar [Tue, 5 Jul 2016 09:33:14 +0000 (15:03 +0530)]
journaler: implement asynchronous exists()

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agojournaler: asynchronous JournalTrimmer::remove_objects()
Venky Shankar [Wed, 6 Jul 2016 16:16:11 +0000 (21:46 +0530)]
journaler: asynchronous JournalTrimmer::remove_objects()

Asynchronous removal of journal objects for a given rbd image.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd / ImageCtx: singleton safetimer instance helper
Venky Shankar [Wed, 13 Jul 2016 05:57:28 +0000 (11:27 +0530)]
librbd / ImageCtx: singleton safetimer instance helper

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agolibrbd / ImageCtx: singleton thread pool instance helper
Venky Shankar [Fri, 24 Jun 2016 08:20:52 +0000 (13:50 +0530)]
librbd / ImageCtx: singleton thread pool instance helper

Introduce static member function in ImageCtx to fetch (and
initialize) singleton thread pool.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agoMerge pull request #10574 from dillaman/wip-16923
Mykola Golub [Sun, 7 Aug 2016 10:33:45 +0000 (13:33 +0300)]
Merge pull request #10574 from dillaman/wip-16923

librbd: delay acquiring lock if image watch has failed

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10581 from dillaman/wip-16887
Mykola Golub [Sun, 7 Aug 2016 10:33:01 +0000 (13:33 +0300)]
Merge pull request #10581 from dillaman/wip-16887

librbd: prevent creation of v2 image ids that are too large

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agosrc/CMakeLists.txt: remove unneeded libraries from ceph-dencoder target 10478/head
Willem Jan Withagen [Mon, 1 Aug 2016 08:26:17 +0000 (10:26 +0200)]
src/CMakeLists.txt: remove unneeded libraries from ceph-dencoder target

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agorbd: Add images to consistency groups cli 10034/head
Victor Denisov [Tue, 28 Jun 2016 03:37:05 +0000 (20:37 -0700)]
rbd: Add images to consistency groups cli

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
9 years agolibrbd: Implement consistency group images operations
Victor Denisov [Fri, 24 Jun 2016 23:19:46 +0000 (16:19 -0700)]
librbd: Implement consistency group images operations

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
9 years agocls_rbd: Implement images in consistency groups
Victor Denisov [Sun, 24 Jul 2016 00:31:28 +0000 (17:31 -0700)]
cls_rbd: Implement images in consistency groups

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
9 years agocmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage 10598/head
Jason Dillaman [Fri, 5 Aug 2016 19:34:00 +0000 (15:34 -0400)]
cmake: correct ceph_test_librbd/ceph_test_rbd_mirror linkage

This now matches the autotools configuration and fixes the failed
assertion during test execution.

Fixes: http://tracker.ceph.com/issues/16882
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10579 from dreamhost/wip-16928
Matt Benjamin [Fri, 5 Aug 2016 19:26:57 +0000 (15:26 -0400)]
Merge pull request #10579 from dreamhost/wip-16928

rgw: Fix civetweb IPv6

verified:  autobuild

9 years agoMerge pull request #10597 from pritha-srivastava/wip_ldap_fix
Matt Benjamin [Fri, 5 Aug 2016 19:02:55 +0000 (15:02 -0400)]
Merge pull request #10597 from pritha-srivastava/wip_ldap_fix

rgw: Fix for incorrect access key id in reworked ldap auth code.

verified non-regression (MS AD)

9 years agorgw: Fix for incorrect access key id reworked ldap auth code. 10597/head
Pritha Srivastava [Fri, 5 Aug 2016 16:13:33 +0000 (21:43 +0530)]
rgw: Fix for incorrect access key id reworked ldap auth code.

The reworked ldap code does not use the correct access key id in get_policy.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
9 years agoMerge pull request #10595 from tchaikov/wip-rocksdb
Jason Dillaman [Fri, 5 Aug 2016 15:41:00 +0000 (11:41 -0400)]
Merge pull request #10595 from tchaikov/wip-rocksdb

rocksdb: revert the change introduced by dc41731

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorocksdb: revert the change introduced by dc41731 10595/head
Kefu Chai [Fri, 5 Aug 2016 15:33:52 +0000 (23:33 +0800)]
rocksdb: revert the change introduced by dc41731

dc41731 reverts the submodule reference of rocksdb, and point it to an
older version which fails to support ppc64le and AArch64.

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