]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agolibrbd: ignore lack of support for metadata on older OSDs 4589/head
Jason Dillaman [Wed, 6 May 2015 18:48:50 +0000 (14:48 -0400)]
librbd: ignore lack of support for metadata on older OSDs

If an Infernalis librbd attempts to open an image stored on a
pre-Infernalis OSD, the new config metadata operations won't
be supported.  This error can be safely ignored.

Fixes: #11549
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4234 from dmitryya/bug_10163
Loic Dachary [Wed, 6 May 2015 18:13:44 +0000 (20:13 +0200)]
Merge pull request #4234 from dmitryya/bug_10163

obj_bencher rados cli: rados bench producing wrong values when different blocksize used in writes and reads

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agorados cli: fix documentation for -b option 4234/head
Dmitry Yatsushkevich [Tue, 7 Apr 2015 23:01:02 +0000 (16:01 -0700)]
rados cli: fix documentation for -b option

Fix focumentation for block size option for rados cli

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agoMerge pull request #4527 from SUSE/wip-hack-utf8-into-json-parser
Kefu Chai [Wed, 6 May 2015 14:29:36 +0000 (22:29 +0800)]
Merge pull request #4527 from SUSE/wip-hack-utf8-into-json-parser

json_spirit: use utf8 intenally when parsing \uHHHH

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4572 from ceph/wip-11540
John Spray [Wed, 6 May 2015 13:51:54 +0000 (15:51 +0200)]
Merge pull request #4572 from ceph/wip-11540

test_libcephfs: Fix zero length read tests

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agotest_libcephfs: Fix zero length read tests 4572/head
Haomai Wang [Wed, 6 May 2015 10:45:44 +0000 (18:45 +0800)]
test_libcephfs: Fix zero length read tests

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agojson_spirit: use utf8 intenally when parsing \uHHHH 4527/head
Tim Serong [Fri, 1 May 2015 15:59:53 +0000 (01:59 +1000)]
json_spirit: use utf8 intenally when parsing \uHHHH

When the python CLI is given non-ASCII characters, it converts them to
\uHHHH escapes in JSON.  json_spirit parses these internally into 16 bit
characters, which could only work if json_spirit were built to use
std::wstring, which it isn't; it's using std::string, so the high byte
ends up being zero'd, leaving the low byte which is effectively garbage.

This hack^H^H^H^H change makes json_spirit convert to utf8 internally
instead, which can be stored just fine inside a std::string.

Note that this implementation still assumes \uHHHH escapes are four hex
digits, so it'll only cope with characters in the Basic Multilingual
Plane.  Still, that's rather a lot more characters than it could cope
with before ;)

