]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoAsyncConnection: Avoid lockdep detect failed 4543/head
Haomai Wang [Tue, 5 May 2015 05:58:39 +0000 (13:58 +0800)]
AsyncConnection: Avoid lockdep detect failed

Previously we used a atomic field to avoid deadlock, but it still let lockdep
detect failed. So we remove the atomic field and unlock connection firstly.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncConnection: Don't dispatch event when connection is stopped
Haomai Wang [Tue, 5 May 2015 05:53:23 +0000 (13:53 +0800)]
AsyncConnection: Don't dispatch event when connection is stopped

When marking down connection, previously we will call stop which will dispatch event
regardless of the staus of the connection. If this connection is already down and
its events all has cleaned, we will hit NULL event.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_async_driver: add dispatch_external_event tests
Haomai Wang [Mon, 4 May 2015 17:22:53 +0000 (01:22 +0800)]
test_async_driver: add dispatch_external_event tests

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4514 from majianpeng/rbd
Josh Durgin [Mon, 4 May 2015 15:32:04 +0000 (08:32 -0700)]
Merge pull request #4514 from majianpeng/rbd

misc bugs in librbd

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4534 from tchaikov/wip-silence-gcc-warning
Loic Dachary [Mon, 4 May 2015 15:01:41 +0000 (17:01 +0200)]
Merge pull request #4534 from tchaikov/wip-silence-gcc-warning

osd: silence gcc -Wparentheses warning

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: silence gcc -Wparentheses warning 4534/head
Kefu Chai [Mon, 4 May 2015 06:45:11 +0000 (14:45 +0800)]
osd: silence gcc -Wparentheses warning

otherwise we have following warning:
warning: suggest parentheses around operand of ‘!’ or change ‘|’ to
‘||’ or ‘!’ to ‘~’ [-Wparentheses]

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocommon/CompatSet: mark FeatureSet member vars private
Kefu Chai [Mon, 4 May 2015 09:46:11 +0000 (17:46 +0800)]
common/CompatSet: mark FeatureSet member vars private

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agolibrbd: For format 2, don't forget set objectcache max objects. 4514/head
Jianpeng Ma [Tue, 28 Apr 2015 05:12:47 +0000 (13:12 +0800)]
librbd: For format 2, don't forget set objectcache max objects.

For format 2, before create object_cache, it call init_layout and set
the max object for object cache.
In the later ictx_refresh, it only set for format1.
Now move set logic after creating object cache.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agorbd: updated the 'rbd --help'
Jianpeng Ma [Mon, 4 May 2015 02:54:00 +0000 (10:54 +0800)]
rbd: updated the 'rbd --help'

Now default format is 2. update 'rbd --help'.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agolibrbd: remove the perfcounter l_librbd_aio_rd/write/discard_*.
Jianpeng Ma [Fri, 24 Apr 2015 06:47:28 +0000 (14:47 +0800)]
librbd: remove the perfcounter l_librbd_aio_rd/write/discard_*.

Now for non-aio read/write/discard, the internal implementation used the
related aio function. So we don't differentiate the aio perfcounter from non-aio for
read/write/discard operations.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agolibrbd: Remove the redundant judgement.
Jianpeng Ma [Fri, 24 Apr 2015 05:34:47 +0000 (13:34 +0800)]
librbd: Remove the redundant judgement.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agolibrbd: Remove the redundant judgement.
Jianpeng Ma [Fri, 24 Apr 2015 05:28:02 +0000 (13:28 +0800)]
librbd: Remove the redundant judgement.

For ObjectExtent, if length == object_size, it mean length=0.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoPreforker: include acconfig so includers don't have to
Josh Durgin [Sat, 2 May 2015 03:26:34 +0000 (20:26 -0700)]
Preforker: include acconfig so includers don't have to

Fixes build of systests

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4524 from ceph/wip-remove-fsx-c
Josh Durgin [Sat, 2 May 2015 01:48:00 +0000 (18:48 -0700)]
Merge pull request #4524 from ceph/wip-remove-fsx-c

test: update CMakefile to sync with c44f8e7

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4518 from yuyuyu101/wip-fix-systest-runnable
Josh Durgin [Sat, 2 May 2015 01:43:05 +0000 (18:43 -0700)]
Merge pull request #4518 from yuyuyu101/wip-fix-systest-runnable

