]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/log
ceph-ci.git
9 years agotest/librados: add test that requires correct dup error detection
Josh Durgin [Thu, 19 May 2016 01:49:02 +0000 (18:49 -0700)]
test/librados: add test that requires correct dup error detection

This only works reliably with the
objecter_retry_writes_after_first_reply setting, so make it part of
the test setup.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agotest/librados: add a way to pass ceph config options
Josh Durgin [Thu, 19 May 2016 01:47:59 +0000 (18:47 -0700)]
test/librados: add a way to pass ceph config options

This way individual tests or testcases can change settings

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoObjecter: add option for testing osd dup handling
Josh Durgin [Wed, 18 May 2016 21:40:23 +0000 (14:40 -0700)]
Objecter: add option for testing osd dup handling

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: require kraken feature bit on osdmap to record write errors in the...
Josh Durgin [Fri, 17 Jun 2016 21:49:33 +0000 (14:49 -0700)]
ReplicatedPG: require kraken feature bit on osdmap to record write errors in the pg log

Older OSDs can't handle the error entries.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoOSDMonitor: add kraken feature bit
Josh Durgin [Fri, 17 Jun 2016 00:29:56 +0000 (17:29 -0700)]
OSDMonitor: add kraken feature bit

This is needed to turn on persisting write errors, since older OSDs
won't be able to handle them.

Other features for kraken could potentially use this as well.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: return error codes for dups from the pg log
Josh Durgin [Wed, 11 May 2016 00:34:24 +0000 (17:34 -0700)]
ReplicatedPG: return error codes for dups from the pg log

This prevents reordering guarded writes or deletes.

Without this, the following sequence:

delete foo -> -ENOENT
write foo -> success
(client connection fails)
resend delete foo -> success, object deleted
resend write foo -> success - dup op, so no write performed

results in the object not existing, instead of containing data. After
this change, both delete and write are detected as dups and the
original ordering is preserved.

Fixes: http://tracker.ceph.com/issues/14468
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: skip stat invalidation when recording write errors
Josh Durgin [Thu, 2 Jun 2016 22:04:59 +0000 (15:04 -0700)]
ReplicatedPG: skip stat invalidation when recording write errors

This is only needed for the lost/unfound use of submit_log_entries() etc.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: persist write errors in the pg log
Josh Durgin [Mon, 23 May 2016 23:20:11 +0000 (16:20 -0700)]
ReplicatedPG: persist write errors in the pg log

This is required to prevent re-ordering of guarded writes or deletes
in the presence of network failures and resends.

Use the existing submit_log_entries() method to initiate a repop that
only updates the pg log.

Keep the write error semantics close to the existing implementation -
if we have a buffer, return it, but do not persist the buffer for now.

Refs: http://tracker.ceph.com/issues/14468
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoPGLog: skip indexing errors by object
Josh Durgin [Wed, 1 Jun 2016 01:58:22 +0000 (18:58 -0700)]
PGLog: skip indexing errors by object

Dup detection only needs them indexed by version, and keeping them out
of the object index prevents error entries from contributing to the
missing set during recovery.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoPGLog: ignore error entries when constructing the missing set
Josh Durgin [Mon, 6 Jun 2016 22:51:28 +0000 (15:51 -0700)]
PGLog: ignore error entries when constructing the missing set

Errors should only be used for dup detection.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoosd_types: add an error pg log entry type
Josh Durgin [Tue, 10 May 2016 21:04:25 +0000 (14:04 -0700)]
osd_types: add an error pg log entry type

This will store write error codes for use in dup op detection.
A few places use checks assuming is_update() or is_delete() are
opposites - fix those to ignore or consider errors, as appropriate.

Refs: http://tracker.ceph.com/issues/14468
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: removed unused obc check
Josh Durgin [Mon, 23 May 2016 23:51:43 +0000 (16:51 -0700)]
ReplicatedPG: removed unused obc check

The one place this was set was removed by e7edf20fb7264bfaeeb30ac0185e9edc925878b6

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: removed unused OnComplete struct
Josh Durgin [Mon, 23 May 2016 23:49:52 +0000 (16:49 -0700)]
ReplicatedPG: removed unused OnComplete struct

Added but never used in e7edf20fb7264bfaeeb30ac0185e9edc925878b6

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplicatedPG: remove unused mark_object_lost()
Josh Durgin [Sat, 21 May 2016 01:11:39 +0000 (18:11 -0700)]
ReplicatedPG: remove unused mark_object_lost()

The only caller was removed in e7edf20fb7264bfaeeb30ac0185e9edc925878b6