(For characters outside the BMP, Python seems to generate escapes in the
form \uHHHHHHHH, i.e. 8 hex digits, which the current implementation
doesn't expect to see)

Fixes: #7387
Signed-off-by: Tim Serong <tserong@suse.com>
10 years agoMerge pull request #4353 from ceph/wip-11376-packaging-objstore-tool
Loic Dachary [Wed, 6 May 2015 09:04:24 +0000 (11:04 +0200)]
Merge pull request #4353 from ceph/wip-11376-packaging-objstore-tool

#11376: packaging: mv ceph-objectstore-tool to main ceph pkg

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4508 from dachary/wip-enoent-offset
Loic Dachary [Wed, 6 May 2015 08:54:10 +0000 (10:54 +0200)]
Merge pull request #4508 from dachary/wip-enoent-offset

osd: For write a non-exist erasure object don't offset > 0.

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4548 from dachary/wip-docker-ubuntu-12.04
Kefu Chai [Wed, 6 May 2015 08:44:40 +0000 (16:44 +0800)]
Merge pull request #4548 from dachary/wip-docker-ubuntu-12.04

tests: install sudo on ubuntu-12.04 container

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4544 from ceph/wip-with-man-pages
Loic Dachary [Wed, 6 May 2015 07:47:49 +0000 (09:47 +0200)]
Merge pull request #4544 from ceph/wip-with-man-pages

Wip with man pages

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4555 from zzxuanyuan/wip-11534-incorrect-osdsum-size
Kefu Chai [Wed, 6 May 2015 06:32:21 +0000 (14:32 +0800)]
Merge pull request #4555 from zzxuanyuan/wip-11534-incorrect-osdsum-size

mon: Total size of OSDs is a magnitude less than it is supposed to be.

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoconfigure.ac: no use to add "+" before ac_ext=c 4544/head
Kefu Chai [Tue, 5 May 2015 07:07:33 +0000 (15:07 +0800)]
configure.ac: no use to add "+" before ac_ext=c

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoconfigure.ac: add an option: --with-man-pages
Kefu Chai [Mon, 4 May 2015 16:26:31 +0000 (00:26 +0800)]
configure.ac: add an option: --with-man-pages

* do not require sphinx-build if --without-man-pages
* dist rst files for man pages
* build and dist .8 files if sphinx-build is found

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agomon: Total size of OSDs is a maginitude less than it is supposed to be. 4555/head
Zhe Zhang [Tue, 5 May 2015 23:08:48 +0000 (18:08 -0500)]
mon: Total size of OSDs is a maginitude less than it is supposed to be.

When dumping statistics of OSDs such as running command "ceph osd df",
the sum of OSDs' size is 2^10 times less than their real size.

Signed-off-by: Zhe Zhang <zzxuanyuan@gmail.com>
10 years agoobj_bencher: aio_bench - rename op_size to object_size
Dmitry Yatsushkevich [Thu, 2 Apr 2015 18:21:05 +0000 (11:21 -0700)]
obj_bencher: aio_bench - rename op_size to object_size

Rename aio_bench argument 'op_size' to 'object_size' to reflect the reality of
how it is used.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agorados cli: add preventing using --block-size with bench seq and rand
Dmitry Yatsushkevich [Mon, 30 Mar 2015 23:48:33 +0000 (16:48 -0700)]
rados cli: add preventing using --block-size with bench seq and rand

Add handling of situation when '-b|--block-size' option is using with
'bench seq' or 'bench rand' which is erroneous according to the help message:
     -b op_size
            set the size of write ops for put or benchmarking

Fixes: #10163
Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agoobj_bencher: remove excess 'object_size = op_size'
Dmitry Yatsushkevich [Mon, 30 Mar 2015 22:23:13 +0000 (15:23 -0700)]
obj_bencher: remove excess 'object_size = op_size'

Remove excess branch 'else {object_size = op_size;}' from
'if(operation != OP_WRITE){...}else{object_size = op_size;}' because
'object_size' variable already initialized with 'op_size'

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agoobj_bencher: remove 'trans_size' as obsolete
Dmitry Yatsushkevich [Mon, 30 Mar 2015 22:13:38 +0000 (15:13 -0700)]
obj_bencher: remove 'trans_size' as obsolete

'trans_size' description from header: "size of the write/read to perform"
But really 'object_size' is used in write/read operations. 'trans_size' is used
only in ObjBencher::status_printer for calc current and average bandwidth.
As result - bad statistics in case 'trans_size' and and 'object_size' are different.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
10 years agoMerge pull request #4554 from liewegas/wip-cleanup
Sage Weil [Tue, 5 May 2015 21:47:42 +0000 (14:47 -0700)]
Merge pull request #4554 from liewegas/wip-cleanup

9.0.0 release notes, scripts cleanup

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc/release-notes: 9.0.0 4554/head
Sage Weil [Tue, 5 May 2015 21:37:04 +0000 (14:37 -0700)]
doc/release-notes: 9.0.0

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agosrc/script: remove obsolete scripts
Sage Weil [Tue, 5 May 2015 18:28:25 +0000 (11:28 -0700)]
src/script: remove obsolete scripts

These are mostly from gather graph data for very early versions of ceph and
are not useful anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4550 from ktdreyer/wip-submittingpatches-backports
Loic Dachary [Tue, 5 May 2015 17:42:21 +0000 (19:42 +0200)]
Merge pull request #4550 from ktdreyer/wip-submittingpatches-backports

SubmittingPatches: clarify backport procedure

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoSubmittingPatches: clarify backport procedure 4550/head
Ken Dreyer [Tue, 5 May 2015 17:25:46 +0000 (11:25 -0600)]
SubmittingPatches: clarify backport procedure

Developers should not add "Backport: " fields to Git commits, because
this data is immutable after the commits are merged. It makes more sense
to handle this information in Redmine instead.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 5 May 2015 16:53:51 +0000 (09:53 -0700)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge pull request #4530 from ceph/wip-librbd-clean-object
Josh Durgin [Tue, 5 May 2015 16:15:49 +0000 (09:15 -0700)]
Merge pull request #4530 from ceph/wip-librbd-clean-object

librbd: object map is not properly updated when deleting clean objects

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotests: install sudo on ubuntu-12.04 container 4548/head
Loic Dachary [Tue, 5 May 2015 16:05:01 +0000 (18:05 +0200)]
tests: install sudo on ubuntu-12.04 container

Contrary to Ubuntu 14.04 it is not installed by default.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: erasure coded pools do not allow offset on creation 4508/head
Loic Dachary [Thu, 30 Apr 2015 00:06:20 +0000 (02:06 +0200)]
tests: erasure coded pools do not allow offset on creation

If a write operation implicitly creates an object on an erasure coded
pool, there cannot be an offset > 0, even if it is properly aligned.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: refuse to write a new erasure coded object with an offset > 0
Jianpeng Ma [Fri, 6 Mar 2015 07:54:07 +0000 (15:54 +0800)]
osd: refuse to write a new erasure coded object with an offset > 0

Even if the offset is properly aligned.

http://tracker.ceph.com/issues/11507 Fixes: #11507

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorados: Tell that pool removal failed. Not that it doesn't exist.
Wido den Hollander [Tue, 5 May 2015 12:22:43 +0000 (14:22 +0200)]
rados: Tell that pool removal failed. Not that it doesn't exist.

If removing a pool fails it could have various reasons. The pool
might be protected from removal (nodelete flag).

10 years agoMerge pull request #4542 from liewegas/wip-sepia
Loic Dachary [Tue, 5 May 2015 07:14:06 +0000 (09:14 +0200)]
Merge pull request #4542 from liewegas/wip-sepia

sepia

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4387 from wonzhq/async-comp
Josh Durgin [Tue, 5 May 2015 02:15:34 +0000 (19:15 -0700)]
Merge pull request #4387 from wonzhq/async-comp

librbd: don't notify_change on r == -ERESTART when notify async complete

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: don't notify_change on error when notify async complete 4387/head
Zhiqiang Wang [Fri, 17 Apr 2015 07:15:54 +0000 (15:15 +0800)]
librbd: don't notify_change on error when notify async complete

Don't need to increment the refresh_seq since the async op fails.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #4539 from athanatos/wip-11429
Samuel Just [Mon, 4 May 2015 23:36:32 +0000 (16:36 -0700)]
Merge pull request #4539 from athanatos/wip-11429

OSD: handle the case where we resurrected an old, deleted pg

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc: link to sepia report for lab info 4542/head
Sage Weil [Mon, 4 May 2015 23:34:37 +0000 (16:34 -0700)]
doc: link to sepia report for lab info

Signed-off-by: Sage Weil <sage@redhat.com>
10 years ago9.0.0 v9.0.0
Jenkins [Mon, 4 May 2015 19:32:59 +0000 (12:32 -0700)]
9.0.0

10 years agoMerge pull request #4537 from majianpeng/buffer-fix
Gregory Farnum [Mon, 4 May 2015 18:03:08 +0000 (11:03 -0700)]
Merge pull request #4537 from majianpeng/buffer-fix

bufferptr: Offset should not beyond raw_length rather than _len.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoman: do not dist man pages if sphinx is not available
Kefu Chai [Mon, 4 May 2015 17:57:17 +0000 (01:57 +0800)]
man: do not dist man pages if sphinx is not available

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoconfigure.ac: do not check for sphinx-build 4538/head
Kefu Chai [Mon, 4 May 2015 16:31:50 +0000 (00:31 +0800)]
configure.ac: do not check for sphinx-build

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotest/bufferlist: add test case for bufferlist::splice. 4537/head
Jianpeng Ma [Mon, 4 May 2015 16:11:47 +0000 (00:11 +0800)]
test/bufferlist: add test case for bufferlist::splice.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agobufferptr: Offset should not beyond raw_length rather than _len.
Jianpeng Ma [Mon, 4 May 2015 13:36:14 +0000 (21:36 +0800)]
bufferptr: Offset should not beyond raw_length rather than _len.

Fixes: #11526
Commit dfccd3d19c introduce this bug"
./include/buffer.h: 240: FAILED assert(_len >= o)

 ceph version 0.94-1402-g5ac962d
(5ac962d879d920805bd661857592860caae27f2b)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char
const*)+0x80) [0x1640e50]
 2: (ceph::buffer::ptr::set_offset(unsigned int)+0x3a) [0x1647462]
 3: (ceph::buffer::list::splice(unsigned int, unsigned int,
ceph::buffer::list*)+0x238) [0x16458ba]
 4: (JournalStream::read(ceph::buffer::list&, ceph::buffer::list*,
unsigned long*)+0x17c) [0x145588e]
 5: (Journaler::try_read_entry(ceph::buffer::list&)+0x1ef) [0x1453d65]
 6: (MDLog::_replay_thread()+0xc6a) [0x1434200]
 7: (MDLog::ReplayThread::entry()+0x1c) [0x10f0d88]
 8: (Thread::entry_wrapper()+0xa8) [0x16310ee]
 9: (Thread::_entry_func(void*)+0x18) [0x163103c]
 10: /lib64/libpthread.so.0() [0x334c607ee5]
 11: (clone()+0x6d) [0x334bef4d1d]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is