systest_runnable: Use Preforker to do fork

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4519 from ceph/wip-flush-log
Gregory Farnum [Fri, 1 May 2015 20:58:19 +0000 (13:58 -0700)]
Merge pull request #4519 from ceph/wip-flush-log

Flush cluster log before MDS::damaged

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4529 from ceph/wip-librbd-open
Josh Durgin [Fri, 1 May 2015 20:55:33 +0000 (13:55 -0700)]
Merge pull request #4529 from ceph/wip-librbd-open

librbd: invoking RBD::open twice will leak memory

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4511 from yuyuyu101/wip-async-fix-7
Gregory Farnum [Fri, 1 May 2015 20:55:12 +0000 (13:55 -0700)]
Merge pull request #4511 from yuyuyu101/wip-async-fix-7

Wip async fix 7

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoatomic_t: change cas to compare_and_swap and return bool 4511/head
Haomai Wang [Fri, 1 May 2015 17:43:49 +0000 (01:43 +0800)]
atomic_t: change cas to compare_and_swap and return bool

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agomds: in damaged() call flush_log before ending 4519/head
John Spray [Wed, 29 Apr 2015 20:50:27 +0000 (21:50 +0100)]
mds: in damaged() call flush_log before ending

...so that the clog messages we send before damaged()
actually have a chance to make it to the cluster log.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon: add MonClient::flush_log
John Spray [Wed, 29 Apr 2015 20:48:53 +0000 (21:48 +0100)]
mon: add MonClient::flush_log

A simple reasonable-effort call for emitting
a MLog before shutting down.  Used in MDS which
also waits for its beacon to be acked, so due to
message ordering implicitly waits for this to land
too -- no need to implement a waiting log flush
for this use case.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4516 from yuyuyu101/wip-fix-libcephfs-crash
Gregory Farnum [Fri, 1 May 2015 18:22:59 +0000 (11:22 -0700)]
Merge pull request #4516 from yuyuyu101/wip-fix-libcephfs-crash

Wip fix libcephfs crash

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agolibrbd: invoking RBD::open twice will leak memory 4529/head
Jason Dillaman [Fri, 1 May 2015 18:21:35 +0000 (14:21 -0400)]
librbd: invoking RBD::open twice will leak memory

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4492 from SUSE/wip-suse-firewall
Sage Weil [Fri, 1 May 2015 18:14:01 +0000 (11:14 -0700)]
Merge pull request #4492 from SUSE/wip-suse-firewall

packaging: add SuSEfirewall2 service files

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4468 from cernceph/swifty
Yehuda Sadeh [Fri, 1 May 2015 17:36:53 +0000 (10:36 -0700)]
Merge pull request #4468 from cernceph/swifty

Swift: Set Content-Length when requesting/checking Keystone tokens

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4008 from SUSE/wip-tcmalloc-conditionals
Samuel Just [Fri, 1 May 2015 16:34:06 +0000 (09:34 -0700)]
Merge pull request #4008 from SUSE/wip-tcmalloc-conditionals

Conditional-compile against minimal tcmalloc.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3429 from liewegas/wip-precalc-pgtemp
Sage Weil [Fri, 1 May 2015 16:24:33 +0000 (09:24 -0700)]
Merge pull request #3429 from liewegas/wip-precalc-pgtemp

RFC: mon: prime pg_temp when osdmap changes

Reviewed-by: Guang Yang <yguang@yahoo-inc.com>
Tested-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
10 years agoMerge branch 'wip-journal-header' of git://github.com/XinzeChi/ceph
Sage Weil [Fri, 1 May 2015 16:22:01 +0000 (09:22 -0700)]
Merge branch 'wip-journal-header' of git://github.com/XinzeChi/ceph

Conflicts:
src/gmock

10 years agoMerge pull request #3474 from majianpeng/fix5
Samuel Just [Fri, 1 May 2015 16:17:54 +0000 (09:17 -0700)]
Merge pull request #3474 from majianpeng/fix5

buffer: optimize get_contiguous

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3896 from ceph/wip-auth
Sage Weil [Fri, 1 May 2015 16:17:13 +0000 (09:17 -0700)]
Merge pull request #3896 from ceph/wip-auth

