]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorbd-mirror: include local pool id in resync throttle unique key 10254/head
Jason Dillaman [Tue, 12 Jul 2016 01:58:45 +0000 (21:58 -0400)]
rbd-mirror: include local pool id in resync throttle unique key

Fixes: http://tracker.ceph.com/issues/16536
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10205 from oritwas/wip-rgw-fix-upgrade
Casey Bodley [Mon, 11 Jul 2016 20:44:32 +0000 (16:44 -0400)]
Merge pull request #10205 from oritwas/wip-rgw-fix-upgrade

rgw: add missing master_zone when running with old default region config

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10040 from xiexingguo/xxg-wip-bit-alloc-tree-configurable
Sage Weil [Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)]
Merge pull request #10040 from xiexingguo/xxg-wip-bit-alloc-tree-configurable

os/bluestore: make zone/span size of bitmap-allocator configurable

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10075 from cbodley/wip-rgw-tenant-sync
Matt Benjamin [Mon, 11 Jul 2016 19:24:22 +0000 (15:24 -0400)]
Merge pull request #10075 from cbodley/wip-rgw-tenant-sync

rgw: add tenant support to multisite sync

9 years agoMerge pull request #8964 from songbaisen/song24
Sage Weil [Mon, 11 Jul 2016 19:07:14 +0000 (14:07 -0500)]
Merge pull request #8964 from songbaisen/song24

global: log which process/command sent a signal

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10195 from stiopaa1/msg_asyncmess_removeIncFile
Sage Weil [Mon, 11 Jul 2016 17:29:46 +0000 (12:29 -0500)]
Merge pull request #10195 from stiopaa1/msg_asyncmess_removeIncFile

msg/AsyncMessenger: remove unneeded include file

9 years agoMerge pull request #10224 from stiopaa1/msg_asyncmess_event_addConst
Sage Weil [Mon, 11 Jul 2016 17:19:08 +0000 (12:19 -0500)]
Merge pull request #10224 from stiopaa1/msg_asyncmess_event_addConst

msg/async/Event.h: add const to member function

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10230 from stiopaa1/msg_asyncmess_Processor_accept_changeToVoid
Sage Weil [Mon, 11 Jul 2016 17:17:42 +0000 (12:17 -0500)]
Merge pull request #10230 from stiopaa1/msg_asyncmess_Processor_accept_changeToVoid

msg/AsyncMessenger: change return type to void

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10152 from tchaikov/wip-16277
Kefu Chai [Mon, 11 Jul 2016 16:17:03 +0000 (00:17 +0800)]
Merge pull request #10152 from tchaikov/wip-16277

osd: increment stats on recovery pull also

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10222 from ceph/wip-cmake
Matt Benjamin [Mon, 11 Jul 2016 15:57:53 +0000 (11:57 -0400)]
Merge pull request #10222 from ceph/wip-cmake

cmake changes for pypi

verfied f23

9 years agocmake: fix the detection of curl_multi_wait() 10222/head
Kefu Chai [Mon, 11 Jul 2016 13:29:09 +0000 (21:29 +0800)]
cmake: fix the detection of curl_multi_wait()

it was broken by b5bb77d5

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agopybind/rados: remove rados.c from MANIFEST.in
Kefu Chai [Sat, 9 Jul 2016 05:40:19 +0000 (13:40 +0800)]
pybind/rados: remove rados.c from MANIFEST.in

this fixes the warning of

```
running egg_info
creating
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info
writing
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/PKG-INFO
writing top-level names to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/top_level.txt
writing dependency_links to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/dependency_links.txt
writing manifest file
'/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/SOURCES.txt'
warning: no files found matching 'rados.c'
```

in the out-of-source tree build, rados.c is not located in the same
directory of setup.py, rados.pyx, and rados.pyd. it is in the build_dir,
for example, it could be:

  ceph/build/src/pybind/rados/pyrex/rados.c

