]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoxio/XioMsg.h: use static_cast instead of c-style cast 3605/head
Danny Al-Gaaf [Tue, 3 Feb 2015 22:20:39 +0000 (23:20 +0100)]
xio/XioMsg.h: use static_cast instead of c-style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agomds/MDS.cc: don't compare integer with bool
Danny Al-Gaaf [Tue, 3 Feb 2015 22:02:59 +0000 (23:02 +0100)]
mds/MDS.cc: don't compare integer with bool

No need to use an extra variable to check the result of
a function returning bool if the result isn't used again.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoEventKqueue.cc: clarify calculation precedence for '&' and '?'
Danny Al-Gaaf [Tue, 3 Feb 2015 21:36:27 +0000 (22:36 +0100)]
EventKqueue.cc: clarify calculation precedence for '&' and '?'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoXioMessenger.cc: fix dead pointer usage
Danny Al-Gaaf [Tue, 3 Feb 2015 21:34:34 +0000 (22:34 +0100)]
XioMessenger.cc: fix dead pointer usage

Move _addr to upper scope to prevent dead pointer 'a' after
assignment of _addr in if-clause.

Fix for:

[src/msg/xio/XioMessenger.cc:669]: (error) Dead pointer usage.
Pointer 'a' is dead if it has been assigned '&_addr' at line 644

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocls_rgw.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Tue, 3 Feb 2015 20:27:46 +0000 (21:27 +0100)]
cls_rgw.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agorgw_rest_s3.cc: prefer !empty() over size() for emptiness check
Danny Al-Gaaf [Tue, 3 Feb 2015 20:29:01 +0000 (21:29 +0100)]
rgw_rest_s3.cc: prefer !empty() over size() for emptiness check

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agosrc/.gitignore: add new files, resort alphabetical
Danny Al-Gaaf [Tue, 3 Feb 2015 20:10:50 +0000 (21:10 +0100)]
src/.gitignore: add new files, resort alphabetical

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoxio: use static_cast instead of c-style casts
Danny Al-Gaaf [Tue, 3 Feb 2015 20:07:03 +0000 (21:07 +0100)]
xio: use static_cast instead of c-style casts

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agorbd-fuse.cc: use static_cast instead of c-style cast
Danny Al-Gaaf [Tue, 3 Feb 2015 20:06:37 +0000 (21:06 +0100)]
rbd-fuse.cc: use static_cast instead of c-style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoXioMessenger.cc: use reinterpret_cast instead of c-style
Danny Al-Gaaf [Tue, 3 Feb 2015 20:05:33 +0000 (21:05 +0100)]
XioMessenger.cc: use reinterpret_cast instead of c-style

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoReplicatedPG.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Mon, 26 Jan 2015 13:08:45 +0000 (14:08 +0100)]
ReplicatedPG.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoCrushTreeDumper.h: prefer ++operator for non-primitive iterator
Danny Al-Gaaf [Fri, 23 Jan 2015 16:54:40 +0000 (17:54 +0100)]
CrushTreeDumper.h: prefer ++operator for non-primitive iterator

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoEventOutput.cc: prefer !empty() over size() for emptiness check
Danny Al-Gaaf [Fri, 23 Jan 2015 16:53:23 +0000 (17:53 +0100)]
EventOutput.cc: prefer !empty() over size() for emptiness check

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agorgw/rgw_rados.cc: prefer !empty() over size() for emptiness check
Danny Al-Gaaf [Fri, 23 Jan 2015 16:51:30 +0000 (17:51 +0100)]
rgw/rgw_rados.cc: prefer !empty() over size() for emptiness check

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosd/PG.cc: prefer ++operator for non-primitive iterators
Danny Al-Gaaf [Fri, 23 Jan 2015 13:37:57 +0000 (14:37 +0100)]
osd/PG.cc: prefer ++operator for non-primitive iterators

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoosd/Ager.cc: remove already in .h included header
Danny Al-Gaaf [Fri, 9 Jan 2015 16:26:00 +0000 (17:26 +0100)]
osd/Ager.cc: remove already in .h included header

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoAsyncConnection.h: remove twice included header, resort includes
Danny Al-Gaaf [Fri, 9 Jan 2015 15:33:10 +0000 (16:33 +0100)]
AsyncConnection.h: remove twice included header, resort includes

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocommon/Cycles.cc: reduce scope of variable
Danny Al-Gaaf [Thu, 8 Jan 2015 16:26:44 +0000 (17:26 +0100)]
common/Cycles.cc: reduce scope of variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocls/statelog/cls_statelog_*.h: init memvars in ctor
Danny Al-Gaaf [Thu, 8 Jan 2015 16:24:55 +0000 (17:24 +0100)]
cls/statelog/cls_statelog_*.h: init memvars in ctor

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocommon/escape.c: move cppcheck-suppress to correct lines
Danny Al-Gaaf [Thu, 8 Jan 2015 16:22:12 +0000 (17:22 +0100)]
common/escape.c: move cppcheck-suppress to correct lines