Signed-off-by: Josh Durgin <jdurgin@redhat.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
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 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 agocommon: instantiate strict_si_cast<long> not strict_si_cast<int64_t>
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
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
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
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 agopybind: put temp .o files in $TMPDIR
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 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
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
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.
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
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()
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
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 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
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
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>
9 years agoMerge pull request #9749 from songbaisen/a10
Josh Durgin [Wed, 6 Jul 2016 23:18:51 +0000 (16:18 -0700)]
Merge pull request #9749 from songbaisen/a10

mon: remove the redundant is_active judge in PaxosService

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9792 from stiopaa1/mon_monitorcc_addMutexLocker
Josh Durgin [Wed, 6 Jul 2016 23:18:00 +0000 (16:18 -0700)]
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>
9 years agoMerge pull request #9939 from Yan-waller/yj-wip-radosclientwaitforosd
Josh Durgin [Wed, 6 Jul 2016 23:17:20 +0000 (16:17 -0700)]
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>
9 years agoMerge pull request #9947 from yuyuyu101/wip-remove-check
Josh Durgin [Wed, 6 Jul 2016 23:16:18 +0000 (16:16 -0700)]
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>
9 years agoMerge pull request #9833 from onyb/wip-rados-pypi
Josh Durgin [Wed, 6 Jul 2016 23:01:50 +0000 (16:01 -0700)]
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>
9 years agoMerge pull request #10109 from xiexingguo/xxg-wip-bluestore-2016-07-02
Sage Weil [Wed, 6 Jul 2016 23:01:06 +0000 (19:01 -0400)]
Merge pull request #10109 from xiexingguo/xxg-wip-bluestore-2016-07-02

os/bluestore: simplify LRUCache::trim()

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8980 from stiopaa1/osd_unneededmapassign
Josh Durgin [Wed, 6 Jul 2016 22:57:28 +0000 (15:57 -0700)]
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>
9 years agoMerge pull request #8959 from hjwsm1989/hj-test
Josh Durgin [Wed, 6 Jul 2016 22:56:13 +0000 (15:56 -0700)]
Merge pull request #8959 from hjwsm1989/hj-test

  os/filestore/LFNIndex: remove unused variable 'subdir_path'

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8687 from mslovy/wip-peering-msg-priority
Josh Durgin [Wed, 6 Jul 2016 22:55:30 +0000 (15:55 -0700)]
Merge pull request #8687 from mslovy/wip-peering-msg-priority

message: optimization for message priority strategy

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10014 from gaowanlong/indent_caused_compile_warning
Sage Weil [Wed, 6 Jul 2016 18:41:42 +0000 (14:41 -0400)]
Merge pull request #10014 from gaowanlong/indent_caused_compile_warning

build: fix wrong indent caused compile warning

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9970 from dillaman/wip-16349
Mykola Golub [Wed, 6 Jul 2016 18:33:59 +0000 (21:33 +0300)]
Merge pull request #9970 from dillaman/wip-16349

rbd-mirror: gracefully handle being blacklisted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: ceph_test_rbd_mirror does not require librados_test_stub
Jason Dillaman [Wed, 6 Jul 2016 17:51:42 +0000 (13:51 -0400)]
cmake: ceph_test_rbd_mirror does not require librados_test_stub

Linking both librados_test_stub and librados results in failed
test cases.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomsg/AsyncMessenger: remove unused function
Michal Jarzabek [Tue, 5 Jul 2016 21:08:24 +0000 (22:08 +0100)]
msg/AsyncMessenger: remove unused function

Remove create_anon_connection() function.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #10016 from ceph/wip-cmake-rpm
Ali Maredia [Wed, 6 Jul 2016 16:54:09 +0000 (12:54 -0400)]
Merge pull request #10016 from ceph/wip-cmake-rpm

rpm: build rpm with cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agorun-make-check.sh: run make check with cmake if do_cmake.sh is available
Sage Weil [Sat, 2 Jul 2016 11:50:34 +0000 (04:50 -0700)]
run-make-check.sh: run make check with cmake if do_cmake.sh is available

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agorbd-mirror: gracefully restart pool replayer when blacklisted
Jason Dillaman [Fri, 24 Jun 2016 00:28:33 +0000 (20:28 -0400)]
rbd-mirror: gracefully restart pool replayer when blacklisted

Fixes: http://tracker.ceph.com/issues/16349
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: do not clear image replayer error code after shut down
Jason Dillaman [Fri, 24 Jun 2016 00:28:02 +0000 (20:28 -0400)]
rbd-mirror: do not clear image replayer error code after shut down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: image deleter should use provided librados connection
Jason Dillaman [Thu, 23 Jun 2016 20:57:50 +0000 (16:57 -0400)]
rbd-mirror: image deleter should use provided librados connection

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: each pool replayer should use its own librados connection
Jason Dillaman [Thu, 23 Jun 2016 20:03:03 +0000 (16:03 -0400)]
rbd-mirror: each pool replayer should use its own librados connection

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10145 from dillaman/wip-cmake-rbd-python
Kefu Chai [Wed, 6 Jul 2016 13:23:07 +0000 (21:23 +0800)]
Merge pull request #10145 from dillaman/wip-cmake-rbd-python