where ceph/build is the build directory of cmake.
and sdist will include it when running egg_info, because cython's
build_ext module lists `rados.c` as one of the "source_files".

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: pass necessary cflags to build_ext
Kefu Chai [Sat, 9 Jul 2016 15:36:14 +0000 (23:36 +0800)]
cmake: pass necessary cflags to build_ext

this fixes:
```
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex
/usr/bin/gcc-6 -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes
-fno-strict-aliasing -iquote /var/ceph/ceph/src/include -fPIC
-I/usr/include/python2.7 -I/usr/include/x86_64-linux-
gnu/python2.7 -I/usr/include/python2.7 -c
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c -o
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex/ra
dos.o -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g
-fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -g
-fwrapv -O2 -Wall -Wstrict-prototypes -lpython2.
7 -lpthread -ldl -lutil -lm -Xlinker -export-dynamic -Wl,-O1
-Wl,-Bsymbolic-functions
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c:239:28: fatal error:
rados/librados.h: No such file or directory
 #include "rados/librados.h"
                            ^
compilation terminated.
```

seems we can not pass the CFLAGS with space in it to setup.py using env variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: put cythonized .c files into ${CMAKE_CURRENT_BINARY_DIR}
Kefu Chai [Sat, 9 Jul 2016 04:58:33 +0000 (12:58 +0800)]
cmake: put cythonized .c files into ${CMAKE_CURRENT_BINARY_DIR}

it was put into the directory where .pyx is located. it's not expected
in an out-of-tree build.
* {rados,rbd,cephfs}/setup.py: use build_ext from cython if possible, fallback to
  the one from setuptools or distutils
* Distutils.cmake: pass --cython-c-in-temp --build-temp and
  --cython-include-dirs to "build_ext" command

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9138 from cxwshawn/wip-cl-fix
Kefu Chai [Mon, 11 Jul 2016 05:36:42 +0000 (13:36 +0800)]
Merge pull request #9138 from cxwshawn/wip-cl-fix

osd: replace ceph:atomic_t with std::atomic in osd module.

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9871 from odivlad/fix-init-el7-master
Kefu Chai [Mon, 11 Jul 2016 05:22:05 +0000 (13:22 +0800)]
Merge pull request #9871 from odivlad/fix-init-el7-master

master: remove SYSTEMD_RUN from initscript

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8317 from dreamhost/gentoo-python
Kefu Chai [Mon, 11 Jul 2016 03:56:42 +0000 (11:56 +0800)]
Merge pull request #8317 from dreamhost/gentoo-python

Gentoo support for ceph-disk / ceph-detect-init; pip speedup

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9085 from renhwsky/renhw-wip-osdmonitor-updatepool
Kefu Chai [Mon, 11 Jul 2016 03:55:58 +0000 (11:55 +0800)]
Merge pull request #9085 from renhwsky/renhw-wip-osdmonitor-updatepool

osd/osdmonitor: pool of objects and bytes beyond quota should all be warn

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10234 from tchaikov/wip-drop-tmap_upgrade
Kefu Chai [Mon, 11 Jul 2016 03:55:01 +0000 (11:55 +0800)]
Merge pull request #10234 from tchaikov/wip-drop-tmap_upgrade

ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9117 from wjin/clean
Kefu Chai [Mon, 11 Jul 2016 03:54:15 +0000 (11:54 +0800)]
Merge pull request #9117 from wjin/clean

osd: remove duplicated function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9252 from vumrao/wip-vumrao-15983
Kefu Chai [Mon, 11 Jul 2016 03:51:36 +0000 (11:51 +0800)]
Merge pull request #9252 from vumrao/wip-vumrao-15983

mon: change osdmap flags set and unset messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9452 from mslovy/wip-preserve-alloc-hint
Kefu Chai [Mon, 11 Jul 2016 03:50:48 +0000 (11:50 +0800)]
Merge pull request #9452 from mslovy/wip-preserve-alloc-hint