auth: optimize crypto key handling, msg sig checks

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3975 from wonzhq/skip-cache
Sage Weil [Fri, 1 May 2015 16:16:05 +0000 (09:16 -0700)]
Merge pull request #3975 from wonzhq/skip-cache

osd: flush/evict op fixes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4362 from XinzeChi/wip-tier-lat
Sage Weil [Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)]
Merge pull request #4362 from XinzeChi/wip-tier-lat

osd: misc latency perf counter for tier pool

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4393 from majianpeng/copyget-flags
Sage Weil [Fri, 1 May 2015 16:15:07 +0000 (09:15 -0700)]
Merge pull request #4393 from majianpeng/copyget-flags

For CEPH_OSD_OP_COPY_GET, add a new filed: flags.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3564 from guangyy/wip-10198
Samuel Just [Fri, 1 May 2015 16:07:20 +0000 (09:07 -0700)]
Merge pull request #3564 from guangyy/wip-10198

osd: break the handling of PG removal event into multiple iterations

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3004 from guangyy/wip-10183
Samuel Just [Fri, 1 May 2015 16:01:47 +0000 (09:01 -0700)]
Merge pull request #3004 from guangyy/wip-10183

Add a new tick timer which does not need to hold osd_lock, put sched_scrub to that tick timer

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3659 from SUSE/wip-fix-calamari-health
Samuel Just [Fri, 1 May 2015 15:08:22 +0000 (08:08 -0700)]
Merge pull request #3659 from SUSE/wip-fix-calamari-health

Always provide summary for non-healthy cluster.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3702 from mslovy/wip-fineGrain-submitManagerLock
Samuel Just [Fri, 1 May 2015 15:00:56 +0000 (08:00 -0700)]
Merge pull request #3702 from mslovy/wip-fineGrain-submitManagerLock

FileStore:: queue_transactions, fine-grain submitManager lock

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3919 from guangyy/wip-9558
Samuel Just [Fri, 1 May 2015 14:27:26 +0000 (07:27 -0700)]
Merge pull request #3919 from guangyy/wip-9558

osd : populate the needs_recovery_map source fast when only one peer has missing

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agotest: update CMakefile to sync with c44f8e7 4524/head
Kefu Chai [Fri, 1 May 2015 12:40:15 +0000 (20:40 +0800)]
test: update CMakefile to sync with c44f8e7

* remove unused src/test/fsx.c, see
  qa/workunits/suites/fsx.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agosystest_runnable: adjust argument to suite Preforker 4518/head
Haomai Wang [Fri, 1 May 2015 05:17:31 +0000 (13:17 +0800)]
systest_runnable: adjust argument to suite Preforker

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoceph_mon: output preforker error message
Haomai Wang [Fri, 1 May 2015 05:12:49 +0000 (13:12 +0800)]
ceph_mon: output preforker error message

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoPreforker: Add child process exit status check
Haomai Wang [Fri, 1 May 2015 05:02:37 +0000 (13:02 +0800)]
Preforker: Add child process exit status check

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agosystest_runnable: Use Preforker to do fork
Haomai Wang [Fri, 1 May 2015 03:59:07 +0000 (11:59 +0800)]
systest_runnable: Use Preforker to do fork

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotest_libcephfs: Add tests to cover zero length write 4516/head
Haomai Wang [Thu, 30 Apr 2015 16:39:53 +0000 (00:39 +0800)]
test_libcephfs: Add tests to cover zero length write

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4493 from ceph/wip-use-get-linux-version
Gregory Farnum [Thu, 30 Apr 2015 20:40:03 +0000 (13:40 -0700)]
Merge pull request #4493 from ceph/wip-use-get-linux-version

use get_linux_version() instead ad-hoc uname().release parsing

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoClient: Fast return if len is 0
Haomai Wang [Thu, 30 Apr 2015 16:34:54 +0000 (00:34 +0800)]
Client: Fast return if len is 0

