]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #10397 from theanalyst/wip-rgw-non-ec
Casey Bodley [Fri, 22 Jul 2016 14:19:13 +0000 (10:19 -0400)]
Merge pull request #10397 from theanalyst/wip-rgw-non-ec

wip: rgw multisite: preserve zone's extra pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10394 from tchaikov/wip-16772
Haomai Wang [Fri, 22 Jul 2016 10:23:09 +0000 (18:23 +0800)]
Merge pull request #10394 from tchaikov/wip-16772

cmake: disable unittest_async_compressor

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #10381 from SUSE/wip-doc-rgw-cgi-warning
Orit Wasserman [Fri, 22 Jul 2016 10:01:20 +0000 (12:01 +0200)]
Merge pull request #10381 from SUSE/wip-doc-rgw-cgi-warning

doc/radosgw: rename config.rst to config-fcgi.rst
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw multisite: preserve zone's extra pool 10397/head
Abhishek Lekshmanan [Fri, 22 Jul 2016 08:57:45 +0000 (10:57 +0200)]
rgw multisite: preserve zone's extra pool

In current multisite scenarios,if a bucket is created in master, we end
up storing multipart metadata in `$source-zone.rgw.buckets.non-ec` pool
instead of the zone's own non-ec pool, so we end up additionally
creating this pool and storing multipart metadata entries in it. Also if
a bucket is created in a secondary zone, and we initiate a multipart
upload, before mdlog sync with master, we end up getting errors during
complete multipart requests as omap entries are partly stored in the
`$zone.rgw.buckets.non-ec` as well as `$source-zone.rgw.buckets.non-ec`
pools which leads to total number of parts mismatch.

Fixes: http://tracker.ceph.com/issues/16712
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agocmake: disable unittest_async_compressor 10394/head
Kefu Chai [Fri, 22 Jul 2016 08:04:28 +0000 (16:04 +0800)]
cmake: disable unittest_async_compressor

as async compressor is not used anywhere. and haomai agrees to disable
this test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8150 from wjwithagen/patch-3
Kefu Chai [Fri, 22 Jul 2016 05:39:21 +0000 (13:39 +0800)]
Merge pull request #8150 from wjwithagen/patch-3

.gitignore: exclude coredumps, logfiles and temporary testresults

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9089 from SirishaGuduru/bugfix15603
Yehuda Sadeh [Thu, 21 Jul 2016 21:12:09 +0000 (14:12 -0700)]
Merge pull request #9089 from SirishaGuduru/bugfix15603

doc: Modification for "TEST S3 ACCESS" section  in "INSTALL CEPH OBJECT GATEWAY" page

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10388 from yehudasa/wip-rgw-sync-err-injection
Casey Bodley [Thu, 21 Jul 2016 21:07:41 +0000 (17:07 -0400)]
Merge pull request #10388 from yehudasa/wip-rgw-sync-err-injection

rgw: add configurables for {data,meta} sync error injection

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add configurables for {data,meta} sync error injection 10388/head
Yehuda Sadeh [Thu, 21 Jul 2016 20:26:09 +0000 (13:26 -0700)]
rgw: add configurables for {data,meta} sync error injection

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoRevert RGW torrent
Daniel Gryniewicz [Thu, 21 Jul 2016 16:02:26 +0000 (12:02 -0400)]
Revert RGW torrent

Revert the RGW torrent commit for now, it was causing issues.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #10377 from chhabaramesh/extent_alloc
Kefu Chai [Thu, 21 Jul 2016 15:01:35 +0000 (23:01 +0800)]
Merge pull request #10377 from chhabaramesh/extent_alloc

os/bluestore:Fix size calculation in bitallocator

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9589 from zhouruisong/master
Daniel Gryniewicz [Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)]
Merge pull request #9589 from zhouruisong/master

rgw:add a s3 API of make torrent for a object

9 years agodoc/radosgw: rename config.rst to config-fcgi.rst 10381/head
Nathan Cutler [Thu, 21 Jul 2016 12:17:08 +0000 (14:17 +0200)]
doc/radosgw: rename config.rst to config-fcgi.rst