cmake: fix incorrect dependencies to librados

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10119 from renhwztetecs/renhw-wip-cdentry-dump
John Spray [Wed, 6 Jul 2016 13:16:21 +0000 (14:16 +0100)]
Merge pull request #10119 from renhwztetecs/renhw-wip-cdentry-dump

mds: fixup dump Formatter' type error; add path_ino and is_primary in the CDentry::dump()

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10062 from renhwztetecs/renhw-wip-filer
John Spray [Wed, 6 Jul 2016 13:13:45 +0000 (14:13 +0100)]
Merge pull request #10062 from renhwztetecs/renhw-wip-filer

client/filer: cleanup the redundant judgments of _write&&_fallocate

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10027 from batrick/client-root-lock
John Spray [Wed, 6 Jul 2016 13:12:55 +0000 (14:12 +0100)]
Merge pull request #10027 from batrick/client-root-lock

client: add missing client_lock for get_root

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10100 from fullerdj/wip-djf-16144
John Spray [Wed, 6 Jul 2016 13:12:09 +0000 (14:12 +0100)]
Merge pull request #10100 from fullerdj/wip-djf-16144

tools/cephfs: Remove cephfs-data-scan tmap_upgrade

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9971 from fullerdj/wip-djf-16288
John Spray [Wed, 6 Jul 2016 13:11:21 +0000 (14:11 +0100)]
Merge pull request #9971 from fullerdj/wip-djf-16288

mds: Kill C_SaferCond in evict_sessions()

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoqa/workunits/rbd: before removing image make sure it is not bootstrapped
Mykola Golub [Wed, 6 Jul 2016 09:59:25 +0000 (12:59 +0300)]
qa/workunits/rbd: before removing image make sure it is not bootstrapped

If an image is being bootstrapped, it implies that the rbd-mirror
daemon currently has the image open. The removal API will prevent the
removal of any image that is opened by another client.

Works-around: http://tracker.ceph.com/issues/16555
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake: fix incorrect dependencies to librados
Jason Dillaman [Wed, 6 Jul 2016 04:12:03 +0000 (00:12 -0400)]
cmake: fix incorrect dependencies to librados

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorpm: build rpm with cmake
Kefu Chai [Wed, 29 Jun 2016 12:29:43 +0000 (20:29 +0800)]
rpm: build rpm with cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10136 from runsisi/sisi-wip-fix-missing-return
Jason Dillaman [Wed, 6 Jul 2016 01:44:32 +0000 (21:44 -0400)]
Merge pull request #10136 from runsisi/sisi-wip-fix-missing-return

librbd: fix missing return statement if failed to get mirror image state

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10094 from athanatos/wip-throttle-test
Samuel Just [Tue, 5 Jul 2016 17:50:50 +0000 (10:50 -0700)]
Merge pull request #10094 from athanatos/wip-throttle-test

test/common/Throttle.cc: fix race in shutdown

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoMerge pull request #10088 from pritha-srivastava/wip_s3_signedurl_errors
Casey Bodley [Tue, 5 Jul 2016 17:37:15 +0000 (13:37 -0400)]
Merge pull request #10088 from pritha-srivastava/wip_s3_signedurl_errors

rgw: Fix for using port 443 with pre-signed urls.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #10112 from tchaikov/wip-cmake
Ali Maredia [Tue, 5 Jul 2016 15:29:24 +0000 (11:29 -0400)]
Merge pull request #10112 from tchaikov/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10134 from trociny/wip-run-rbd-tests-fixup
Jason Dillaman [Tue, 5 Jul 2016 12:27:42 +0000 (08:27 -0400)]
Merge pull request #10134 from trociny/wip-run-rbd-tests-fixup

test: run-rbd-tests test cmake fixup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10133 from tchaikov/wip-fixc-cephtool-test.sh
Kefu Chai [Tue, 5 Jul 2016 09:46:39 +0000 (17:46 +0800)]
Merge pull request #10133 from tchaikov/wip-fixc-cephtool-test.sh

test: cephtool/test.sh: fix expect_false() calls

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #10072 from dillaman/wip-16561
Mykola Golub [Tue, 5 Jul 2016 08:44:45 +0000 (11:44 +0300)]
Merge pull request #10072 from dillaman/wip-16561

librbd: failed assertion after shrinking a clone image twice

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agolibrbd: fix missing return statement if failed to get mirror image state
runsisi [Tue, 5 Jul 2016 08:08:40 +0000 (16:08 +0800)]
librbd: fix missing return statement if failed to get mirror image state

Signed-off-by: runsisi <runsisi@zte.com.cn>