osd:preserve allocation hint attribute during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9698 from LiumxNL/fix-clones-flush-evict
Kefu Chai [Mon, 11 Jul 2016 03:49:27 +0000 (11:49 +0800)]
Merge pull request #9698 from LiumxNL/fix-clones-flush-evict

rados: add option to include clones when doing flush or evict

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9703 from badone/wip-cryptoKey-encrypt-segfault
Kefu Chai [Mon, 11 Jul 2016 03:48:26 +0000 (11:48 +0800)]
Merge pull request #9703 from badone/wip-cryptoKey-encrypt-segfault

cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9717 from songbaisen/a7
Kefu Chai [Mon, 11 Jul 2016 03:47:43 +0000 (11:47 +0800)]
Merge pull request #9717 from songbaisen/a7

mon: do not recalculate 'to_remove' when it's known

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9763 from dx9/wip-pthread-np
Kefu Chai [Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)]
Merge pull request #9763 from dx9/wip-pthread-np

compat: add abstractions for non portable pthread name funcs

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade 10234/head
Kefu Chai [Mon, 11 Jul 2016 03:29:05 +0000 (11:29 +0800)]
ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade

the tested feature was removed in ad6cc41

> tmap_upgrade was only for Jewel, so remove it for Kraken.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/AsyncMessenger: change return type to void 10230/head
Michal Jarzabek [Sun, 10 Jul 2016 18:26:00 +0000 (19:26 +0100)]
msg/AsyncMessenger: change return type to void

Change the return type of function Processor::start to void. It
doesn't make sense to return constant value(zero).

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoos/bluestore: add support for allocating 0-sized extent 10040/head
xie xingguo [Wed, 6 Jul 2016 07:13:38 +0000 (15:13 +0800)]
os/bluestore: add support for allocating 0-sized extent

For testing, we may choose randomized length of extent to allocate,
which means we could trim down the length to 0.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix allocation of discontiguous blocks
xie xingguo [Wed, 6 Jul 2016 06:30:21 +0000 (14:30 +0800)]
os/bluestore: fix allocation of discontiguous blocks

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: add sanity check for get_free() method
xie xingguo [Wed, 6 Jul 2016 03:43:35 +0000 (11:43 +0800)]
os/bluestore: add sanity check for get_free() method

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: simplify is_exhausted() method
xie xingguo [Wed, 6 Jul 2016 03:40:10 +0000 (11:40 +0800)]
os/bluestore: simplify is_exhausted() method

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: make zone/span size of bitmap-allocator configurable
xie xingguo [Sun, 26 Jun 2016 04:07:53 +0000 (12:07 +0800)]
os/bluestore: make zone/span size of bitmap-allocator configurable

Perviously as zone_size_block and span_size are identical, so we could use
span_size only to simplify the calcuation.

Now that the zone_size_block and span_size are both configurable, so
it is necessary to treat them respectively.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10190 from ktdreyer/doc-delete-pool
Kefu Chai [Sun, 10 Jul 2016 11:57:07 +0000 (19:57 +0800)]
Merge pull request #10190 from ktdreyer/doc-delete-pool

doc: more details for pool deletion

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/Event.h: add const to member function 10224/head
Michal Jarzabek [Sat, 9 Jul 2016 07:38:20 +0000 (08:38 +0100)]
msg/Event.h: add const to member function

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #10201 from xiexingguo/xxg-wip-bluestore-2016-07-08
Sage Weil [Fri, 8 Jul 2016 22:29:50 +0000 (18:29 -0400)]
Merge pull request #10201 from xiexingguo/xxg-wip-bluestore-2016-07-08

os/bluestore: misc cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10157 from cbodley/wip-rgw-sync-error-repo
Casey Bodley [Fri, 8 Jul 2016 20:12:26 +0000 (16:12 -0400)]
Merge pull request #10157 from cbodley/wip-rgw-sync-error-repo

rgw: fix error_repo segfault in data sync