This file documents how to configure RGW to use Apache/FastCGI, so rename
the file and modify the title and intro to make that clear.

Also, add a note that CGI can pose a security risk - e.g. http://httpoxy.org

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10244 from jcsp/wip-cephfs-health-doc
John Spray [Thu, 21 Jul 2016 11:32:45 +0000 (12:32 +0100)]
Merge pull request #10244 from jcsp/wip-cephfs-health-doc

doc/cephfs: explain the various health messages

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc/cephfs: explain the various health messages 10244/head
John Spray [Thu, 7 Jul 2016 15:45:08 +0000 (16:45 +0100)]
doc/cephfs: explain the various health messages

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoos/bluestore:Fix size calculation in bitallocator 10377/head
Ramesh Chander [Thu, 21 Jul 2016 06:05:07 +0000 (23:05 -0700)]
os/bluestore:Fix size calculation in bitallocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10149 from wjwithagen/patch-12
Kefu Chai [Thu, 21 Jul 2016 09:22:10 +0000 (17:22 +0800)]
Merge pull request #10149 from wjwithagen/patch-12

CMakeList.txt: link ceph_objectstore_tool against fuse only if WITH_FUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agosrc/tools/CMakeLists.txt: conditionalise the FUSE usage 10149/head
Willem Jan Withagen [Thu, 21 Jul 2016 07:59:08 +0000 (09:59 +0200)]
src/tools/CMakeLists.txt: conditionalise the FUSE usage

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #10366 from ceph/wip-cmake-debian 10390/head
Kefu Chai [Thu, 21 Jul 2016 03:00:55 +0000 (11:00 +0800)]
Merge pull request #10366 from ceph/wip-cmake-debian

debian: bump compat to 9

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #10361 from ceph/wip-cmake
Kefu Chai [Thu, 21 Jul 2016 02:42:15 +0000 (10:42 +0800)]
Merge pull request #10361 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10355 from yehudasa/wip-16742
Yehuda Sadeh [Wed, 20 Jul 2016 22:43:40 +0000 (15:43 -0700)]
Merge pull request #10355 from yehudasa/wip-16742

rgw: back off bucket sync on failures, don't store marker

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: fix collection of object sync errors 10355/head
Yehuda Sadeh [Wed, 20 Jul 2016 19:59:50 +0000 (12:59 -0700)]
rgw: fix collection of object sync errors

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix marker tracker completion handling
Yehuda Sadeh [Wed, 20 Jul 2016 19:43:48 +0000 (12:43 -0700)]
rgw: fix marker tracker completion handling

Was not tracking high markers correctly. Could only work if there was a single
hole in the completion range. Just keep a map of all the complete entries.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: collect() stops if error encoutered
Yehuda Sadeh [Wed, 20 Jul 2016 19:42:52 +0000 (12:42 -0700)]
rgw: collect() stops if error encoutered

and returns true if needed to be called again

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agodebian: bump compat to 9 10366/head
Kefu Chai [Wed, 20 Jul 2016 09:28:40 +0000 (17:28 +0800)]
debian: bump compat to 9

dh_auto_configure set -DCMAKE_BUILD_TYPE=None so the default does not
take effect at all. this is on purpose, see [1].

and dpkg-buildflags is able to produce the suggested compiling flags by
debian policy. dh_* can pass these flags to cmake only if it works at
compat>=9, see [2].

and we are safe to move to compat 9, as jewel's supported debian based
distro is jessie (with debhelper 9.20150101), ubuntu trusty (with
debhelper 9.20131227ubuntu1)

---
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701233#35
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916

Fixes: http://tracker.ceph.com/issues/16744
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10368 from oritwas/wip-rgw-upgrade-period-commit
Casey Bodley [Wed, 20 Jul 2016 17:53:56 +0000 (13:53 -0400)]
Merge pull request #10368 from oritwas/wip-rgw-upgrade-period-commit

rgw: fix upgrade from old multisite to new multisite configuration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10360 from ceph/wip-include-include
Ali Maredia [Wed, 20 Jul 2016 16:56:34 +0000 (12:56 -0400)]
Merge pull request #10360 from ceph/wip-include-include