If len == 0,
osdc/Striper.cc: 50: FAILED assert(len > 0)
 2: (Striper::file_to_extents(CephContext*, char const*, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::map<object_t, std::vector<ObjectExtent, std::allocator<ObjectExtent> >, std::less<object_t>, std::allocator<std::pair<object_t const, std::vector<ObjectExtent, std::allocator<ObjectExtent> > > > >&, unsigned long)+0x1c6) [0x7fd1a0f4f522]
 3: (Striper::file_to_extents(CephContext*, char const*, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::vector<ObjectExtent, std::allocator<ObjectExtent> >&, unsigned long)+0x69) [0x7fd1a0f4f315]
 4: (Striper::file_to_extents(CephContext*, inodeno_t, ceph_file_layout const*, unsigned long, unsigned long, unsigned long, std::vector<ObjectExtent, std::allocator<ObjectExtent> >&)+0x8a) [0x7fd1a0ef9c3c]
 5: (ObjectCacher::file_read(ObjectCacher::ObjectSet*, ceph_file_layout*, snapid_t, long, unsigned long, ceph::buffer::list*, int, Context*)+0x7e) [0x7fd1a0efb186]
 6: (Client::_read_async(Fh*, unsigned long, unsigned long, ceph::buffer::list*)+0x4ca) [0x7fd1a0ec90d4]
 7: (Client::_read(Fh*, long, unsigned long, ceph::buffer::list*)+0x3dc) [0x7fd1a0ec8744]
 8: (Client::read(int, char*, long, long)+0x208) [0x7fd1a0ec8100]
 9: (ceph_read()+0x5e) [0x7fd1a0e80603]

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4461 from ceph/wip-11372
Josh Durgin [Thu, 30 Apr 2015 16:21:48 +0000 (09:21 -0700)]
Merge pull request #4461 from ceph/wip-11372

librbd: add valgrind memory checks for unit tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4241 from rzarzynski/wip-11285
Yehuda Sadeh [Thu, 30 Apr 2015 15:37:42 +0000 (08:37 -0700)]
Merge pull request #4241 from rzarzynski/wip-11285

rgw: rectify broken statistics on Swift account listing.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4432 from big-henry/wip-rgw-listparts
Yehuda Sadeh [Thu, 30 Apr 2015 15:32:56 +0000 (08:32 -0700)]
Merge pull request #4432 from big-henry/wip-rgw-listparts

rgw: fix ListParts response

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agopybind: fix valgrind warning on rbd_get_parent_info call 4461/head
Jason Dillaman [Tue, 28 Apr 2015 19:25:49 +0000 (15:25 -0400)]
pybind: fix valgrind warning on rbd_get_parent_info call

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosdc: invalid read of freed memory
Jason Dillaman [Tue, 28 Apr 2015 15:12:00 +0000 (11:12 -0400)]
osdc: invalid read of freed memory

The bytes not in cache stat was potentially reading the bh length
from a deleted bufferhead.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agokrbd: fix incorrect types in the krbd API
Jason Dillaman [Tue, 28 Apr 2015 14:56:15 +0000 (10:56 -0400)]
krbd: fix incorrect types in the krbd API

The C API functions were referencing the C++ CephContext
instead of the C rados_config_t.  Additionally, the ceph
namespace was missing on the Formatter class.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agofsx: cleanup crypto library at exit
Jason Dillaman [Tue, 28 Apr 2015 14:54:47 +0000 (10:54 -0400)]
fsx: cleanup crypto library at exit

Also made small tweaks so that it can be compiled under
a C++ compiler.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoautotools: detect presence of valgrind
Jason Dillaman [Tue, 28 Apr 2015 01:30:26 +0000 (21:30 -0400)]
autotools: detect presence of valgrind

Conditionally enable running librbd unit tests under valgrind.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoqa/workunits/rbd: add support for running API tests under valgrind
Jason Dillaman [Mon, 27 Apr 2015 09:00:39 +0000 (05:00 -0400)]
qa/workunits/rbd: add support for running API tests under valgrind

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: run librbd valgrind test during 'make check'
Jason Dillaman [Fri, 24 Apr 2015 18:29:59 +0000 (14:29 -0400)]
tests: run librbd valgrind test during 'make check'