needed to interpret this.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.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 agolibrbd: object map is not properly updated when deleting clean objects 4530/head
Jason Dillaman [Fri, 1 May 2015 18:41:40 +0000 (14:41 -0400)]
librbd: object map is not properly updated when deleting clean objects

With the new fast diff feature flagging which objects haven't changed
between snapshots, unmodified objects are now flagged with a new state
code in the object map.  The OBJECT_EXISTS_CLEAN state needs to be
treated as if it were OBJECT_EXISTS when deleting.

Signed-off-by: Jason Dillaman <dillaman@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 agoOSD: handle the case where we resurrected an old, deleted pg 4539/head
Samuel Just [Tue, 21 Apr 2015 06:45:57 +0000 (23:45 -0700)]
OSD: handle the case where we resurrected an old, deleted pg

Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap.  Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs.  Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.

Fixes: 11429
Signed-off-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 agopackaging: mv ceph-objectstore-tool to main ceph pkg 4353/head
Ken Dreyer [Thu, 30 Apr 2015 21:53:22 +0000 (15:53 -0600)]
packaging: mv ceph-objectstore-tool to main ceph pkg

This change ensures that the ceph-objectstore-tool utility is present on
all OSDs.  This makes it easier for users to run this tool to do manual
debugging/recovery in some scenarios.

http://tracker.ceph.com/issues/11376 Refs: #11376

Signed-off-by: Ken Dreyer <kdreyer@redhat.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>