cmake: add_subdirectory(include)

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10315 from onyb/wip-cephfs-pypi
John Spray [Wed, 20 Jul 2016 16:34:05 +0000 (17:34 +0100)]
Merge pull request #10315 from onyb/wip-cephfs-pypi

pybind: Rework cephfs/setup.py for PyPI

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10316 from batrick/mds-standby-assertions
John Spray [Wed, 20 Jul 2016 14:43:43 +0000 (15:43 +0100)]
Merge pull request #10316 from batrick/mds-standby-assertions

mds: add assertions for standby_daemons invariant

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10347 from renhwztetecs/renhw-wip-test-add-fsdump
John Spray [Wed, 20 Jul 2016 14:43:00 +0000 (15:43 +0100)]
Merge pull request #10347 from renhwztetecs/renhw-wip-test-add-fsdump

test/mds: add fs dump in test_ceph_argparse.py

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10202 from xiaoxichen/fix_16588
John Spray [Wed, 20 Jul 2016 14:36:05 +0000 (15:36 +0100)]
Merge pull request #10202 from xiaoxichen/fix_16588

mds/MDSMap default metadata pool to -1 (was: output None instead of 0 when no fs present.)

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9864 from ajarr/wip-15615
John Spray [Wed, 20 Jul 2016 14:15:18 +0000 (15:15 +0100)]
Merge pull request #9864 from ajarr/wip-15615

ceph_volume_client: store authentication metadata

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10327 from xiexingguo/xxg-wip-bluestore-2016-07-18
Mark Nelson [Wed, 20 Jul 2016 13:28:40 +0000 (08:28 -0500)]
Merge pull request #10327 from xiexingguo/xxg-wip-bluestore-2016-07-18

os/bluestore: misc fixes/cleanups

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR may have contributed to write performance improvements along with #10257.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10257 from chhabaramesh/extent_alloc
Mark Nelson [Wed, 20 Jul 2016 13:22:31 +0000 (08:22 -0500)]
Merge pull request #10257 from chhabaramesh/extent_alloc

os/bluestore: extent alloc functionality for stupid and bitmap allocator

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR appears to result in a large sequential write performance increase (Up to ~3.5X), and may contribute to a small random write performance increase as well.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agorgw: fix upgrade from old multisite to new multisite configuration 10368/head
Orit Wasserman [Wed, 20 Jul 2016 11:02:03 +0000 (13:02 +0200)]
rgw: fix upgrade from old multisite to new multisite configuration

We need to store the updated current period after adding the old converted regions

Fixes: http://tracker.ceph.com/issues/16751
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9082 from stiopaa1/osd_TestOpsSocketHook_removeUnneededParam
Kefu Chai [Wed, 20 Jul 2016 10:07:40 +0000 (18:07 +0800)]
Merge pull request #9082 from stiopaa1/osd_TestOpsSocketHook_removeUnneededParam

pass string by const ref and add override to virtual function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9667 from SUSE/wip-15984
Boris Ranto [Wed, 20 Jul 2016 09:01:43 +0000 (11:01 +0200)]
Merge pull request #9667 from SUSE/wip-15984

ceph-osd-prestart.sh: drop Upstart-specific code

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #10339 from tchaikov/wip-16675
Kefu Chai [Wed, 20 Jul 2016 09:00:38 +0000 (17:00 +0800)]
Merge pull request #10339 from tchaikov/wip-16675

selinux: allow read /proc/<pid>/cmdline

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agocmake: remove unused Findfio.cmake 10361/head
Kefu Chai [Wed, 20 Jul 2016 08:22:29 +0000 (16:22 +0800)]
cmake: remove unused Findfio.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: Findfcgi.cmake cleanups
Kefu Chai [Wed, 20 Jul 2016 08:20:59 +0000 (16:20 +0800)]
cmake: Findfcgi.cmake cleanups

FindPackageHandleStandardArgs() takes care of the find_package()
boilderplate stuff. so no need to repeat them. and remove the checkings
in env variables.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: do not include $lrc_srcs in unittest_erasure_code_lrc
Kefu Chai [Wed, 20 Jul 2016 08:01:53 +0000 (16:01 +0800)]
cmake: do not include $lrc_srcs in unittest_erasure_code_lrc