Seems that it doesn't work to add the cppcheck-suppress to
the define. Needs to go to the memcpy call using the define.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocls_log_ops.h: ctor init cls_log_list_op::max_entries
Danny Al-Gaaf [Thu, 8 Jan 2015 12:24:30 +0000 (13:24 +0100)]
cls_log_ops.h: ctor init cls_log_list_op::max_entries

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agosrc/os/ObjectStore.h: reduce scope of variable
Danny Al-Gaaf [Thu, 8 Jan 2015 11:44:16 +0000 (12:44 +0100)]
src/os/ObjectStore.h: reduce scope of variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoTestErasureCodeIsa.cc: fix reassign before use old value
Danny Al-Gaaf [Thu, 8 Jan 2015 11:35:33 +0000 (12:35 +0100)]
TestErasureCodeIsa.cc: fix reassign before use old value

Fix for:

[src/test/erasure-code/TestErasureCodeIsa.cc:474] ->
 [src/test/erasure-code/TestErasureCodeIsa.cc:477]:
[src/test/erasure-code/TestErasureCodeIsa.cc:601] ->
 [src/test/erasure-code/TestErasureCodeIsa.cc:604]
[src/test/erasure-code/TestErasureCodeIsa.cc:728] ->
 [src/test/erasure-code/TestErasureCodeIsa.cc:731]
[src/test/erasure-code/TestErasureCodeIsa.cc:854] ->
 [src/test/erasure-code/TestErasureCodeIsa.cc:857]
 (performance) Variable 'err' is reassigned a value
 before the old one has been used.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoos/ObjectStore.h: use reinterpret_cast instead of c-style cast
Danny Al-Gaaf [Wed, 7 Jan 2015 15:51:24 +0000 (16:51 +0100)]
os/ObjectStore.h: use reinterpret_cast instead of c-style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agomsg/async/EventKqueue.h: init 'size' in constructor
Danny Al-Gaaf [Wed, 7 Jan 2015 15:20:52 +0000 (16:20 +0100)]
msg/async/EventKqueue.h: init 'size' in constructor

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agosync/EventKqueue.cc: fix possible null pointer dereference
Danny Al-Gaaf [Wed, 7 Jan 2015 15:15:33 +0000 (16:15 +0100)]
sync/EventKqueue.cc: fix possible null pointer dereference

Remove pointer deref before NULL check. These lines are already
after NULL check.

Fix for:
[src/msg/async/EventKqueue.cc:96] -> [src/msg/async/EventKqueue.cc:99]:
 (warning) Possible null pointer dereference: tvp - otherwise it is
 redundant to check it against null.
[src/msg/async/EventKqueue.cc:97] -> [src/msg/async/EventKqueue.cc:99]:
 (warning) Possible null pointer dereference: tvp - otherwise it is
 redundant to check it against null.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoObjectStore.h: prefer ++operator for non-primitive iterators
Danny Al-Gaaf [Wed, 7 Jan 2015 11:51:16 +0000 (12:51 +0100)]
ObjectStore.h: prefer ++operator for non-primitive iterators

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agotest_librbd.cc: close va_list before return in error case
Danny Al-Gaaf [Wed, 7 Jan 2015 09:32:14 +0000 (10:32 +0100)]
test_librbd.cc: close va_list before return in error case