9 years agorgw: fix error_repo segfault in data sync 10157/head
Casey Bodley [Wed, 6 Jul 2016 13:15:29 +0000 (09:15 -0400)]
rgw: fix error_repo segfault in data sync

RGWDataSyncShardCR will only allocate an error_repo if it's doing
incremental sync, so RGWDataSyncSingleEntryCR needs to guard against a
null error_repo

also, RGWDataSyncShardCR::stop_spawned_services() was dropping the last
reference to the error_repo before calling drain_all(), which meant that
RGWDataSyncSingleEntryCR could still be holding a pointer. now uses a
boost::intrusive_ptr in RGWDataSyncSingleEntryCR to account for its
reference

Fixes: http://tracker.ceph.com/issues/16603
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10184 from ktdreyer/doc-rados-operations-systemd
vasukulkarni [Fri, 8 Jul 2016 18:56:50 +0000 (11:56 -0700)]
Merge pull request #10184 from ktdreyer/doc-rados-operations-systemd

doc: rm SysV instructions, add systemd

9 years agoMerge pull request #9570 from zaitcev/wip-5073-multen-doc
Yehuda Sadeh [Fri, 8 Jul 2016 18:46:48 +0000 (11:46 -0700)]
Merge pull request #9570 from zaitcev/wip-5073-multen-doc

rgw: Add documentation for the Multi-tenancy feature

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10151 from oritwas/wip-rgw-fix-cls-sync-stats
Yehuda Sadeh [Fri, 8 Jul 2016 18:40:01 +0000 (11:40 -0700)]
Merge pull request #10151 from oritwas/wip-rgw-fix-cls-sync-stats

rgw: register the correct handler for cls_user_complete_stats

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: remove datalog keys from error repo on ENOENT 10075/head
Casey Bodley [Thu, 7 Jul 2016 18:42:00 +0000 (14:42 -0400)]
rgw: remove datalog keys from error repo on ENOENT

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agotest/rgw: add optional --tenant flag to test_multi.py
Casey Bodley [Fri, 1 Jul 2016 16:36:04 +0000 (12:36 -0400)]
test/rgw: add optional --tenant flag to test_multi.py

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add tenant id to GetBucketInstanceInfo
Casey Bodley [Thu, 30 Jun 2016 19:50:00 +0000 (15:50 -0400)]
rgw: add tenant id to GetBucketInstanceInfo

use the rgw_bucket overload of get_bucket_instance_info() so it can
supply the tenant id

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: carry tenant id with data sync
Casey Bodley [Wed, 29 Jun 2016 15:58:55 +0000 (11:58 -0400)]
rgw: carry tenant id with data sync

use rgw_bucket_shard to track buckets, which includes tenant id

Fixes: http://tracker.ceph.com/issues/16469
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add tenant to url for RGWRESTStreamWriteRequest
Casey Bodley [Thu, 30 Jun 2016 21:43:40 +0000 (17:43 -0400)]
rgw: add tenant to url for RGWRESTStreamWriteRequest

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add tenant to rgw_bucket json format
Casey Bodley [Thu, 30 Jun 2016 21:42:54 +0000 (17:42 -0400)]
rgw: add tenant to rgw_bucket json format

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add rgw_bucket_parse_bucket_key()
Casey Bodley [Thu, 30 Jun 2016 04:13:47 +0000 (00:13 -0400)]
rgw: add rgw_bucket_parse_bucket_key()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add tenant name to datalog entries
Casey Bodley [Tue, 28 Jun 2016 15:24:46 +0000 (11:24 -0400)]
rgw: add tenant name to datalog entries

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: convert bucket instance listings back to metadata key format
Casey Bodley [Wed, 6 Jul 2016 15:50:47 +0000 (11:50 -0400)]
rgw: convert bucket instance listings back to metadata key format

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: use tenant/ for bucket instance metadata keys
Casey Bodley [Tue, 5 Jul 2016 13:00:19 +0000 (09:00 -0400)]
rgw: use tenant/ for bucket instance metadata keys