as ${lrc_srcs} is not defined in the scope where
unittest_erasure_code_lrc is added as a target. and instead we link
unittest_erasure_code_lrc against ec_lrc dynamic library. so we can
safely remove ${lrc_srcs} from unittest_erasure_code_lrc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/EXTRA_LIBS/EXTRALIBS/
Kefu Chai [Wed, 20 Jul 2016 07:47:49 +0000 (15:47 +0800)]
cmake: s/EXTRA_LIBS/EXTRALIBS/

it's a typo, i think. as EXTRA_LIBS is never defined anywhere.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/HAVE_FUSE/WITH_FUSE/ s/HAVE_LIBFUSE/WITH_FUSE/
Kefu Chai [Wed, 20 Jul 2016 07:29:41 +0000 (15:29 +0800)]
cmake: s/HAVE_FUSE/WITH_FUSE/ s/HAVE_LIBFUSE/WITH_FUSE/

we don't define HAVE_FUSE, and HAVE_LIBFUSE is defined to be compatible
with autotools. so use WITH_FUSE in cmake whenever possible.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove $UNITTEST_CXX_FLAGS from ceph-kvstore-tool's linked libs
Kefu Chai [Wed, 20 Jul 2016 07:15:17 +0000 (15:15 +0800)]
cmake: remove $UNITTEST_CXX_FLAGS from ceph-kvstore-tool's linked libs

it does not make sense to link against CXX_FLAGS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: CMAKE_MODULE_PATH is a list and empty by default
Kefu Chai [Wed, 20 Jul 2016 07:10:45 +0000 (15:10 +0800)]
cmake: CMAKE_MODULE_PATH is a list and empty by default

we should not reference it using ${CMAKE_MODULE_PATH} before assigning
to it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add_subdirectory(include) 10360/head
Kefu Chai [Wed, 20 Jul 2016 06:45:31 +0000 (14:45 +0800)]
cmake: add_subdirectory(include)

fixes the packaging failure introduced by 741f990

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/PTHREAD_LIBS/CMAKE_THREAD_LIBS_INIT/
Kefu Chai [Wed, 20 Jul 2016 06:30:06 +0000 (14:30 +0800)]
cmake: s/PTHREAD_LIBS/CMAKE_THREAD_LIBS_INIT/

${CMAKE_THREAD_LIBS_INIT} is defined by find_package(Thread), while
PTHREAD_LIBS is defined by the acx_pthread.m4.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use HAVE_ARMV8_CRC not ${HAVE_ARMV8_CRC}
Kefu Chai [Wed, 20 Jul 2016 06:29:24 +0000 (14:29 +0800)]
cmake: use HAVE_ARMV8_CRC not ${HAVE_ARMV8_CRC}

as this variable could be undefined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use FindBacktrace instead of Findexecinfo
Kefu Chai [Wed, 20 Jul 2016 06:13:40 +0000 (14:13 +0800)]
cmake: use FindBacktrace instead of Findexecinfo

always better to use upstream cmake modules.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add "WITH_PROFILER" option
Kefu Chai [Wed, 20 Jul 2016 05:48:54 +0000 (13:48 +0800)]
cmake: add "WITH_PROFILER" option

this option matches '--with-profiler' option in autoconf. and it is off
by default. we should not link against libprofiler unless asked to do
so. this change fixes this problem.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10353 from rjfd/wip-fix-ceph-mount
Nathan Cutler [Wed, 20 Jul 2016 02:22:21 +0000 (04:22 +0200)]
Merge pull request #10353 from rjfd/wip-fix-ceph-mount

rpm: Fix creation of mount.ceph symbolic link for SUSE distros

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10351 from ceph/wip-cmake
Kefu Chai [Wed, 20 Jul 2016 02:06:29 +0000 (10:06 +0800)]
Merge pull request #10351 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agorgw: back off bucket sync on failures, don't store marker
Yehuda Sadeh [Tue, 19 Jul 2016 22:32:03 +0000 (15:32 -0700)]
rgw: back off bucket sync on failures, don't store marker

