Commit Graph

55684 Commits

Author SHA1 Message Date
Casey Bodley
28609029cf 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>
2016-07-08 15:53:57 -04:00
vasukulkarni
299a5210e3 Merge pull request #10184 from ktdreyer/doc-rados-operations-systemd
doc: rm SysV instructions, add systemd
2016-07-08 11:56:50 -07:00
Yehuda Sadeh
ed1be58a86 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>
2016-07-08 11:46:48 -07:00
Yehuda Sadeh
6489be299c 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>
2016-07-08 11:40:01 -07:00
Kefu Chai
21402181f5 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>
2016-07-08 22:58:28 +08:00
Kefu Chai
5ba22025a8 Merge pull request #10204 from ceph/wip-cmake
cmake: fixes for pypi changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-08 22:51:48 +08:00
Kefu Chai
31db4c5f9f 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>
2016-07-08 21:20:53 +08:00
Kefu Chai
37dbe98a31 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>
2016-07-08 21:10:35 +08:00
Igor Fedotov
5c2a1bbb1f 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>
2016-07-08 13:43:33 +02:00
xie xingguo
1209cb3d12 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>
2016-07-08 19:39:17 +08:00
Orit Wasserman
1a8e72cb2d 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>
2016-07-08 10:54:00 +02:00
Kefu Chai
ce1f9c6e6e pybind: put temp .o files in $TMPDIR
otherwise they will go to $PWD/$TMPDIR instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 15:03:45 +08:00
Kefu Chai
edd7c9d709 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>
2016-07-08 15:02:59 +08:00
Kefu Chai
07387eb9af 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>
2016-07-08 11:37:04 +08:00
Sage Weil
33fb3bc63f Merge pull request #10163 from stiopaa1/msg_asyncmess_removeUnusedFunction_create_anon_connection
msg/AsyncMessenger: remove unused function
2016-07-07 16:33:21 -04:00
Ali Maredia
235a72a8f4 Merge pull request #10178 from ceph/wip-cmake
cmake: use stock Find* modules.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 15:24:45 -04:00
Ali Maredia
cfcf0706f2 cmake: remove option
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 14:31:32 -04:00
Ken Dreyer
99e0ee1223 doc: rm SysV instructions, add systemd
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-07-07 11:59:18 -06:00
Sage Weil
956c769969 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>
2016-07-07 13:40:42 -04:00
Casey Bodley
d1a10c5416 Merge pull request #10180 from theanalyst/mrgw/cmake-fixes
mrgw: search for cmake build dir.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-07 13:00:32 -04:00
Abhishek Lekshmanan
eeb394e04c
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>
2016-07-07 18:22:27 +02:00
Ali Maredia
3ed34b58bd Merge pull request #10116 from tchaikov/wip-cmake-make-check
test: make check using cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 12:13:46 -04:00
Casey Bodley
7dac5c1e21 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>
2016-07-07 12:03:09 -04:00
David Zafman
d3bcc7dc4d 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>
2016-07-07 08:57:53 -07:00
Kefu Chai
b5bb77d566 cmake: use the stock FindCURL.cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:26:02 +08:00
Kefu Chai
3646fa5c6b cmake: use the stock FindEXPAT.cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:26:02 +08:00
Kefu Chai
d053705c03 qa/workunits/ceph-helpers.sh: disable test_pg_scrub()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 23:17:11 +08:00
Kefu Chai
0250214529 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>
2016-07-07 21:45:52 +08:00
Jason Dillaman
fb7a1edbf7 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>
2016-07-07 08:15:04 -04:00
Jason Dillaman
7e43e4905b 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>
2016-07-07 08:09:40 -04:00
Kefu Chai
c49d95db10 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>
2016-07-07 16:55:37 +08:00
Tim Serong
234b06680b 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>
2016-07-07 16:25:34 +10:00
Kefu Chai
7dedce8a6e 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>
2016-07-07 14:23:56 +08:00
Kefu Chai
cbc9839684 Merge pull request #9704 from badone/wip-ceph-authtool-fixes
authtool: Enhance argument combinations validation

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-07 14:13:31 +08:00
Kefu Chai
146d2b15ff 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>
2016-07-07 12:41:57 +08:00
Kefu Chai
152b7b6c90 Revert "cmake: add ceph-{disk,detect-init} to ALL"
This reverts commit 19c0731751.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 12:11:05 +08:00
Kefu Chai
a38aa4a2e1 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>
2016-07-07 12:11:05 +08:00
Kefu Chai
3a1dea7c74 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>
2016-07-07 12:11:05 +08:00
Kefu Chai
06195b3476 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>
2016-07-07 12:11:05 +08:00
Kefu Chai
f3c8c28b60 test: vstart_wrapper.sh run tests in $TMPDIR
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 12:11:05 +08:00
Kefu Chai
444d37f2b0 run-make-check.sh: run "make check" with a unique $TMPDIR
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-07 12:11:05 +08:00
xie xingguo
67d966711d os/bluestore: use p2 macros to simplify _do_write_small() process
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-07 10:47:54 +08:00
Josh Durgin
fffb8fc0db 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>
2016-07-06 16:19:52 -07:00
Josh Durgin
d402cac7e6 Merge pull request #9749 from songbaisen/a10
mon: remove the redundant is_active judge in PaxosService

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-06 16:18:51 -07:00
Josh Durgin
c3806ff160 Merge pull request #9792 from stiopaa1/mon_monitorcc_addMutexLocker
mon/Monitor.cc:replce lock/unlock with Mutex:Lockr

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-06 16:18:00 -07:00
Josh Durgin
2592bc72a0 Merge pull request #9939 from Yan-waller/yj-wip-radosclientwaitforosd
rados/client: fix waiting on the condition variable more efficient.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-06 16:17:20 -07:00
Josh Durgin
69b484331b Merge pull request #9947 from yuyuyu101/wip-remove-check
osd: remove dispatch queue check since we don't queue hb message to this

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-06 16:16:18 -07:00
Josh Durgin
1c7ad3523d Merge pull request #9833 from onyb/wip-rados-pypi
pybind: make rados ready for PyPI

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-06 16:01:50 -07:00
Sage Weil
a4250c7459 Merge pull request #10109 from xiexingguo/xxg-wip-bluestore-2016-07-02
os/bluestore: simplify LRUCache::trim()

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-06 19:01:06 -04:00
Josh Durgin
3134a2dbc1 Merge pull request #8980 from stiopaa1/osd_unneededmapassign
osd/OSD.h: remove unneeded line

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-06 15:57:28 -07:00