Fix for:
[src/test/librbd/test_librbd.cc:322]: (error) va_list 'ap' was
 opened but not closed by va_end().
[src/test/librbd/test_librbd.cc:379]: (error) va_list 'ap' was
 opened but not closed by va_end().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agodumb_backend.h: fix warning about self init
Danny Al-Gaaf [Wed, 7 Jan 2015 09:31:37 +0000 (10:31 +0100)]
dumb_backend.h: fix warning about self init

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoMerge pull request #3598 from ceph/wip-10720
Gregory Farnum [Tue, 3 Feb 2015 18:43:42 +0000 (10:43 -0800)]
Merge pull request #3598 from ceph/wip-10720

mds: fix leaked MDCache::logger

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
11 years agoMerge pull request #3262 from dachary/wip-jerasure
John Wilkins [Tue, 3 Feb 2015 17:21:56 +0000 (09:21 -0800)]
Merge pull request #3262 from dachary/wip-jerasure

erasure-code: update links to jerasure upstream

Reviewed-by: John Wilkins <jowilkin@redhat.com>
11 years agoMerge pull request #3601 from dachary/wip-10729-fedora-install-deps
Loic Dachary [Tue, 3 Feb 2015 15:39:53 +0000 (16:39 +0100)]
Merge pull request #3601 from dachary/wip-10729-fedora-install-deps

install-deps.sh: get lsb_release if needed

Reviewed-by: Haïkel Guémar <hguemar@redhat.com>
11 years agodoc/release-notes: v0.92
Sage Weil [Tue, 3 Feb 2015 15:37:05 +0000 (07:37 -0800)]
doc/release-notes: v0.92

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoinstall-deps.sh: get lsb_release if needed 3601/head
Loic Dachary [Tue, 3 Feb 2015 15:26:17 +0000 (16:26 +0100)]
install-deps.sh: get lsb_release if needed

Fedora does not have lsb_release installed by default.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 3 Feb 2015 14:52:07 +0000 (06:52 -0800)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge commit '4ada7cc8e908a26b4640497b64b2ed9986889a92' into next
Sage Weil [Tue, 3 Feb 2015 14:50:22 +0000 (06:50 -0800)]
Merge commit '4ada7cc8e908a26b4640497b64b2ed9986889a92' into next

11 years agomds: fix leaked MDCache::logger 3598/head
John Spray [Tue, 3 Feb 2015 11:19:59 +0000 (11:19 +0000)]
mds: fix leaked MDCache::logger

Fixes: #10720
Signed-off-by: John Spray <john.spray@redhat.com>
11 years agolibrbd: fixed object map issues discovered via fsx
Jason Dillaman [Mon, 2 Feb 2015 20:08:42 +0000 (15:08 -0500)]
librbd: fixed object map issues discovered via fsx

The object map wasn't being properly refreshed after setting
the snapshot context on the parent image. Additionally fixed
a potential deadlock that could have occurred if no object
map update was required when trimming an image.

Fixes: #10706
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agovstart.sh: fix .ceph_port typo
Sage Weil [Tue, 3 Feb 2015 11:23:28 +0000 (03:23 -0800)]
vstart.sh: fix .ceph_port typo

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3597 from karelstriegel/master
Loic Dachary [Tue, 3 Feb 2015 10:52:31 +0000 (11:52 +0100)]
Merge pull request #3597 from karelstriegel/master

rdb: update init-rbdmap to fix duplicate mount point

Reviewed-by: Loic Dachary <ldachary@redhat.com>
11 years agordb: update init-rbdmap to fix duplicate mount point 3597/head
Karel Striegel [Tue, 3 Feb 2015 10:42:06 +0000 (11:42 +0100)]
rdb: update init-rbdmap to fix duplicate mount point

According to the manual 'mount -f' adds an entry in /etc/mtab.
Therefore the 'mount -v' command needs the flag -n to avoid
duplicate entries in /etc/mtab.

Signed-off-by: Karel Striegel <karel@striegel.be>
11 years agoMerge remote-tracking branch 'origin/hammer'
Josh Durgin [Tue, 3 Feb 2015 09:28:50 +0000 (10:28 +0100)]
Merge remote-tracking branch 'origin/hammer'