Fixes: http://tracker.ceph.com/issues/16742
If we fail on any single entry in bucket, skip updating the marker tracker
so that next time we'll go over that entry, and back off. This will trigger
a report to the data sync error repo and eventually a retry on the failing
object.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10295 from xiexingguo/xxg-wip-bluestore-2016-07-14
Mark Nelson [Tue, 19 Jul 2016 21:16:29 +0000 (16:16 -0500)]
Merge pull request #10295 from xiexingguo/xxg-wip-bluestore-2016-07-14

kv/MemDB: misc fixes and cleanups

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10294 from xiexingguo/xxg-wip-bluestore-2016-07-13
Mark Nelson [Tue, 19 Jul 2016 21:15:25 +0000 (16:15 -0500)]
Merge pull request #10294 from xiexingguo/xxg-wip-bluestore-2016-07-13

os/bluestore: use BE for gifting and reclaiming from bluefs

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10277 from xiexingguo/xxg-wip-fix-posix-fallocate
Mark Nelson [Tue, 19 Jul 2016 21:12:13 +0000 (16:12 -0500)]
Merge pull request #10277 from xiexingguo/xxg-wip-fix-posix-fallocate

os/bluestore: fix error handling of posix_fallocate()

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10249 from dillaman/wip-16622
Mykola Golub [Tue, 19 Jul 2016 17:16:04 +0000 (20:16 +0300)]
Merge pull request #10249 from dillaman/wip-16622

rbd-mirror: snap rename does not properly replicate to peers

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #10313 from ceph/objclass-perm-feedback
Kefu Chai [Tue, 19 Jul 2016 14:43:29 +0000 (22:43 +0800)]
Merge pull request #10313 from ceph/objclass-perm-feedback

Objclass perm feedback

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorpm: Fix creation of mount.ceph symbolic link for SUSE distros 10353/head
Ricardo Dias [Tue, 19 Jul 2016 14:40:36 +0000 (15:40 +0100)]
rpm: Fix creation of mount.ceph symbolic link for SUSE distros

Signed-off-by: Ricardo Dias <rdias@suse.com>
9 years agocmake: disable VTA for osdcap.cc 10351/head
Kefu Chai [Tue, 19 Jul 2016 09:30:03 +0000 (17:30 +0800)]
cmake: disable VTA for osdcap.cc

this silences the warning of:
```
In file included from
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:58:0,
                 from
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:20:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:
In member function ‘virtual void
OSDCap_AllowClassMulti_Test::TestBody()’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:6:
note: variable tracking size limit exceeded with
-fvar-tracking-assignments, retrying without
 TEST(OSDCap, AllowClassMulti) {
      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/internal/gtest-internal.h:1211:3:
note: in definition of macro ‘GTEST_TEST_CLASS_NAME_’
   test_case_name##_##test_name##_Test
   ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2181:3:
note: in expansion of macro ‘GTEST_TEST_’
   GTEST_TEST_(test_case_name, test_name, \
   ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/googletest/googletest/include/gtest/gtest.h:2187:42:
note: in expansion of macro ‘GTEST_TEST’
 # define TEST(test_case_name, test_name) GTEST_TEST(test_case_name,
 # test_name)
                                          ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/osd/osdcap.cc:766:1:
note: in expansion of macro ‘TEST’
 TEST(OSDCap, AllowClassMulti) {
 ^
```

see also b668051

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove util.cc from lib{rados,cephfs},ceph-objectstore-tool
Kefu Chai [Tue, 19 Jul 2016 06:24:45 +0000 (14:24 +0800)]
cmake: remove util.cc from lib{rados,cephfs},ceph-objectstore-tool

util.cc is included by both librados and libcephfs, the `lvm` static
variable in `lsb_release_parse()` will be free twice by them. this
could lead to double free issue. and util.cc is not used by client at all, so
remove it from them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: restructure src/CMakeLists.txt in a more hierarchical way
Kefu Chai [Tue, 19 Jul 2016 06:23:18 +0000 (14:23 +0800)]
cmake: restructure src/CMakeLists.txt in a more hierarchical way

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorbd-mirror: preprocess journal events prior to applying 10249/head
Jason Dillaman [Mon, 11 Jul 2016 19:32:45 +0000 (15:32 -0400)]
rbd-mirror: preprocess journal events prior to applying