to work around the ambiguity of parsing tenant: and :shard in the same
bucket instance metadata key, use tenant/ instead

to preserve backward compatibility with existing objects, new helper
function rgw_bucket_instance_key_to_oid() converts this / back to a :
before being used as an object name

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add get_key() methods to format rgw_buckets
Casey Bodley [Thu, 30 Jun 2016 22:09:03 +0000 (18:09 -0400)]
rgw: add get_key() methods to format rgw_buckets

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9934 from tchaikov/wip-build-on-armf
Kefu Chai [Fri, 8 Jul 2016 14:58:28 +0000 (22:58 +0800)]
Merge pull request #9934 from tchaikov/wip-build-on-armf

common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10204 from ceph/wip-cmake
Kefu Chai [Fri, 8 Jul 2016 14:51:48 +0000 (22:51 +0800)]
Merge pull request #10204 from ceph/wip-cmake

cmake: fixes for pypi changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc: more details for pool deletion 10190/head
Ken Dreyer [Thu, 7 Jul 2016 22:42:42 +0000 (16:42 -0600)]
doc: more details for pool deletion

Prior to this change, the documention instructed administrators to
delete rulesets and users, but did not go into details regarding how to
do that.

Add example commands that admins may use to search for rulesets and
users that might reference the to-be-deleted pool.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agocommon: instantiate strict_si_cast<long> not strict_si_cast<int64_t> 9934/head
Kefu Chai [Sat, 25 Jun 2016 17:02:03 +0000 (01:02 +0800)]
common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>

this fixes the build on armf.

on 32bit platforms, cstdint is very likely to

 typedef long long int int64_t;

this results in compilation error like

 `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
 strict_si_cast(const char, std::string) [with T = long long int;
 std::string = std::basic_string]'

 [-fpermissive]
 template int64_t strict_si_cast(const char *str, std::string *err);
 ^`

we can address this by instantiate the primitive type of `long long`
instead of `in64_t`.

Fixes: http://tracker.ceph.com/issues/16398
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8189 from chardan/wip-chardan-15100
Kefu Chai [Fri, 8 Jul 2016 13:10:35 +0000 (21:10 +0800)]
Merge pull request #8189 from chardan/wip-chardan-15100

librados examples: link and include from current source tree by default.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: release compressor if comp_mode turned out to be none 10201/head
xie xingguo [Fri, 8 Jul 2016 07:21:57 +0000 (15:21 +0800)]
os/bluestore: release compressor if comp_mode turned out to be none

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: drop unnecessary increase of iterator
xie xingguo [Fri, 8 Jul 2016 06:13:46 +0000 (14:13 +0800)]
os/bluestore: drop unnecessary increase of iterator

We are going to break anyway.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: assert to confirm that we don't access violation
xie xingguo [Fri, 8 Jul 2016 01:48:03 +0000 (09:48 +0800)]
os/bluestore: assert to confirm that we don't access violation

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: drop unused member _bytes
xie xingguo [Thu, 7 Jul 2016 12:09:41 +0000 (20:09 +0800)]
os/bluestore: drop unused member _bytes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: check against that we don't access violation
xie xingguo [Fri, 8 Jul 2016 00:59:08 +0000 (08:59 +0800)]
os/bluestore: check against that we don't access violation

Some day we might want make this interface more applicable by handling
the abnormal cases more gracefully...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10137 from xiexingguo/xxg-wip-bluestore-2016-07-05-02
Igor Fedotov [Fri, 8 Jul 2016 11:43:33 +0000 (13:43 +0200)]
Merge pull request #10137 from xiexingguo/xxg-wip-bluestore-2016-07-05-02

os/bluestore: change algorithm of compression header from string to int

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: change algorithm of compression header from string to int 10137/head
xie xingguo [Wed, 6 Jul 2016 02:06:40 +0000 (10:06 +0800)]
os/bluestore: change algorithm of compression header from string to int