11 years agolibrbd: removing objects can lead to infinite loop
Jason Dillaman [Mon, 2 Feb 2015 16:20:26 +0000 (11:20 -0500)]
librbd: removing objects can lead to infinite loop

The AioRemove state machine is not properly advanced from
_PRE to _FLAT.  This will result in an infinite state machine
loop.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agolibrbd: pending AIO operations are now flushed asynchronously
Jason Dillaman [Mon, 2 Feb 2015 15:50:09 +0000 (10:50 -0500)]
librbd: pending AIO operations are now flushed asynchronously

If exclusive locking was enabled, the librbd aio_flush command
would block waiting for queued AIO operations to proceed once
the exclusive lock was obtained.  Now librbd will no longer
block when aio_flush is invoked and AIO operations are waiting
on the exclusive lock.

Fixes: #10714
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge pull request #3594 from ceph/wip-10707
Sage Weil [Tue, 3 Feb 2015 08:22:52 +0000 (00:22 -0800)]
Merge pull request #3594 from ceph/wip-10707

test/cls_rgw: fix test

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Tue, 3 Feb 2015 08:12:23 +0000 (00:12 -0800)]
Merge remote-tracking branch 'gh/hammer'

11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 3 Feb 2015 08:12:17 +0000 (00:12 -0800)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #3590 from ceph/wip-10722
Sage Weil [Tue, 3 Feb 2015 08:09:48 +0000 (00:09 -0800)]
Merge pull request #3590 from ceph/wip-10722

rgw: move perf cleanup before context cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoFix memory leak in python rados bindings
Billy Olsen [Mon, 2 Feb 2015 23:24:59 +0000 (16:24 -0700)]
Fix memory leak in python rados bindings

A circular reference was inadvertently created when using the
CFUNCTYPE binding for callbacks for the asynchronous i/o callbacks.
This commit refactors the usage of the callbacks such that the
Ioctx object does not have a class reference to the callbacks.

Fixes: #10723
Backport: giant, firefly, dumpling
Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agotest/cls_rgw: fix test 3594/head
Yehuda Sadeh [Tue, 3 Feb 2015 01:10:19 +0000 (17:10 -0800)]
test/cls_rgw: fix test

Test needed to be updated, now using meta.accounted_size for object
size.

Fixes: #10707
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
11 years agoMerge pull request #3593 from ceph/wip-autogen
Loic Dachary [Tue, 3 Feb 2015 00:42:34 +0000 (01:42 +0100)]
Merge pull request #3593 from ceph/wip-autogen

Fix do_autogen.sh so that -L is allowed

Reviewed-by: Loic Dachary <ldachary@redhat.com>
11 years agoFix do_autogen.sh so that -L is allowed 3593/head
David Zafman [Tue, 3 Feb 2015 00:24:07 +0000 (16:24 -0800)]
Fix do_autogen.sh so that -L is allowed

Signed-off-by: David Zafman <dzafman@redhat.com>
11 years agorgw: move perf cleanup before context cleanup 3590/head
Yehuda Sadeh [Mon, 2 Feb 2015 23:25:22 +0000 (15:25 -0800)]
rgw: move perf cleanup before context cleanup

Fixes: #10722
Fixes: #10572
Backport: giant, firefly

This fixes a regression introduced in commit
de2e5fa048639de6c9ee004a93ab295625fa3b94.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
11 years agoMerge remote-tracking branch 'upstream/next'
Samuel Just [Mon, 2 Feb 2015 22:18:52 +0000 (14:18 -0800)]
Merge remote-tracking branch 'upstream/next'

11 years ago0.92 v0.92
Jenkins [Mon, 2 Feb 2015 18:35:28 +0000 (10:35 -0800)]
0.92

11 years agoMerge pull request #3588 from athanatos/wip-10693
Sage Weil [Mon, 2 Feb 2015 17:21:26 +0000 (09:21 -0800)]
Merge pull request #3588 from athanatos/wip-10693

Wip 10693

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3587 from athanatos/wip-10633
Sage Weil [Mon, 2 Feb 2015 17:19:42 +0000 (09:19 -0800)]
Merge pull request #3587 from athanatos/wip-10633