Fixes: http://tracker.ceph.com/issues/16622
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: event preprocessor to handle snap rename operations
Jason Dillaman [Fri, 8 Jul 2016 20:19:52 +0000 (16:19 -0400)]
rbd-mirror: event preprocessor to handle snap rename operations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: improve journaling debug log messages
Jason Dillaman [Fri, 8 Jul 2016 19:16:04 +0000 (15:16 -0400)]
librbd: improve journaling debug log messages

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: separate journal event decoding and processing
Jason Dillaman [Fri, 8 Jul 2016 18:37:14 +0000 (14:37 -0400)]
librbd: separate journal event decoding and processing

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: record original snap name in snap rename journal event
Jason Dillaman [Fri, 8 Jul 2016 13:14:58 +0000 (09:14 -0400)]
librbd: record original snap name in snap rename journal event

Remote peers need a key to map snapshot ids between clusters.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: simple duplicate op checks for all maintenance operations
Jason Dillaman [Fri, 8 Jul 2016 13:13:07 +0000 (09:13 -0400)]
librbd: simple duplicate op checks for all maintenance operations

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: exercise snapshot renames within rbd-mirror test
Jason Dillaman [Fri, 8 Jul 2016 02:16:51 +0000 (22:16 -0400)]
qa/workunits/rbd: exercise snapshot renames within rbd-mirror test

Snapshot rename operations utilize the (cluster) unique snapshot
sequence to prevent attempts at replays. When mirroring to a
different cluster, these sequences will not align.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10250 from gregsfortytwo/wip-sessionmap-committing
John Spray [Tue, 19 Jul 2016 09:51:26 +0000 (10:51 +0100)]
Merge pull request #10250 from gregsfortytwo/wip-sessionmap-committing

mds: Return "committing" rather than "committed" member in get_committing

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10346 from tchaikov/wip-make-check
Kefu Chai [Tue, 19 Jul 2016 09:50:21 +0000 (17:50 +0800)]
Merge pull request #10346 from tchaikov/wip-make-check

test: ceph-disk.sh do not kill all daemons

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agotest/mds: add fs dump in test_ceph_argparse.py 10347/head
huanwen ren [Tue, 19 Jul 2016 08:45:42 +0000 (16:45 +0800)]
test/mds: add fs dump in test_ceph_argparse.py

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoRevert "run-make-check.sh: run tests in two steps" 10346/head
Kefu Chai [Tue, 19 Jul 2016 08:20:43 +0000 (16:20 +0800)]
Revert "run-make-check.sh: run tests in two steps"

This reverts commit cd0dfc305d3861b9baf332a1cc13f1c716d8017b.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoRevert "cmake: label some tests with "Racing""
Kefu Chai [Tue, 19 Jul 2016 08:08:37 +0000 (16:08 +0800)]
Revert "cmake: label some tests with "Racing""

This reverts commit 3a21d0040a7a96aefcf0f4876ee4006c4225019c.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: ceph-disk.sh: do not kill all daemons
Kefu Chai [Tue, 19 Jul 2016 08:04:18 +0000 (16:04 +0800)]
test: ceph-disk.sh: do not kill all daemons

this causes mysterious "racing" issues when running ceph-helper tests in
parallel.

Fixes: http://tracker.ceph.com/issues/16729
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agopybind: Replace -I with -iquote in cephfs test 10315/head
Anirudha Bose [Tue, 19 Jul 2016 04:34:42 +0000 (10:04 +0530)]
pybind: Replace -I with -iquote in cephfs test

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
9 years agoselinux: allow read /proc/<pid>/cmdline 10339/head
Kefu Chai [Tue, 19 Jul 2016 03:34:49 +0000 (11:34 +0800)]
selinux: allow read /proc/<pid>/cmdline

we read /proc/<pid>/cmdline to figure out who is terminating us.

Fixes: http://tracker.ceph.com/issues/16675
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10317 from wjwithagen/wip-wjw-fix-dl-lib
Kefu Chai [Tue, 19 Jul 2016 02:36:42 +0000 (10:36 +0800)]
Merge pull request #10317 from wjwithagen/wip-wjw-fix-dl-lib