The literal description of compression algorithm can vary from
various compression types and thus increases the complexity of
en/decoding, which as a result can cause chaos. Also it can be
more efficient by translating it into a fixed-length type.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw: register the correct handler for cls_user_complete_stats 10151/head
Orit Wasserman [Wed, 6 Jul 2016 09:54:08 +0000 (11:54 +0200)]
rgw: register the correct handler for cls_user_complete_stats

Fixes: http://tracker.ceph.com/issues/16624
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw: add missing master_zone when running with old default region config 10205/head
Orit Wasserman [Fri, 8 Jul 2016 08:41:59 +0000 (10:41 +0200)]
rgw: add missing master_zone when running with old default region config

Fixes: http://tracker.ceph.com/issues/16627
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agopybind: put temp .o files in $TMPDIR 10204/head
Kefu Chai [Fri, 8 Jul 2016 06:59:21 +0000 (14:59 +0800)]
pybind: put temp .o files in $TMPDIR

otherwise they will go to $PWD/$TMPDIR instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: creage egg_info files into build directory
Kefu Chai [Fri, 8 Jul 2016 06:57:41 +0000 (14:57 +0800)]
cmake: creage egg_info files into build directory

otherwise they will go to the source tree, and "git ls-files" will list
them as untracked files, which annoy gitbuilder-ceph-tarball*-cmake
gitbuilders. like

+ echo 'error: Added files:'
error: Added files:
+ cat .git/added-files
src/pybind/rados/rados.egg-info/PKG-INFO
...

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10186 from ceph/wip-cmake-no-with-mds
Kefu Chai [Fri, 8 Jul 2016 03:37:04 +0000 (11:37 +0800)]
Merge pull request #10186 from ceph/wip-cmake-no-with-mds

cmake: remove WITH_MDS option

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/AsyncMessenger: remove unneeded include file 10195/head
Michal Jarzabek [Thu, 7 Jul 2016 22:35:54 +0000 (23:35 +0100)]
msg/AsyncMessenger: remove unneeded include file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #10163 from stiopaa1/msg_asyncmess_removeUnusedFunction_create_ano...
Sage Weil [Thu, 7 Jul 2016 20:33:21 +0000 (16:33 -0400)]
Merge pull request #10163 from stiopaa1/msg_asyncmess_removeUnusedFunction_create_anon_connection

msg/AsyncMessenger: remove unused function

9 years agoMerge pull request #10178 from ceph/wip-cmake
Ali Maredia [Thu, 7 Jul 2016 19:24:45 +0000 (15:24 -0400)]
Merge pull request #10178 from ceph/wip-cmake

cmake: use stock Find* modules.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agocmake: remove option 10186/head
Ali Maredia [Thu, 7 Jul 2016 18:31:32 +0000 (14:31 -0400)]
cmake: remove  option

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agodoc: rm SysV instructions, add systemd 10184/head
Ken Dreyer [Thu, 7 Jul 2016 17:58:52 +0000 (11:58 -0600)]
doc: rm SysV instructions, add systemd

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #10128 from xiexingguo/xxg-wip-bluestore-2016-07-05
Sage Weil [Thu, 7 Jul 2016 17:40:42 +0000 (13:40 -0400)]
Merge pull request #10128 from xiexingguo/xxg-wip-bluestore-2016-07-05

os/bluestore: introduce power 2 macros for block alignment and rounding

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10180 from theanalyst/mrgw/cmake-fixes
Casey Bodley [Thu, 7 Jul 2016 17:00:32 +0000 (13:00 -0400)]
Merge pull request #10180 from theanalyst/mrgw/cmake-fixes

mrgw: search for cmake build dir.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agomrgw: search for cmake build dir. 10180/head
Abhishek Lekshmanan [Thu, 7 Jul 2016 16:22:27 +0000 (18:22 +0200)]
mrgw: search for cmake build dir.