Fixes: #11372
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agovalgrind: update valgrind suppressions for lttng-ust
Jason Dillaman [Fri, 24 Apr 2015 04:23:03 +0000 (00:23 -0400)]
valgrind: update valgrind suppressions for lttng-ust

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoEvent: Use atomic cas to avoid missing wakeup
Haomai Wang [Thu, 30 Apr 2015 14:22:53 +0000 (22:22 +0800)]
Event: Use atomic cas to avoid missing wakeup

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAtomic: Add CAS primitive support
Haomai Wang [Thu, 30 Apr 2015 14:20:09 +0000 (22:20 +0800)]
Atomic: Add CAS primitive support

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4476 from dachary/wip-releases
Loic Dachary [Thu, 30 Apr 2015 11:52:17 +0000 (13:52 +0200)]
Merge pull request #4476 from dachary/wip-releases

doc: add giant v0.87.2 to the release timeline

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoconfig: Document that 'mds_max_file_size' is only read on FS creation
Wido den Hollander [Thu, 30 Apr 2015 11:03:23 +0000 (13:03 +0200)]
config: Document that 'mds_max_file_size' is only read on FS creation

Afterwards you have to change this through the monitors

10 years agoMerge pull request #4037 from osynge/wip-fix-disk-zap-sgdisk-invocation
Loic Dachary [Thu, 30 Apr 2015 09:46:29 +0000 (11:46 +0200)]
Merge pull request #4037 from osynge/wip-fix-disk-zap-sgdisk-invocation

Fix "disk zap" sgdisk invocation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoFix "disk zap" sgdisk invocation 4037/head
Owen Synge [Tue, 17 Mar 2015 14:41:33 +0000 (15:41 +0100)]
Fix "disk zap" sgdisk invocation

Fixes #11143

If the metadata on the disk is truly invalid, sgdisk would fail to zero
it in one go, because --mbrtogpt apparently tried to operate on the
metadata it read before executing --zap-all.

Splitting this up into two separate invocations to first zap everything
and then clear it properly fixes this issue.

Based on patch by Lars Marowsky-Bree <lmb@suse.com> in ceph-deploy.
Created by Vincent Untz <vuntz@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
10 years agoMerge pull request #4513 from SUSE/wip-suse-run-make-check
Loic Dachary [Thu, 30 Apr 2015 08:24:11 +0000 (10:24 +0200)]
Merge pull request #4513 from SUSE/wip-suse-run-make-check

run-make-check.sh: fix a copule of SUSE oddities

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agorun-make-check.sh: stricter check for yum/apt-get/zypper 4513/head
Tim Serong [Thu, 30 Apr 2015 07:44:10 +0000 (17:44 +1000)]
run-make-check.sh: stricter check for yum/apt-get/zypper

Believe it or not, it's possible (although not necessarily likely) to
have both yum and zypper installed on openSUSE.  In this case the
previous implementation using `which` would return a string containing
both commands, which doesn't work.

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agorun-make-check.sh: use /sbin/modprobe
Tim Serong [Thu, 30 Apr 2015 07:35:58 +0000 (17:35 +1000)]
run-make-check.sh: use /sbin/modprobe

Rationale: In some cases (e.g.: by default on openSUSE), `sudo` won't
add /sbin to $PATH.

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agoAsyncConnection: Fix connection doesn't exchange in_seq problem
Haomai Wang [Thu, 30 Apr 2015 03:44:16 +0000 (11:44 +0800)]
AsyncConnection: Fix connection doesn't exchange in_seq problem

1. osd.a connect to osd.b and osd.b try to connect a
2. osd.b got WAIT then osd.b accpet connection from osd.a
2. osd.b inject error cause each side connection try to reconnect, connect_seq++
3. osd.a try to reconnect
4. osd.b connect to osd.a and cause the new accept connection try to replace
5. osd.b's is_reset_from_peer=true
6. inject error to osd.b
7. osd.b connect to osd.a
8. successfully and is_reset_from_peer still is true
9. long time passed
10. error happen and osd.a connect to osd.b
11. because is_reset_from_peer is true, they don't exchange in_seq

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4509 from wonzhq/miss-arg
Kefu Chai [Thu, 30 Apr 2015 03:33:46 +0000 (11:33 +0800)]
Merge pull request #4509 from wonzhq/miss-arg

