]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocmake: install cython modules 9385/head
Kefu Chai [Wed, 1 Jun 2016 05:38:05 +0000 (13:38 +0800)]
cmake: install cython modules

* fix CYTHON_ADD_MODULE() macro. because python_add_module() offered by
  FindPythonLibs.cmake creates a target with name of ${name}, which conflicts
  with existing targets like "rbd" or "rados". so we can not reuse the
  name in ${name}.pyx. and instead, we should specify the target name
  explicitly.
* add distutils_install_cython_module() function to build and install
  cython modules.
* we can split build and install of cython module, but the install phase
  always tries to build the module. so keep it this way. will look at it
  later on.
* move the variables initializations into the Distutils.cmake module.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install compressor plugins into ${pkglibdir/compressor
Kefu Chai [Wed, 1 Jun 2016 03:25:11 +0000 (11:25 +0800)]
cmake: install compressor plugins into ${pkglibdir/compressor

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install erasure plugins into ${pkglibdir}/erasure-code
Kefu Chai [Wed, 1 Jun 2016 03:14:49 +0000 (11:14 +0800)]
cmake: install erasure plugins into ${pkglibdir}/erasure-code

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove duplicated file from ceph-osd
Kefu Chai [Sat, 28 May 2016 21:19:23 +0000 (05:19 +0800)]
cmake: remove duplicated file from ceph-osd

objclass/class_api.cc is already included in libosd

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix dependencies on tracing headers
Kefu Chai [Sat, 28 May 2016 16:23:22 +0000 (00:23 +0800)]
cmake: fix dependencies on tracing headers

group the header dependencies by its tp .so, so the traced target can
depend on them by the name of ${name}-tp.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: libradosstriper's OUTPUT_NAME should be radosstriper
Kefu Chai [Sat, 28 May 2016 16:22:31 +0000 (00:22 +0800)]
cmake: libradosstriper's OUTPUT_NAME should be radosstriper

and s/libradosstriper/radosstriper/ otherwise the created .so
filename would be liblibradosstriper.so with the default prefix.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install the artifacts the packaging requires
Kefu Chai [Sat, 28 May 2016 07:42:33 +0000 (15:42 +0800)]
cmake: install the artifacts the packaging requires

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install init script to etc/init.d
Kefu Chai [Sat, 28 May 2016 13:59:14 +0000 (21:59 +0800)]
cmake: install init script to etc/init.d

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add the autoconf path variables back
Kefu Chai [Sat, 28 May 2016 09:09:37 +0000 (17:09 +0800)]
cmake: add the autoconf path variables back

* partially revert 7a602ec.
* the directory variables created by automake, like "prefix", "bindir",
  and "libdir", are used for generating configuration_file() for substitution,
  and they should have the same names with ones from autotools.
* also fix the ${pkglibdir}, it should be the ${libdir}/${PACKAGE}. so
  the plugins are not installed into ${libdir}, in which the installed shared
  objects are supposed to be shared with other applications.
* install shared libraries into ${CMAKE_INSTALL_LIBDIR} instead of
  ${prefix}/lib. this complies to what ceph.spec.in requires:
  ceph.spec.in expects the shared libraries to be installed into
  ${_libdir}, and ${_libdir} is /usr/lib64 on an amd64 machine.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install ceph-post-file
Kefu Chai [Sat, 28 May 2016 09:03:08 +0000 (17:03 +0800)]
cmake: install ceph-post-file

and related pubkey for sftp

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add ceph-brag
Kefu Chai [Sat, 28 May 2016 08:53:36 +0000 (16:53 +0800)]
cmake: add ceph-brag

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: project name should be "ceph"
Kefu Chai [Sat, 28 May 2016 08:38:09 +0000 (16:38 +0800)]
cmake: project name should be "ceph"

so it would be easier to figure out paths, also
CMAKE_INSTALL_DOCDIR is composed using the PROJECT_NAME also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install ceph-{detect-init,disk}
Kefu Chai [Sat, 28 May 2016 07:44:36 +0000 (15:44 +0800)]
cmake: install ceph-{detect-init,disk}

add a cmake module named Distutils.cmake for setting up python modules
using setup.py.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add ceph_rgw_{json,multi}parser
Kefu Chai [Sat, 28 May 2016 08:18:54 +0000 (16:18 +0800)]
cmake: add ceph_rgw_{json,multi}parser

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: compile and install ceph-bluefs-tool
Kefu Chai [Sat, 28 May 2016 08:18:31 +0000 (16:18 +0800)]
cmake: compile and install ceph-bluefs-tool

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/ceph_test_xattr_bench/ceph_xattr_bench/
Kefu Chai [Sat, 28 May 2016 07:44:17 +0000 (15:44 +0800)]
cmake: s/ceph_test_xattr_bench/ceph_xattr_bench/

to match with automake and packager

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: rename ceph-psim to ceph_psim
Kefu Chai [Sat, 28 May 2016 07:43:34 +0000 (15:43 +0800)]
cmake: rename ceph-psim to ceph_psim

to match with automake and packager

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix bash_completion install path
Kefu Chai [Sat, 28 May 2016 05:20:35 +0000 (13:20 +0800)]
cmake: fix bash_completion install path

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9360 from dillaman/wip-16045
Mykola Golub [Sat, 28 May 2016 19:21:25 +0000 (22:21 +0300)]
Merge pull request #9360 from dillaman/wip-16045

rbd-mirror: support multiple replicated pools

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: cluster-level asok commands need to support multiple pools 9360/head
Jason Dillaman [Fri, 27 May 2016 15:40:58 +0000 (11:40 -0400)]
rbd-mirror: cluster-level asok commands need to support multiple pools

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9284 from tchaikov/wip-cmake-doc
Kefu Chai [Sat, 28 May 2016 16:05:21 +0000 (00:05 +0800)]
Merge pull request #9284 from tchaikov/wip-cmake-doc

cmake,make: speed up man page generation

Reviewed-by: François Lafont <francois.lafont@ac-versailles.fr>
9 years agoMerge pull request #8738 from xiexingguo/xxg-wip-fstool
Yuri Weinstein [Sat, 28 May 2016 15:57:42 +0000 (08:57 -0700)]
Merge pull request #8738 from xiexingguo/xxg-wip-fstool

tool/cephfs: make EventOutput::binary() idempotent

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8778 from ukernel/wip-open-symlink
Yuri Weinstein [Sat, 28 May 2016 15:56:58 +0000 (08:56 -0700)]
Merge pull request #8778 from ukernel/wip-open-symlink

mds: fix open symlink and truncate bugs

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9187 from liewegas/wip-cppool
Yuri Weinstein [Sat, 28 May 2016 15:52:43 +0000 (08:52 -0700)]
Merge pull request #9187 from liewegas/wip-cppool

rados: refuse to cppool if there are snaps; warn about user_version

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert
Yuri Weinstein [Sat, 28 May 2016 15:50:09 +0000 (08:50 -0700)]
Merge pull request #9222 from xiexingguo/xxg-wip-scrubq-assert

mon: fix assert triggerred by the deprecated "scrubq" state

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9233 from vumrao/wip-vumrao-15809
Yuri Weinstein [Sat, 28 May 2016 15:49:20 +0000 (08:49 -0700)]
Merge pull request #9233 from vumrao/wip-vumrao-15809

mon : Display full flag in ceph status if full flag is set

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9234 from stiopaa1/osd_osdcap_preventCopyingVectorInConstructor
Yuri Weinstein [Sat, 28 May 2016 15:48:31 +0000 (08:48 -0700)]
Merge pull request #9234 from stiopaa1/osd_osdcap_preventCopyingVectorInConstructor

osd/OSDCap: prevent copying vector/strings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9262 from songbaisen/song27
Yuri Weinstein [Sat, 28 May 2016 15:46:38 +0000 (08:46 -0700)]
Merge pull request #9262 from songbaisen/song27

mon: remove the redundant judge on dispatch_op function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9298 from liewegas/wip-16012
Yuri Weinstein [Sat, 28 May 2016 15:44:53 +0000 (08:44 -0700)]
Merge pull request #9298 from liewegas/wip-16012

osd: reject rados ops with bad PARALLELEXEC flag

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9379 from ceph/wip-cmake
Kefu Chai [Sat, 28 May 2016 14:57:32 +0000 (22:57 +0800)]
Merge pull request #9379 from ceph/wip-cmake

cmake: add ObjectMapIterate.cc to librbd

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: fix build when WITH_RADOSGW is set OFF 9379/head
Ali Maredia [Sat, 28 May 2016 14:23:09 +0000 (10:23 -0400)]
cmake: fix build when WITH_RADOSGW is set OFF

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9382 from xiexingguo/xxg-wip-fixrbdut
Jason Dillaman [Sat, 28 May 2016 10:55:10 +0000 (06:55 -0400)]
Merge pull request #9382 from xiexingguo/xxg-wip-fixrbdut

test: fix ut failure caused by rbd usage update

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: fix ut failure caused by rbd usage update 9382/head
xie xingguo [Sat, 28 May 2016 06:32:30 +0000 (14:32 +0800)]
test: fix ut failure caused by rbd usage update

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agocmake: librbd missing source file
Ali Maredia [Fri, 27 May 2016 22:06:10 +0000 (18:06 -0400)]
cmake: librbd missing source file

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #9347 from tchaikov/wip-cmake
Ali Maredia [Fri, 27 May 2016 21:09:49 +0000 (17:09 -0400)]
Merge pull request #9347 from tchaikov/wip-cmake

cmake: some fixes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #8562 from ceph/wip-djf-object-map-check
Yuri Weinstein [Fri, 27 May 2016 20:07:20 +0000 (13:07 -0700)]
Merge pull request #8562 from ceph/wip-djf-object-map-check

rbd: add rbd object-map check

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9280 from zhuangzeqiang/wip15522
Yuri Weinstein [Fri, 27 May 2016 20:06:12 +0000 (13:06 -0700)]
Merge pull request #9280 from zhuangzeqiang/wip15522

rbd: check value of config override when setting image-meta

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agorbd: check value of config override when setting image-meta 9280/head
zhuangzeqiang [Sat, 7 Oct 2017 08:52:07 +0000 (16:52 +0800)]
rbd: check value of config override when setting image-meta

Fixes: http://tracker.ceph.com/issues/15522
Signed-off-by: zhuangzeqiang <zhuang.zeqiang@h3c.com>
9 years agoMerge pull request #9326 from marcan/rbd-aio-completion
Yuri Weinstein [Fri, 27 May 2016 20:04:47 +0000 (13:04 -0700)]
Merge pull request #9326 from marcan/rbd-aio-completion

librbd: only mark async completion as done after callback

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agopybind: misc fixesReviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 27 May 2016 20:03:14 +0000 (13:03 -0700)]
pybind: misc fixesReviewed-by: Josh Durgin <jdurgin@redhat.com>

pybind: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9322 from trociny/wip-16011
Jason Dillaman [Fri, 27 May 2016 19:04:42 +0000 (15:04 -0400)]
Merge pull request #9322 from trociny/wip-16011

test: failure in journal.sh workunit test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: remove cls_lock_client from libcephfs 9347/head
Kefu Chai [Fri, 27 May 2016 15:24:17 +0000 (23:24 +0800)]
cmake: remove cls_lock_client from libcephfs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove duplicated src in osd_srcs
Kefu Chai [Fri, 27 May 2016 10:40:21 +0000 (18:40 +0800)]
cmake: remove duplicated src in osd_srcs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add libcommon to libmds
Kefu Chai [Fri, 27 May 2016 08:00:43 +0000 (16:00 +0800)]
cmake: add libcommon to libmds

MDSDaemon is using cpu_profiler_handle_command() offered by libcommon

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/ENABLE_SHARED/BUILD_SHARED_LIBS/
Kefu Chai [Thu, 26 May 2016 10:59:35 +0000 (18:59 +0800)]
cmake: s/ENABLE_SHARED/BUILD_SHARED_LIBS/

* BUILD_SHARED_LIB is a cmake variable respected by add_library().
  so we can simply expose it as an option instead of reinventing our own.
* and mark internal libraries as STATIC explicitly
* and add keyutil to librbd as secret.cc is using it. and secret.cc is
  linked into librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add dl to libcommon
Kefu Chai [Fri, 27 May 2016 05:14:20 +0000 (13:14 +0800)]
cmake: add dl to libcommon

PluginRegistry.cc uses dlopen() functions, so added it to libcommon.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add missing obj to libosd
Kefu Chai [Thu, 26 May 2016 12:54:03 +0000 (20:54 +0800)]
cmake: add missing obj to libosd

* add common_util_obj as OSD::_collect_metadata() is calling collect_sys_info(), which lives
  in util.c
* add global_common_objs as OSD::_committed_osd_maps() is calling
  queue_async_signal(), which lives in signal_handler.cc

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use GNUInstallDirs for defining install dest directories
Kefu Chai [Thu, 26 May 2016 10:14:35 +0000 (18:14 +0800)]
cmake: use GNUInstallDirs for defining install dest directories

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install include/memory.h also
Kefu Chai [Thu, 26 May 2016 09:26:03 +0000 (17:26 +0800)]
cmake: install include/memory.h also

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install librbd headers
Kefu Chai [Thu, 26 May 2016 09:25:28 +0000 (17:25 +0800)]
cmake: install librbd headers

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install libradosstriper headers
Kefu Chai [Thu, 26 May 2016 09:25:09 +0000 (17:25 +0800)]
cmake: install libradosstriper headers

also respect BUILD_SHARED_LIBS instead of always building this lib as a
static library. and we install .so in rpm/deb packaging scripts.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: compile rbd-fuse
Kefu Chai [Thu, 26 May 2016 08:36:20 +0000 (16:36 +0800)]
cmake: compile rbd-fuse

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install debug tools into usr/bin
Kefu Chai [Thu, 26 May 2016 08:36:02 +0000 (16:36 +0800)]
cmake: install debug tools into usr/bin

otherwise dh_install won't find them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install mount.ceph into /sbin
Kefu Chai [Thu, 26 May 2016 08:28:56 +0000 (16:28 +0800)]
cmake: install mount.ceph into /sbin

should use absolute path otherwise it is installed into /usr/sbin, and
dh_install won't find it this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: install bash-completion scripts also
Kefu Chai [Thu, 26 May 2016 08:13:28 +0000 (16:13 +0800)]
cmake: install bash-completion scripts also

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: add missing installs
Kefu Chai [Thu, 26 May 2016 08:12:52 +0000 (16:12 +0800)]
cmake: add missing installs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: make shared library of lttng tracing instead
Kefu Chai [Thu, 26 May 2016 08:11:49 +0000 (16:11 +0800)]
cmake: make shared library of lttng tracing instead

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: revamp on lttng support
Kefu Chai [Thu, 26 May 2016 06:32:48 +0000 (14:32 +0800)]
cmake: revamp on lttng support

* Findlttng-ust.cmake: detect lttng-gen-tp, and make it a required var
* Findlttng-ust.cmake: fix the detection of lttng
* src/tracing/CMakeLists.txt:
  - do not put the generated header files into ${CMAKE_SOURCE_DIR}/src/tracing,
    instead we should put the generated files into ${PROJECT_BINARY_DIR}/include.
  - do not compile the tracing library using the .c files in the repo,
    instead, we should generate them at compile time using lttng-gen-tp,
    and compile the genererated .c files.
* CMakeLists.txt: make the lttng-use package REQUIRED if WITH_LTTNG=ON
* src/CMakeLists.txt: let librados depend on librados-tp if LTTNG is
  enabled: librados includes tracing/librados.h. the same applies to
  librbd, libos and libosd. cmake could deduce the dependencies if we
  add the lttng header files under include/tracing into the
  corresponding target, as the lttng header files are already listed
  as OUTPUT and GENERATED files, but this requires us to put all the
  involved targets in the same CMakeLists.txt. in this case, three
  CMakeLists.txts are impacted. so we create a new target for each
  lttng header, and let the impacted target depend on it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9344 from renhwztetecs/renhw-wip-mdsdaemon
John Spray [Fri, 27 May 2016 10:55:37 +0000 (11:55 +0100)]
Merge pull request #9344 from renhwztetecs/renhw-wip-mdsdaemon

mds: mds-daemon init fixup

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9112 from renhwztetecs/renhw-wip-mdbalancer
John Spray [Fri, 27 May 2016 10:35:46 +0000 (11:35 +0100)]
Merge pull request #9112 from renhwztetecs/renhw-wip-mdbalancer

mds/mdbalancer: fixup assignment type in the hit_dir

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9335 from ceph/wip-16032-radosgw-flask
Boris Ranto [Fri, 27 May 2016 08:53:27 +0000 (10:53 +0200)]
Merge pull request #9335 from ceph/wip-16032-radosgw-flask

packaging: drop python-flask dependency from radosgw

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #9309 from dillaman/wip-15949
Mykola Golub [Fri, 27 May 2016 07:28:32 +0000 (10:28 +0300)]
Merge pull request #9309 from dillaman/wip-15949

journal: support asynchronous shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: replayer should only handle a single pool
Jason Dillaman [Fri, 27 May 2016 03:26:20 +0000 (23:26 -0400)]
rbd-mirror: replayer should only handle a single pool

The pool watcher now only needs to scan a single pool for
its associated replayer since a peer is inherently tied to
a single pool.

Fixes: http://tracker.ceph.com/issues/16045
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: group peers by local pools
Jason Dillaman [Thu, 26 May 2016 20:03:59 +0000 (16:03 -0400)]
rbd-mirror: group peers by local pools

The peer structure is automatically unique per pool due to its
UUID, so grouping local pools by a single peer doesn't work.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: stop stale replayers before starting new replayers
Jason Dillaman [Wed, 25 May 2016 18:00:34 +0000 (14:00 -0400)]
rbd-mirror: stop stale replayers before starting new replayers

If the connection details are tweaked for a remote peer, stop
the existing replayer before potentially starting a new replayer
against the same remote.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: normalize debug log message prefix
Jason Dillaman [Thu, 26 May 2016 17:29:49 +0000 (13:29 -0400)]
rbd-mirror: normalize debug log message prefix

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9156 from ceph/wip-cmake
Kefu Chai [Fri, 27 May 2016 03:37:52 +0000 (11:37 +0800)]
Merge pull request #9156 from ceph/wip-cmake

cmake: Added #defines to config-h.in.cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove verbose output from 9156/head
Ali Maredia [Tue, 17 May 2016 15:48:33 +0000 (11:48 -0400)]
cmake: remove verbose output from

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agocmake: Added #defines to config-h.in.cmake
Ali Maredia [Mon, 2 May 2016 22:21:32 +0000 (18:21 -0400)]
cmake: Added #defines to config-h.in.cmake

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #8941 from xiexingguo/xxg-wip-reweight-filter
Yuri Weinstein [Thu, 26 May 2016 19:24:11 +0000 (12:24 -0700)]
Merge pull request #8941 from xiexingguo/xxg-wip-reweight-filter

mon/OSDMonitor: more fixes for reweight_by_* command

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9120 from runsisi/wip-rpg-minor-cleanup
Yuri Weinstein [Thu, 26 May 2016 19:22:08 +0000 (12:22 -0700)]
Merge pull request #9120 from runsisi/wip-rpg-minor-cleanup

osd/ReplicatedPG: remove unused local variable update

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9126 from xiexingguo/xxg-wip-fix-precisionlost
Yuri Weinstein [Thu, 26 May 2016 19:19:41 +0000 (12:19 -0700)]
Merge pull request #9126 from xiexingguo/xxg-wip-fix-precisionlost

osd: fix sched_time not actually randomized

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9324 from rzarzynski/wip-16015
Matt Benjamin [Thu, 26 May 2016 18:52:31 +0000 (14:52 -0400)]
Merge pull request #9324 from rzarzynski/wip-16015

rgw: properly handle initial slashes in SLO's segment path.

9 years agoMerge pull request #9353 from stiopaa1/common_weightedPriorityQueue
Sage Weil [Thu, 26 May 2016 18:31:30 +0000 (14:31 -0400)]
Merge pull request #9353 from stiopaa1/common_weightedPriorityQueue

common/WeightedPriorityQueue: add override to func

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7733 from xinxinsh/wip-14701
Sage Weil [Thu, 26 May 2016 18:25:13 +0000 (14:25 -0400)]
Merge pull request #7733 from xinxinsh/wip-14701

osdmaptool: allow add --pg-num to osdmaptool --test-map-pgs to override the map's pg_num value

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9065 from xiexingguo/xxg-wip-texttable
Sage Weil [Thu, 26 May 2016 18:24:43 +0000 (14:24 -0400)]
Merge pull request #9065 from xiexingguo/xxg-wip-texttable

mon/PGMonitor: use TextTable for pg relevant dump commands.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9097 from jcsp/wip-15866
Sage Weil [Thu, 26 May 2016 18:23:46 +0000 (14:23 -0400)]
Merge pull request #9097 from jcsp/wip-15866

mon: fix 'mon metadata' for lone monitors, and enable listing all metadata at once

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9198 from xiexingguo/xxg-wip-filestore-trackedkey
Sage Weil [Thu, 26 May 2016 18:23:21 +0000 (14:23 -0400)]
Merge pull request #9198 from xiexingguo/xxg-wip-filestore-trackedkey

os/filestore: add xattr option family to tracked keys

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9204 from xiexingguo/xxg-wip-fix-omapfsid
Sage Weil [Thu, 26 May 2016 18:23:09 +0000 (14:23 -0400)]
Merge pull request #9204 from xiexingguo/xxg-wip-fix-omapfsid

os/filestore: fix omap fsid related fd leak

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9223 from vumrao/wip-vumrao-15762
Sage Weil [Thu, 26 May 2016 18:22:24 +0000 (14:22 -0400)]
Merge pull request #9223 from vumrao/wip-vumrao-15762

osd: add peer_addr in heartbeat_check log message

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoqa/workunits/rbd: create secondary replicated pool
Jason Dillaman [Thu, 26 May 2016 17:26:57 +0000 (13:26 -0400)]
qa/workunits/rbd: create secondary replicated pool

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9302 from ceph/wip_update_cmake_readme
Ali Maredia [Thu, 26 May 2016 15:47:12 +0000 (10:47 -0500)]
Merge pull request #9302 from ceph/wip_update_cmake_readme

Improves the README for cmake instructions and slightly improved markdown syntax.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agorgw: properly handle initial slashes in SLO's segment path. 9324/head
Radoslaw Zarzynski [Wed, 25 May 2016 12:23:29 +0000 (14:23 +0200)]
rgw: properly handle initial slashes in SLO's segment path.

Fixes: http://tracker.ceph.com/issues/16015
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agolibrbd: only mark async completion as done after callback 9326/head
Hector Martin [Wed, 25 May 2016 11:41:40 +0000 (20:41 +0900)]
librbd: only mark async completion as done after callback

This change in behavior was introduced in fde9f78.

Signed-off-by: Hector Martin <marcan@marcan.st>
9 years agorbd-mirror: image replay now uses asynchronous journal shutdown 9309/head
Jason Dillaman [Wed, 25 May 2016 06:31:11 +0000 (02:31 -0400)]
rbd-mirror: image replay now uses asynchronous journal shutdown

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: integrate with async journaler shutdown API
Jason Dillaman [Wed, 25 May 2016 04:21:14 +0000 (00:21 -0400)]
librbd: integrate with async journaler shutdown API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomds: drop reference if message in laggy queue is unrecognized 9344/head
huanwen ren [Thu, 26 May 2016 11:40:56 +0000 (19:40 +0800)]
mds: drop reference if message in laggy queue is unrecognized

drop reference if message in laggy queue is unrecognized

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds: make a quick exit if suicide
huanwen ren [Thu, 26 May 2016 11:38:20 +0000 (19:38 +0800)]
mds: make a quick exit if suicide

make a quick exit if suicide

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomds: set stopping to true during suicide()
huanwen ren [Thu, 26 May 2016 11:36:38 +0000 (19:36 +0800)]
mds: set stopping to true during suicide()

We are using stopping flag everywhere to indicate that a shutdown
procedure of the mds-daemon is already in progress, but we never
set stopping to true correctly.

The suicide() method is the proper place to set the stopping flag
as it is the only exit for mds-daemon.

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #9342 from vumrao/wip-vumrao-16023
Orit Wasserman [Thu, 26 May 2016 11:30:33 +0000 (13:30 +0200)]
Merge pull request #9342 from vumrao/wip-vumrao-16023

rgw : cleanup radosgw-admin temp command
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9244 from dreamhost/wip-15974
Orit Wasserman [Thu, 26 May 2016 10:56:28 +0000 (12:56 +0200)]
Merge pull request #9244 from dreamhost/wip-15974

rgw: fix manager selection when APIs customized
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9263 from rzarzynski/wip-rgw-15976
Orit Wasserman [Thu, 26 May 2016 10:55:41 +0000 (12:55 +0200)]
Merge pull request #9263 from rzarzynski/wip-rgw-15976

rgw: fix CORS/ACLs metadata processing in Swift API
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9246 from rzarzynski/wip-15977
Orit Wasserman [Thu, 26 May 2016 10:54:58 +0000 (12:54 +0200)]
Merge pull request #9246 from rzarzynski/wip-15977

rgw: fix update of already existing account/bucket's custom attributes.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: we should probably return InvalidArgument when XML_parser fails of RGWPutACLs...
Orit Wasserman [Thu, 26 May 2016 10:53:05 +0000 (12:53 +0200)]
rgw: we should probably return InvalidArgument when XML_parser fails of RGWPutACLs opReviewed-by: Orit Wasserman <owasserm@redhat.com>

rgw: we should probably return InvalidArgument when XML_parser fails of RGWPutACLs op
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #7273 from linuxbox2/rgw-email
Orit Wasserman [Thu, 26 May 2016 10:52:23 +0000 (12:52 +0200)]
Merge pull request #7273 from linuxbox2/rgw-email

Rgw email (#1398)
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw : cleanup radosgw-admin temp command as it was deprecated 9342/head
Vikhyat Umrao [Thu, 26 May 2016 10:13:41 +0000 (15:43 +0530)]
rgw : cleanup radosgw-admin temp command as it was deprecated
and also implementation code for this command was removed in commit
8d7c8828b02c46e119adc4b9e8f655551512fc2d

Fixes: http://tracker.ceph.com/issues/16023
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoMerge pull request #9338 from songbaisen/a1
John Spray [Thu, 26 May 2016 09:56:10 +0000 (10:56 +0100)]
Merge pull request #9338 from songbaisen/a1

cephfs: should give a value before use cpp_strerror

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9323 from ukernel/wip-mdsmap-subs
John Spray [Thu, 26 May 2016 09:47:42 +0000 (10:47 +0100)]
Merge pull request #9323 from ukernel/wip-mdsmap-subs

MDSMonitor.cc: fix mdsmap.<namespace> subscriptions

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9033 from renhwztetecs/renhw-wip-cephfs_addlink_python
John Spray [Thu, 26 May 2016 09:46:17 +0000 (10:46 +0100)]
Merge pull request #9033 from renhwztetecs/renhw-wip-cephfs_addlink_python

cephfs: add link function in python

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agomds: fix race between StrayManager::{eval_stray,reintegrate_stray}Reviewed-by: John...
John Spray [Thu, 26 May 2016 09:39:38 +0000 (10:39 +0100)]
mds: fix race between StrayManager::{eval_stray,reintegrate_stray}Reviewed-by: John Spray <

mds: fix race between StrayManager::{eval_stray,reintegrate_stray}

Reviewed-by: John Spray <john.spray@redhat.com>