Cmake: fix using CMAKE_DL_LIBS instead of dl

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomds/MDSMap output -1 instead of 0 when no fs present. 10202/head
Xiaoxi Chen [Tue, 19 Jul 2016 01:56:35 +0000 (09:56 +0800)]
mds/MDSMap output -1 instead of 0 when no fs present.

When no fs present, the mdsmap::dump will output metadata_pool: 0,
which is misleading.

Change the initial value of metadata_pool from 0 to -1.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
9 years agoMerge pull request #10147 from SUSE/wip-16598
Nathan Cutler [Tue, 19 Jul 2016 00:28:15 +0000 (02:28 +0200)]
Merge pull request #10147 from SUSE/wip-16598

rpm: move mount.ceph from ceph-base to ceph-common and add symlink in /sbin for SUSE

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com
9 years agoMerge pull request #9411 from ceph/wip-rocksdb-perf
Yuri Weinstein [Mon, 18 Jul 2016 23:28:21 +0000 (16:28 -0700)]
Merge pull request #9411 from ceph/wip-rocksdb-perf

os/RocksDBStore: use effective Get API instead of iterator api

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10130 from yonghengdexin735/wip-zzz-add-
Yuri Weinstein [Mon, 18 Jul 2016 23:23:59 +0000 (16:23 -0700)]
Merge pull request #10130 from yonghengdexin735/wip-zzz-add-

src/common/buffer.cc fix judgment for lseek

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10197 from songbaisen/b0
Yuri Weinstein [Mon, 18 Jul 2016 23:22:40 +0000 (16:22 -0700)]
Merge pull request #10197 from songbaisen/b0

mon: write fsid use the right return value

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agopybind: Rework cephfs/setup.py for PyPI
Anirudha Bose [Fri, 15 Jul 2016 23:11:43 +0000 (04:41 +0530)]
pybind: Rework cephfs/setup.py for PyPI

Also use `set_include_dirs' in distutils.ccompiler instead of `add_include_dir'
for supporting non-standard include directories.

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
9 years agoMerge pull request #9291 from trociny/wip-15715
Jason Dillaman [Mon, 18 Jul 2016 20:44:58 +0000 (16:44 -0400)]
Merge pull request #9291 from trociny/wip-15715

rbd-nbd does not properly handle resize notifications

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9878 from neurodrone/rbd_api_shrink_check_on_resize
Jason Dillaman [Mon, 18 Jul 2016 20:44:15 +0000 (16:44 -0400)]
Merge pull request #9878 from neurodrone/rbd_api_shrink_check_on_resize

librbd: add explicit shrink check while resizing images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9955 from ukernel/wip-mds-snap-failover
John Spray [Mon, 18 Jul 2016 20:01:35 +0000 (21:01 +0100)]
Merge pull request #9955 from ukernel/wip-mds-snap-failover

mds: snap failover fixes

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10283 from ceph/wip-cmake
Ali Maredia [Mon, 18 Jul 2016 17:59:14 +0000 (13:59 -0400)]
Merge pull request #10283 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agobuild/ops: build mount.ceph and mount.fuse.ceph as client binaries 10147/head
Nathan Cutler [Mon, 18 Jul 2016 17:09:54 +0000 (19:09 +0200)]
build/ops: build mount.ceph and mount.fuse.ceph as client binaries

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoextent alloc functionality for stupid and bitmap allocator 10257/head
Ramesh Chander [Tue, 7 Jun 2016 17:03:49 +0000 (10:03 -0700)]
extent alloc functionality for stupid and bitmap allocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoos/bluestore: use p2 macros to simplify bit-allocator block alignment
xie xingguo [Tue, 12 Jul 2016 02:33:57 +0000 (10:33 +0800)]
os/bluestore: use p2 macros to simplify bit-allocator block alignment

Mark's comments:

This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Closes #10253

os/bluestore: require block_size to be power of 2 aligned

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: use ISP2 macro for zone/span size checking

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix potential uninitialized nid of onode
xie xingguo [Mon, 11 Jul 2016 02:59:27 +0000 (10:59 +0800)]
os/bluestore: fix potential uninitialized nid of onode