librbd: missing an argument when calling invoke_async_request

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAsyncConnection: Ornament log output
Haomai Wang [Thu, 30 Apr 2015 03:24:48 +0000 (11:24 +0800)]
AsyncConnection: Ornament log output

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agolibrbd: missing an argument when calling invoke_async_request 4509/head
Zhiqiang Wang [Thu, 30 Apr 2015 02:47:06 +0000 (10:47 +0800)]
librbd: missing an argument when calling invoke_async_request

This prevents the master branch from compiling.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agopackaging: move SuSEfirewall2 templates out of src 4492/head
Tim Serong [Thu, 30 Apr 2015 00:55:38 +0000 (10:55 +1000)]
packaging: move SuSEfirewall2 templates out of src

Better to have static config like this that needs to be installed in
/etc in a separate subdirectory of the project.

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agoMerge pull request #4186 from ceph/wip-7787
Josh Durgin [Wed, 29 Apr 2015 23:42:03 +0000 (16:42 -0700)]
Merge pull request #4186 from ceph/wip-7787

librbd: add fast diff feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4381 from ceph/wip-system-retcode
David Zafman [Wed, 29 Apr 2015 23:15:39 +0000 (16:15 -0700)]
Merge pull request #4381 from ceph/wip-system-retcode

ceph-fuse: check return value on system() invocation

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4457 from ceph/wip-client-osd-caps
Gregory Farnum [Wed, 29 Apr 2015 23:12:20 +0000 (16:12 -0700)]
Merge pull request #4457 from ceph/wip-client-osd-caps

client: check OSD caps before read/write

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoceph-fuse: check return value on system() invocation 4381/head
Greg Farnum [Fri, 17 Apr 2015 01:03:59 +0000 (18:03 -0700)]
ceph-fuse: check return value on system() invocation

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4495 from rzarzynski/wip-11501
Yehuda Sadeh [Wed, 29 Apr 2015 16:14:48 +0000 (09:14 -0700)]
Merge pull request #4495 from rzarzynski/wip-11501

rgw: fix broken account listing of Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4487 from ceph/wip-11464
Sage Weil [Wed, 29 Apr 2015 15:03:26 +0000 (08:03 -0700)]
Merge pull request #4487 from ceph/wip-11464

Revert "osd: For object op, first check object whether unfound."

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agorgw: fix broken account listing of Swift API. 4495/head
Radoslaw Zarzynski [Wed, 29 Apr 2015 14:37:16 +0000 (16:37 +0200)]
rgw: fix broken account listing of Swift API.

Fixes: #11501
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
10 years agouse get_linux_version() instead ad-hoc uname().release parsing 4493/head
Ilya Dryomov [Mon, 27 Apr 2015 07:49:26 +0000 (10:49 +0300)]
use get_linux_version() instead ad-hoc uname().release parsing

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4445 from tchaikov/wip-doxygen-comments-in-throttle
Kefu Chai [Wed, 29 Apr 2015 06:35:44 +0000 (14:35 +0800)]
Merge pull request #4445 from tchaikov/wip-doxygen-comments-in-throttle

doc: doxygen comments in throttle

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4488 from ceph/wip-async-fix-6
Haomai Wang [Wed, 29 Apr 2015 03:36:47 +0000 (11:36 +0800)]
Merge pull request #4488 from ceph/wip-async-fix-6

Event: Delete driver after cleanup

10 years agopackaging: add SuSEfirewall2 service files
Tim Serong [Wed, 29 Apr 2015 03:12:38 +0000 (13:12 +1000)]
packaging: add SuSEfirewall2 service files

This adds SuSEfirewall2 service files for Ceph MON, OSD and MDS, for use
on SLES and openSUSE.  The MON template opens port 6789 and the OSD/MDS
template opens the range 6800-7300 as per
http://ceph.com/docs/master/rados/configuration/network-config-ref/

Signed-off-by: Tim Serong <tserong@suse.com>
10 years agoEvent: Delete driver after cleanup 4488/head
Haomai Wang [Wed, 29 Apr 2015 02:54:01 +0000 (10:54 +0800)]
Event: Delete driver after cleanup

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agorgw: fix ListParts response 4432/head
Henry Chang [Wed, 22 Apr 2015 10:26:45 +0000 (18:26 +0800)]
rgw: fix ListParts response