ReplicatedPG::C_ProxyRead: fix dropped lock

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3538 from athanatos/wip-7862
Samuel Just [Mon, 2 Feb 2015 17:18:58 +0000 (09:18 -0800)]
Merge pull request #3538 from athanatos/wip-7862

osd: allow recovery below min size

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3539 from athanatos/wip-7861
Samuel Just [Mon, 2 Feb 2015 17:18:22 +0000 (09:18 -0800)]
Merge pull request #3539 from athanatos/wip-7861

osd: allow writes on degraded objects

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge remote-tracking branch 'origin/next'
Yehuda Sadeh [Mon, 2 Feb 2015 17:33:03 +0000 (09:33 -0800)]
Merge remote-tracking branch 'origin/next'

Conflicts:
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h

11 years agoMerge pull request #3578 from ceph/wip-10709
Josh Durgin [Mon, 2 Feb 2015 16:16:35 +0000 (17:16 +0100)]
Merge pull request #3578 from ceph/wip-10709

rbd: watch command should unwatch before exiting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge pull request #3583 from jdurgin/wip-qemu-iotests
Sage Weil [Mon, 2 Feb 2015 15:54:53 +0000 (07:54 -0800)]
Merge pull request #3583 from jdurgin/wip-qemu-iotests

qa: use correct binary path on rpm-based systems

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3584 from ceph/wip-optional-encoding
Sage Weil [Mon, 2 Feb 2015 15:52:13 +0000 (07:52 -0800)]
Merge pull request #3584 from ceph/wip-optional-encoding

encoding: ignore uninitialized instantiation in boost::optional decode

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoqa: use correct binary path on rpm-based systems 3583/head
Josh Durgin [Mon, 2 Feb 2015 15:43:35 +0000 (16:43 +0100)]
qa: use correct binary path on rpm-based systems

Fixes: #10715
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
11 years agorbd: watch command should unwatch before exiting 3578/head
Jason Dillaman [Mon, 2 Feb 2015 14:21:13 +0000 (09:21 -0500)]
rbd: watch command should unwatch before exiting

Switched the rbd CLI tool to use the new watch/unwatch API
and properly unwatch the image before exiting. Additionally,
the watch command opened the image twice -- once R/W and another
R/O.  This resulted in two watches being created for the image.
Cleaned up old/new format detection by using the existing API
methods.

Fixes: #10709
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
11 years agoencoding: ignore uninitialized instantiation in boost::optional decode 3584/head
Josh Durgin [Mon, 2 Feb 2015 11:14:44 +0000 (12:14 +0100)]
encoding: ignore uninitialized instantiation in boost::optional decode

POD types won't be initialized until the decode writes to them.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge pull request #3562 from liewegas/wip-lttng
Loic Dachary [Mon, 2 Feb 2015 11:12:15 +0000 (12:12 +0100)]
Merge pull request #3562 from liewegas/wip-lttng

do_autogen.sh: default to --with-lttng, -L to build without

Reviewed-by: Loic Dachary <ldachary@redhat.com>
11 years agoMerge pull request #3485 from jdurgin/wip-merge-diff-testing
Sage Weil [Mon, 2 Feb 2015 11:07:36 +0000 (03:07 -0800)]
Merge pull request #3485 from jdurgin/wip-merge-diff-testing

Improve merge-diff test

11 years agodo_autogen.sh: default to --with-lttng, -L to build without 3562/head
Sage Weil [Mon, 2 Feb 2015 10:47:46 +0000 (02:47 -0800)]
do_autogen.sh: default to --with-lttng, -L to build without

Get developers building with LTTNG by default.

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3549 from Ved-vampir/master
Sage Weil [Mon, 2 Feb 2015 10:55:39 +0000 (02:55 -0800)]
Merge pull request #3549 from Ved-vampir/master

Ceph: Fix

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoosd: change pg_stat plain to display CRUSH_ITEM_NONE in pgmap output section. 3549/head
Ved-vampir [Fri, 30 Jan 2015 11:33:21 +0000 (13:33 +0200)]
osd:  change pg_stat plain to display CRUSH_ITEM_NONE in pgmap output section.