Similar to mstart and mstop, mrgw also needs to find the correct build
dir as we pass in the pidfile and asokfile which otherwise falls back to
src/run dir.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #10116 from tchaikov/wip-cmake-make-check
Ali Maredia [Thu, 7 Jul 2016 16:13:46 +0000 (12:13 -0400)]
Merge pull request #10116 from tchaikov/wip-cmake-make-check

test: make check using cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10097 from yehudasa/wip-mrun-cmake
Casey Bodley [Thu, 7 Jul 2016 16:03:09 +0000 (12:03 -0400)]
Merge pull request #10097 from yehudasa/wip-mrun-cmake

mrun, mstart.sh, mstop.sh: search for cmake build directory

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9489 from athanatos/wip-16156
David Zafman [Thu, 7 Jul 2016 15:57:53 +0000 (08:57 -0700)]
Merge pull request #9489 from athanatos/wip-16156

ReplicatedPG: call op_applied for submit_log_entries based repops

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agocmake: use the stock FindCURL.cmake 10178/head
Kefu Chai [Wed, 6 Jul 2016 17:09:35 +0000 (01:09 +0800)]
cmake: use the stock FindCURL.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: use the stock FindEXPAT.cmake
Kefu Chai [Wed, 6 Jul 2016 16:41:44 +0000 (00:41 +0800)]
cmake: use the stock FindEXPAT.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoqa/workunits/ceph-helpers.sh: disable test_pg_scrub() 10116/head
Kefu Chai [Thu, 7 Jul 2016 15:17:11 +0000 (23:17 +0800)]
qa/workunits/ceph-helpers.sh: disable test_pg_scrub()

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10139 from SUSE/wip-cmake-really-fix-fcgi-include-dir
Kefu Chai [Thu, 7 Jul 2016 13:45:52 +0000 (21:45 +0800)]
Merge pull request #10139 from SUSE/wip-cmake-really-fix-fcgi-include-dir

cmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9981 from yangdongsheng/rbd_set_vals
Jason Dillaman [Thu, 7 Jul 2016 12:15:04 +0000 (08:15 -0400)]
Merge pull request #9981 from yangdongsheng/rbd_set_vals

cls_rbd: set omap values in batch during image creation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10155 from trociny/wip-16555-workaround
Jason Dillaman [Thu, 7 Jul 2016 12:09:40 +0000 (08:09 -0400)]
Merge pull request #10155 from trociny/wip-16555-workaround

qa/workunits/rbd: before removing image make sure it is not bootstrapped

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10164 from dillaman/wip-cmake-test-rbd-mirror
Kefu Chai [Thu, 7 Jul 2016 08:55:37 +0000 (16:55 +0800)]
Merge pull request #10164 from dillaman/wip-cmake-test-rbd-mirror

cmake: ceph_test_rbd_mirror does not require librados_test_stub

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw 10139/head
Tim Serong [Tue, 5 Jul 2016 12:01:25 +0000 (22:01 +1000)]
cmake: Really add FCGI_INCLUDE_DIR to include_directories for rgw

Commit 3cf6c53 was incorrect.  FCGI_INCLUDE_DIR doesn't need to be
set in src/rgw/CMakeLists.txt, but it does need to be set for the
rgw_a target in src/CMakeLists.txt, as well as for the
ceph_test_librgw_file and ceph_test_librgw_file_nfsns targets in
src/test/CMakeLists.txt.  I can only assume that I must not have
done a completely clean rebuild at some point when testing a
reworked version of the earlier commit :-/

This is only a problem for distros that keep the FCGI headers in
/usr/include/fastcgi/ (e.g.: SUSE).

This commit also removes a redundant include of <fcgiapp.h>

Signed-off-by: Tim Serong <tserong@suse.com>
9 years agoMerge pull request #9083 from badone/wip-doc-last_epoch_started
Kefu Chai [Thu, 7 Jul 2016 06:23:56 +0000 (14:23 +0800)]
Merge pull request #9083 from badone/wip-doc-last_epoch_started