The response XML element name should be 'ListPartsResult'.

Fixes: #11494
Signed-off-by: Henry Chang <henry@bigtera.com>
10 years agoqa/workunits/post-file: pick a dir that's readable by world
Sage Weil [Wed, 29 Apr 2015 00:40:20 +0000 (17:40 -0700)]
qa/workunits/post-file: pick a dir that's readable by world

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoRevert "osd: For object op, first check object whether unfound." 4487/head
Sage Weil [Tue, 28 Apr 2015 22:19:37 +0000 (15:19 -0700)]
Revert "osd: For object op, first check object whether unfound."

This reverts commit b16b080332616f12852c15cd27e022a83ed86319.

It is normal for objects to be unfound for brief periods of time
after peering--we do not want to EIO in that case.

Fixes: #11464
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4483 from xinxinsh/wip-keyvalue-perfcounter
Sage Weil [Tue, 28 Apr 2015 19:48:03 +0000 (12:48 -0700)]
Merge pull request #4483 from xinxinsh/wip-keyvalue-perfcounter

add perf counter for keyvalue db

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agolibrbd: TaskFinisher should finish all queued tasks
Jason Dillaman [Fri, 24 Apr 2015 04:21:15 +0000 (00:21 -0400)]
librbd: TaskFinisher should finish all queued tasks

The destructor wasn't waiting for all Finisher tasks
to complete before stopping the thread.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: librados completions are not properly released
Jason Dillaman [Fri, 24 Apr 2015 04:20:00 +0000 (00:20 -0400)]
librbd: librados completions are not properly released

Changes associated with rebuilding the object map can result
in the leaking of librados AioCompletions.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: fix valgrind errors with librbd unit test
Jason Dillaman [Fri, 24 Apr 2015 03:10:23 +0000 (23:10 -0400)]
tests: fix valgrind errors with librbd unit test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: librbd should release global data before exit
Jason Dillaman [Fri, 24 Apr 2015 03:09:45 +0000 (23:09 -0400)]
tests: librbd should release global data before exit

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: cleanup singleton memory allocation
Jason Dillaman [Fri, 24 Apr 2015 03:08:51 +0000 (23:08 -0400)]
librados_test_stub: cleanup singleton memory allocation

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4480 from wonzhq/indent
Kefu Chai [Tue, 28 Apr 2015 12:02:24 +0000 (20:02 +0800)]
Merge pull request #4480 from wonzhq/indent

osd/ReplicatedPG: fix an indent in find_object_context

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4474 from ceph/wip-11482
John Spray [Tue, 28 Apr 2015 09:34:17 +0000 (11:34 +0200)]
Merge pull request #4474 from ceph/wip-11482

mds: remove caps from revoking list when caps are voluntarily released

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoosd/ReplicatedPG: fix an indent in find_object_context 4480/head
Zhiqiang Wang [Tue, 28 Apr 2015 08:45:04 +0000 (16:45 +0800)]
osd/ReplicatedPG: fix an indent in find_object_context

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agodoc: add giant v0.87.2 to the release timeline 4476/head
Loic Dachary [Tue, 28 Apr 2015 08:22:04 +0000 (10:22 +0200)]
doc: add giant v0.87.2 to the release timeline

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: remove caps from revoking list when caps are voluntarily released 4474/head
Yan, Zheng [Tue, 28 Apr 2015 07:45:32 +0000 (15:45 +0800)]
mds: remove caps from revoking list when caps are voluntarily released

Fixes: #11482
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoadd perf counter for rocksdb to evaluate latency of get and transaction commit 4483/head
xinxin shu [Tue, 28 Apr 2015 06:44:11 +0000 (14:44 +0800)]
add perf counter for rocksdb to evaluate latency of get and transaction commit

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoadd perf counter for leveldb to evaluate latency of get&commit
xinxin shu [Tue, 28 Apr 2015 00:22:08 +0000 (08:22 +0800)]
add perf counter for leveldb to evaluate latency of get&commit

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoMerge pull request #4454 from ceph/wip-11447
Josh Durgin [Mon, 27 Apr 2015 22:46:08 +0000 (15:46 -0700)]
Merge pull request #4454 from ceph/wip-11447

rgw: use correct oid when creating gc chains

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