Fixes: #10519
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
11 years agoMerge pull request #3501 from yuyuyu101/wip-fix-async
Haomai Wang [Mon, 2 Feb 2015 10:26:08 +0000 (18:26 +0800)]
Merge pull request #3501 from yuyuyu101/wip-fix-async

AsyncMessenger: Fix mix auth assert failed

11 years agoMerge branch 'wip-rbd-listwatchers'
Josh Durgin [Mon, 2 Feb 2015 09:33:32 +0000 (10:33 +0100)]
Merge branch 'wip-rbd-listwatchers'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoman: add rbd status to doc/man/8/rbd.rst
Yunchuan Wen [Wed, 21 Jan 2015 00:43:07 +0000 (00:43 +0000)]
man: add rbd status to doc/man/8/rbd.rst

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
11 years agoMerge pull request #3533 from ceph/wip-disaster-doc
John Spray [Mon, 2 Feb 2015 09:04:32 +0000 (10:04 +0100)]
Merge pull request #3533 from ceph/wip-disaster-doc

doc: add cephfs disaster recovery guidance

Reviewed-by: Greg Farnum <gfarnum@redhat.com
11 years agodoc: add cephfs disaster recovery guidance 3533/head
John Spray [Mon, 5 Jan 2015 15:46:38 +0000 (15:46 +0000)]
doc: add cephfs disaster recovery guidance

This is a place to put some useful notes about
the new offline recovery tooling.

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agotest: add rbd status to src/test/cli/rbd/help.t
Yunchuan Wen [Wed, 21 Jan 2015 00:42:55 +0000 (00:42 +0000)]
test: add rbd status to src/test/cli/rbd/help.t

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
11 years agorbd: add status command to list the watchers of an image
Yunchuan Wen [Wed, 21 Jan 2015 00:42:41 +0000 (00:42 +0000)]
rbd: add status command to list the watchers of an image

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
11 years agoMerge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph
Josh Durgin [Sun, 1 Feb 2015 20:17:34 +0000 (21:17 +0100)]
Merge branch 'librbd-cache-iohint' of git://github.com/majianpeng/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/ImageCtx.cc
src/librbd/ImageCtx.h
src/osdc/ObjectCacher.cc
src/osdc/ObjectCacher.h

11 years agoMerge pull request #3556 from trociny/image_watcher-fixup
Josh Durgin [Sun, 1 Feb 2015 12:54:52 +0000 (13:54 +0100)]
Merge pull request #3556 from trociny/image_watcher-fixup

librbd: RemoteAsyncRequest: fix comparison operator

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge pull request #3537 from ceph/wip-10688-boost-157
Loic Dachary [Sun, 1 Feb 2015 12:16:34 +0000 (13:16 +0100)]
Merge pull request #3537 from ceph/wip-10688-boost-157

#10688: support Boost 1.57.0

Reviewed-by: Loic Dachary <ldachary@redhat.com>
11 years agolibrbd: RemoteAsyncRequest: fix comparison operator 3556/head
Mykola Golub [Sun, 1 Feb 2015 11:58:25 +0000 (13:58 +0200)]
librbd: RemoteAsyncRequest: fix comparison operator

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
11 years agorbd: use IO hints for read/write operations
Jason Dillaman [Wed, 21 Jan 2015 20:23:31 +0000 (15:23 -0500)]
rbd: use IO hints for read/write operations

Import, export, and benchmark operations now use the librados
IO hints to indicate the read/write pattern and whether caching
is required.

Fixes: #10462
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge remote-tracking branch 'origin/wip-4087'
Josh Durgin [Sun, 1 Feb 2015 06:36:05 +0000 (07:36 +0100)]
Merge remote-tracking branch 'origin/wip-4087'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Conflicts:
src/librbd/LibrbdWriteback.cc

11 years agoMerge pull request #3545 from thesues/fix-cmp-xattr
Sage Weil [Sat, 31 Jan 2015 22:08:10 +0000 (14:08 -0800)]
Merge pull request #3545 from thesues/fix-cmp-xattr