The _zero() process may implicitly create a new onode,
thus we shall call _assign_nid() to initialize the nid
properly. And if the onode already has one, _assign_nid()
does nothing.

So it is proper to call _assign_nid() here under any case.

Mark's comments:

This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Closes #10236

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: check against we don't overflow

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: try to reap as many collections as we can

So if there is one collection getting contiguously stucking,
we don't abort at the same point each time.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: make device size of BitFreelistManager is block-size aligned

Otherwise if we try to set past-eof blocks as allocated durint create(),
the call to _xor() will trigger the firing of the following assert:

   assert((length & block_mask) == length);

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: end scope of std::hex properly; convert csum error to EIO
xie xingguo [Sat, 9 Jul 2016 08:32:52 +0000 (16:32 +0800)]
os/bluestore: end scope of std::hex properly; convert csum error to EIO

Mark's comments:

This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Closes #10225

os/bluestore: end scope of std::hex properly

To avoid side-effects by accident.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: convert csum error to EIO

The verify_csum() method either returns -1 or -EOPNOTSUPP, which
is not very proper and difficult for user understanding.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: assert lextent is shared

Otherwise we are risking of accessing violation.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: drop duplicated assignment of result code

These two methods never fail actually.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: improve _do_read() a little

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
os/bluestore: assert decoding of shard of key to be successful

Otherwise we are risking of acessing null pointer.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorpm: move mount.ceph from ceph-base to ceph-common
Nathan Cutler [Mon, 18 Jul 2016 14:16:11 +0000 (16:16 +0200)]
rpm: move mount.ceph from ceph-base to ceph-common

Ceph clients use mount.ceph to mount CephFS filesystems, and
ceph-base is not expected to be installed on client systems.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: create mount.ceph symlink in /sbin (SUSE only)
Nathan Cutler [Wed, 6 Jul 2016 08:13:03 +0000 (10:13 +0200)]
rpm: create mount.ceph symlink in /sbin (SUSE only)

Fixes: http://tracker.ceph.com/issues/16598
Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoceph_volume_client: version on-disk metadata 9864/head
Ramana Raja [Thu, 7 Jul 2016 11:45:13 +0000 (17:15 +0530)]
ceph_volume_client: version on-disk metadata

Version on-disk metadata with two attributes,
'compat version', the minimum CephFSVolume Client
version that can decode the metadata, and
'version', the version that encoded the metadata.

Signed-off-by: Ramana Raja <rraja@redhat.com>
9 years agoceph_volume_client: add versioning
Ramana Raja [Wed, 6 Jul 2016 10:03:06 +0000 (15:33 +0530)]
ceph_volume_client: add versioning

Add class attributes to CephFSVolumeClient to version
its capabilities.

'version' attribute stores the current version number
of CephFSVolumeClient.

'compat_version' attribute stores the earliest version
number of CephFSVolumeClient that the current version is
compatible with.

Fixes: http://tracker.ceph.com/issues/15406
Signed-off-by: Ramana Raja <rraja@redhat.com>
9 years agoceph_volume_client: disallow tenants to share auth IDs
Ramana Raja [Thu, 23 Jun 2016 17:52:12 +0000 (23:22 +0530)]
ceph_volume_client: disallow tenants to share auth IDs

Restrict an auth ID to a single OpenStack tenant to enforce
strong tenant isolation of shares.

Signed-off-by: Ramana Raja <rraja@redhat.com>
9 years agoceph_volume_client: cleanup auth meta files
Ramana Raja [Thu, 23 Jun 2016 11:41:33 +0000 (17:11 +0530)]
ceph_volume_client: cleanup auth meta files

Remove auth meta files on last rule for an auth ID deletion

Signed-off-by: Ramana Raja <rraja@redhat.com>
9 years agoceph_volume_client: fix log messages
Ramana Raja [Thu, 23 Jun 2016 11:25:30 +0000 (16:55 +0530)]
ceph_volume_client: fix log messages

Log the path of the volume during creation and deletion of volumes.

Signed-off-by: Ramana Raja <rraja@redhat.com>