doc/dev: Fix missing code section due to no lexer for "none"

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9704 from badone/wip-ceph-authtool-fixes
Kefu Chai [Thu, 7 Jul 2016 06:13:31 +0000 (14:13 +0800)]
Merge pull request #9704 from badone/wip-ceph-authtool-fixes

authtool: Enhance argument combinations validation

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomon : change osdmap flags set and unset message 9252/head
Vikhyat Umrao [Thu, 7 Jul 2016 06:10:42 +0000 (11:40 +0530)]
mon : change osdmap flags set and unset message

Fixes: http://tracker.ceph.com/issues/15983
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agorun-make-check.sh: use "make check" for running tests
Kefu Chai [Thu, 7 Jul 2016 04:41:54 +0000 (12:41 +0800)]
run-make-check.sh: use "make check" for running tests

"make all" does not offer "ceph-disk" and "ceph-detect-init" for
testing. as they are solely used for testing purpose. instead, these two
python command line packages are installed by the "install" target. so
we need to use "make check" to 1) prepare the test dependencies 2)
launch ctest to perform the test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoRevert "cmake: add ceph-{disk,detect-init} to ALL"
Kefu Chai [Wed, 6 Jul 2016 15:47:47 +0000 (23:47 +0800)]
Revert "cmake: add ceph-{disk,detect-init} to ALL"

This reverts commit 19c0731751df9642cc5b8c583ea41d12e0b5ec41.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest//osd/osd-copy-from.sh: use absolute path for "rados put"
Kefu Chai [Wed, 6 Jul 2016 02:43:55 +0000 (10:43 +0800)]
test//osd/osd-copy-from.sh: use absolute path for "rados put"

"rados -p rbd put foo rados" does not work if "rados" is not in current
path. so change it to "rados -p rbd put foo $(which rados)"

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: pass more env vars to osd-copy-from.sh
Kefu Chai [Wed, 6 Jul 2016 02:36:53 +0000 (10:36 +0800)]
cmake: pass more env vars to osd-copy-from.sh

we should use the cmake function of add_ceph_test() to add
osd-copy-from.sh as a test. then we won't miss any env variables.
w/o this change, $CEPH_BUILD_VIRTUALENV is not passed to
osd-copy-from.sh.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: respect $TMPDIR
Kefu Chai [Tue, 5 Jul 2016 13:01:00 +0000 (21:01 +0800)]
qa/workunits/cephtool/test.sh: respect $TMPDIR

create temp directory and files in $TMPDIR. the $TMPDIR is hard-wired to
/tmp before this change, we'd better respect the env variable $TMPDIR,
so it would be more consistent, and easier to do the cleanup if any.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest: vstart_wrapper.sh run tests in $TMPDIR
Kefu Chai [Tue, 5 Jul 2016 12:52:27 +0000 (20:52 +0800)]
test: vstart_wrapper.sh run tests in $TMPDIR

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorun-make-check.sh: run "make check" with a unique $TMPDIR
Kefu Chai [Tue, 5 Jul 2016 11:41:49 +0000 (19:41 +0800)]
run-make-check.sh: run "make check" with a unique $TMPDIR

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: use p2 macros to simplify _do_write_small() process 10128/head
xie xingguo [Tue, 5 Jul 2016 08:10:33 +0000 (16:10 +0800)]
os/bluestore: use p2 macros to simplify _do_write_small() process

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9702 from BlaXpirit/ceph-argparse-py3 9603/head
Josh Durgin [Wed, 6 Jul 2016 23:19:52 +0000 (16:19 -0700)]
Merge pull request #9702 from BlaXpirit/ceph-argparse-py3

ceph.in: python 3 compatibility of the ceph CLI

Reviewed-by: Josh Durgin <jdurgin@redhat.com>