Fix ReplicatedPG do_xattr_cmp_u64

Backport: giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3555 from ceph/wip-10106
Sage Weil [Sat, 31 Jan 2015 22:01:03 +0000 (14:01 -0800)]
Merge pull request #3555 from ceph/wip-10106

rgw: flush xml header on get acl request

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3527 from wonzhq/op-stat
Sage Weil [Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)]
Merge pull request #3527 from wonzhq/op-stat

osd: don't log op stats for proxy read in the cache tier

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3503 from ceph/wip-pg-reqids
Sage Weil [Sat, 31 Jan 2015 21:15:47 +0000 (13:15 -0800)]
Merge pull request #3503 from ceph/wip-pg-reqids

osd: index PGLog with optional extra_reqids in each log entry

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Wang, Zhiqiang <zhiqiang.wang@intel.com>
11 years agoMerge pull request #3554 from ceph/wip-10572
Josh Durgin [Sat, 31 Jan 2015 11:09:55 +0000 (12:09 +0100)]
Merge pull request #3554 from ceph/wip-10572

rgw: finalize perfcounters after shutting down storage

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoMerge pull request #3323 from ceph/wip-10445
Josh Durgin [Sat, 31 Jan 2015 11:06:20 +0000 (03:06 -0800)]
Merge pull request #3323 from ceph/wip-10445

rgw: use gc for multipart abort

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agoceph_test_rados: fix typo
Sage Weil [Sat, 31 Jan 2015 10:15:53 +0000 (02:15 -0800)]
ceph_test_rados: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3452 from majianpeng/iohint
Josh Durgin [Sat, 31 Jan 2015 09:03:48 +0000 (01:03 -0800)]
Merge pull request #3452 from majianpeng/iohint

Iohint in librbd cache.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
11 years agorgw: flush xml header on get acl request 3555/head
Yehuda Sadeh [Sat, 31 Jan 2015 02:42:40 +0000 (18:42 -0800)]
rgw: flush xml header on get acl request

Fixes: #10106
Backport: firefly, giant

dump_start() updates the formatter with the appropriate prefix, however,
we never flushed the formatter.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
11 years agorgw: finalize perfcounters after shutting down storage 3554/head
Yehuda Sadeh [Fri, 30 Jan 2015 22:34:32 +0000 (14:34 -0800)]
rgw: finalize perfcounters after shutting down storage

Fixes: #10572
Backport: giant, firefly
First disable the storage subsystem, then disable perfcounters.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
11 years agolibrbd: Don't do readahead for random read.
Jianpeng Ma [Mon, 12 Jan 2015 06:35:28 +0000 (14:35 +0800)]
librbd: Don't do readahead for random read.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #3516 from ceph/wip-mdsmon-args
Sage Weil [Fri, 30 Jan 2015 21:22:48 +0000 (13:22 -0800)]
Merge pull request #3516 from ceph/wip-mdsmon-args

mon/MDSMonitor: fix gid/rank/state parsing

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
11 years agoMerge pull request #3551 from ceph/wip-10698
Yehuda Sadeh [Fri, 30 Jan 2015 21:14:38 +0000 (13:14 -0800)]
Merge pull request #3551 from ceph/wip-10698

rgw: fail s3 POST auth if keystone not configured

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
11 years agoReplicatedPG::C_ProxyRead: fix dropped lock 3587/head
Samuel Just [Fri, 30 Jan 2015 20:54:47 +0000 (12:54 -0800)]
ReplicatedPG::C_ProxyRead: fix dropped lock

Fixes: 10633
Signed-off-by: Samuel Just <sjust@redhat.com>
11 years agoReplicatedPG: only populate_obc_watchers if active 3538/head
Samuel Just [Mon, 1 Dec 2014 22:52:11 +0000 (14:52 -0800)]
ReplicatedPG: only populate_obc_watchers if active

Signed-off-by: Samuel Just <sjust@redhat.com>
11 years agoOSD: allow recovery in peered
Samuel Just [Wed, 26 Nov 2014 22:00:34 +0000 (14:00 -0800)]
OSD: allow recovery in peered

Signed-off-by: Samuel Just <sjust@redhat.com>