]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoStoreTest: Clean up warning 2953/head
Haomai Wang [Wed, 19 Nov 2014 04:04:53 +0000 (12:04 +0800)]
StoreTest: Clean up warning

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMemStore: Return -ENODATA when collection_getattr hit nonexist attr
Haomai Wang [Wed, 19 Nov 2014 04:04:22 +0000 (12:04 +0800)]
MemStore: Return -ENODATA when collection_getattr hit nonexist attr

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore: Fix collection_getattrs problem when zero-length attr
Haomai Wang [Wed, 19 Nov 2014 04:02:43 +0000 (12:02 +0800)]
KeyValueStore: Fix collection_getattrs problem when zero-length attr

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore: Return -ENODATA if collection_getattr is nonexist
Haomai Wang [Wed, 19 Nov 2014 02:48:28 +0000 (10:48 +0800)]
KeyValueStore: Return -ENODATA if collection_getattr is nonexist

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoStoreTest: Add collection_getattr(s) tests
Haomai Wang [Wed, 19 Nov 2014 03:52:52 +0000 (11:52 +0800)]
StoreTest: Add collection_getattr(s) tests

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore: Remove assert for collection_getattr method
Haomai Wang [Wed, 19 Nov 2014 03:52:33 +0000 (11:52 +0800)]
KeyValueStore: Remove assert for collection_getattr method

Merge 22b6c1a5317504e87042ffeff2b2d0d0b71cac5e introduce
5dc990c1ca821620993417ef4acc51a2b0a34606 commit which will lookup "remove"
attr. It shouldn't exist for most of cases but KeyValueStore will crash
if attr isn't exist. It seemed that this assert isn't correct.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agovstart.sh: complain less about fullish mon disks
Sage Weil [Fri, 14 Nov 2014 00:41:34 +0000 (16:41 -0800)]
vstart.sh: complain less about fullish mon disks

Lots of people develop on file systems  > 70% full.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Thu, 13 Nov 2014 21:26:04 +0000 (13:26 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agomds: don't overwrite reply's snapbl
Yan, Zheng [Thu, 13 Nov 2014 05:38:35 +0000 (13:38 +0800)]
mds: don't overwrite reply's snapbl

set_trace_dist() updates reply's snapbl, don't overwrite it. For MKSNAP
request, just need to set mdr->tracei, set_trace_dist() will set reply's
snapbl.

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #2772 from ceph/wip-init-radosgw
Loic Dachary [Thu, 13 Nov 2014 20:58:45 +0000 (21:58 +0100)]
Merge pull request #2772 from ceph/wip-init-radosgw

init-radosgw.sysv: set ulimit -n before starting daemon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2920 from ceph/wip-10095
Samuel Just [Thu, 13 Nov 2014 19:08:23 +0000 (11:08 -0800)]
Merge pull request #2920 from ceph/wip-10095

crush: fix detach_bucket

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agocrush/CrushWrapper: fix detach_bucket 2920/head
Sage Weil [Thu, 13 Nov 2014 18:59:22 +0000 (10:59 -0800)]
crush/CrushWrapper: fix detach_bucket

In commit 9850227d2f0ca2f692a154de2c14a0a08e751f08 we changed the call that
changed the weight of all instances of item to one that explicitly
changes it in the parent bucket, but parent_id may not be valid at the
call site.  Move this into the conditional block to fix.

Fixes: #10095
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMakefile: include 'ceph' in base target
Sage Weil [Thu, 13 Nov 2014 18:49:33 +0000 (10:49 -0800)]
Makefile: include 'ceph' in base target

This makes 'make base' enough to vstart.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2906 from ceph/wip-9835
Sage Weil [Thu, 13 Nov 2014 18:35:04 +0000 (10:35 -0800)]
Merge pull request #2906 from ceph/wip-9835

osd: fix misdirected ec ops stuck in optracker (9835)

Reviewed-by: Samuel Just <sam.just@inktank.com>
10 years agomsg/Makefile: add new header to tarball
Sage Weil [Thu, 13 Nov 2014 18:05:53 +0000 (10:05 -0800)]
msg/Makefile: add new header to tarball

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2909 from yuyuyu101/wip-10079
Sage Weil [Thu, 13 Nov 2014 17:12:26 +0000 (09:12 -0800)]
Merge pull request #2909 from yuyuyu101/wip-10079

AsyncMessenger: Add select support and tests for async drivers

10 years agoMerge pull request #2912 from dachary/wip-warning
Jason Dillaman [Thu, 13 Nov 2014 14:26:02 +0000 (09:26 -0500)]
Merge pull request #2912 from dachary/wip-warning

tests: fix compilation warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #2911 from keichwa/wip-doc-rados
Loic Dachary [Thu, 13 Nov 2014 12:45:02 +0000 (13:45 +0100)]
Merge pull request #2911 from keichwa/wip-doc-rados

Wip doc rados

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: fix compilation warning 2912/head
Loic Dachary [Thu, 13 Nov 2014 12:03:22 +0000 (13:03 +0100)]
tests: fix compilation warning

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: remove superfluous white spaces (for testing) 2911/head
Karl Eichwalder [Thu, 13 Nov 2014 10:40:05 +0000 (11:40 +0100)]
doc: remove superfluous white spaces (for testing)

Signed-off-by: Karl Eichwalder <ke@suse.de>
10 years agodoc: Fix 2 syntax errors.
Karl Eichwalder [Thu, 13 Nov 2014 10:17:01 +0000 (11:17 +0100)]
doc: Fix 2 syntax errors.

Signed-off-by: Karl Eichwalder <ke@suse.de>
10 years agoAsyncMessenger: Fix select driver for add_event 2909/head
Haomai Wang [Thu, 13 Nov 2014 07:10:05 +0000 (15:10 +0800)]
AsyncMessenger: Fix select driver for add_event

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncMessenger: Add tests for async drivers
Haomai Wang [Thu, 13 Nov 2014 05:43:27 +0000 (13:43 +0800)]
AsyncMessenger: Add tests for async drivers

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoAsyncMessenger: Support select for other OS such as Windows
Haomai Wang [Wed, 12 Nov 2014 09:26:03 +0000 (17:26 +0800)]
AsyncMessenger: Support select for other OS such as Windows

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoosd/OSD: use OSDMap helper to determine if we are correct op target 2906/head
Sage Weil [Thu, 13 Nov 2014 01:11:10 +0000 (17:11 -0800)]
osd/OSD: use OSDMap helper to determine if we are correct op target

Use the new helper.  This fixes our behavior for EC pools where targetting
a different shard is not correct, while for replicated pools it may be. In
the EC case, it leaves the op hanging indefinitely in the OpTracker because
the pgid exists but as a different shard.

Fixes: #9835
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoosd/OSDMap: add osd_is_valid_op_target()
Sage Weil [Thu, 13 Nov 2014 01:04:35 +0000 (17:04 -0800)]
osd/OSDMap: add osd_is_valid_op_target()

Helper to check whether an osd is a given op target for a pg.  This
assumes that for EC we always send ops to the primary, while for
replicated we may target any replica.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph_objectstore_tool: Fixes to make import work again
David Zafman [Wed, 12 Nov 2014 23:22:04 +0000 (15:22 -0800)]
ceph_objectstore_tool: Fixes to make import work again

The is_pg() call is now true even for pgs pending removal, fix broken
    finish_remove_pgs() by removing is_pg() check.
Need to add create_collection() to the initial transaction on import

Fixes: #10090
Signed-off-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2903 from ceph/wip-crush-tree
Sage Weil [Wed, 12 Nov 2014 21:58:14 +0000 (13:58 -0800)]
Merge pull request #2903 from ceph/wip-crush-tree

crush: fix tree bucket functions

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agovstart.sh: warn less
Sage Weil [Wed, 12 Nov 2014 21:35:43 +0000 (13:35 -0800)]
vstart.sh: warn less

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2892 from leseb/doc-juno-client-socket
Josh Durgin [Wed, 12 Nov 2014 20:57:06 +0000 (21:57 +0100)]
Merge pull request #2892 from leseb/doc-juno-client-socket

doc: enable RBD cache and socket on OpenStack deployments

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2902 from dachary/wip-10083-noisy-osd
Sage Weil [Wed, 12 Nov 2014 19:27:08 +0000 (11:27 -0800)]
Merge pull request #2902 from dachary/wip-10083-noisy-osd

qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'origin/next'
Josh Durgin [Wed, 12 Nov 2014 19:18:52 +0000 (11:18 -0800)]
Merge remote-tracking branch 'origin/next'

10 years agoqa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create 2902/head
Loic Dachary [Wed, 12 Nov 2014 17:49:54 +0000 (18:49 +0100)]
qa: handle CEPH_CLI_TEST_DUP_COMMAND on ceph osd create

If CEPH_CLI_TEST_DUP_COMMAND is set when ceph osd create is called, it
will create two osd. They must be cleaned up afterwards instead of
assuming only one is going to be created.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2124 from ceph/wip-objectstore
Sage Weil [Wed, 12 Nov 2014 18:02:52 +0000 (10:02 -0800)]
Merge pull request #2124 from ceph/wip-objectstore

simplify ObjectStore interface

sage-2014-11-11_08:26:01-rados-wip-sage-testing-distro-basic-multi

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2722 from ceph/wip-9598
Sage Weil [Wed, 12 Nov 2014 18:01:50 +0000 (10:01 -0800)]
Merge pull request #2722 from ceph/wip-9598

msgr: make mark_down not block on fast dispatch

sage-2014-11-11_08:26:01-rados-wip-sage-testing-distro-basic-multi

Reviewed-by: Greg Farnum <greg@inktank.com>
10 years agoMerge pull request #2901 from ktdreyer/doc-spelling-grammar
John Wilkins [Wed, 12 Nov 2014 17:18:42 +0000 (09:18 -0800)]
Merge pull request #2901 from ktdreyer/doc-spelling-grammar

doc: spelling & grammar fixes

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agodoc: correct grammar in RGW SSL cert installation 2901/head
Ken Dreyer [Wed, 12 Nov 2014 16:54:39 +0000 (09:54 -0700)]
doc: correct grammar in RGW SSL cert installation

The SSL certificate generation instruction was missing a preposition.
Add it.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: correct spelling of "fqdn"
Ken Dreyer [Wed, 12 Nov 2014 16:52:16 +0000 (09:52 -0700)]
doc: correct spelling of "fqdn"

The "fqdn" (fully-qualified domain name) was misspelled in a couple
places as fgdn". Use the correct spelling.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #2899 from jdurgin/wip-import-export-next
Jason Dillaman [Wed, 12 Nov 2014 14:26:45 +0000 (09:26 -0500)]
Merge pull request #2899 from jdurgin/wip-import-export-next

qa: allow small allocation diffs for exported rbds

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
10 years agodoc: enable RBD cache and socket on OpenStack deployments 2892/head
Sébastien Han [Mon, 10 Nov 2014 14:06:20 +0000 (15:06 +0100)]
doc: enable RBD cache and socket on OpenStack deployments

Enabling the RBD cache improves sequential IOs and the socket helps a
lot while troubleshooting. These 2 items are considered as best
practice for OpenStack deployments with Ceph.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
10 years agoqa: allow small allocation diffs for exported rbds 2899/head
Josh Durgin [Wed, 12 Nov 2014 02:16:02 +0000 (18:16 -0800)]
qa: allow small allocation diffs for exported rbds

The local filesytem may behave slightly differently. This isn't
foolproof, but seems to be reliable enough on rhel7 rootfs, where
exact comparison was failing.

Fixes: #10002
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2898 from ceph/wip-rbd-python-tests
Josh Durgin [Wed, 12 Nov 2014 02:13:04 +0000 (03:13 +0100)]
Merge pull request #2898 from ceph/wip-rbd-python-tests

librbd: Python unit tests now use unique pools and images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2820 from ceph/wip-9854
Josh Durgin [Wed, 12 Nov 2014 02:05:28 +0000 (03:05 +0100)]
Merge pull request #2820 from ceph/wip-9854

osdc: Constrain max number of in-flight read requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2890 from zhouyuan/fix_mailmap
Loic Dachary [Wed, 12 Nov 2014 00:52:44 +0000 (01:52 +0100)]
Merge pull request #2890 from zhouyuan/fix_mailmap

Fix Yuan's mailmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Wed, 12 Nov 2014 00:22:40 +0000 (16:22 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoFix Yuan's mailmap 2890/head
Yuan Zhou [Mon, 10 Nov 2014 01:47:29 +0000 (09:47 +0800)]
Fix Yuan's mailmap

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agodoc/release-notes: v0.88
Sage Weil [Wed, 12 Nov 2014 00:15:08 +0000 (16:15 -0800)]
doc/release-notes: v0.88

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2897 from ceph/wip-da-revert-10b68b
Sage Weil [Tue, 11 Nov 2014 23:28:20 +0000 (15:28 -0800)]
Merge pull request #2897 from ceph/wip-da-revert-10b68b

Revert "osd: detect (some) misordered ondisk tmaps"

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agocrush: fix tree bucket functions 2903/head
Rongze Zhu [Mon, 10 Nov 2014 16:13:42 +0000 (00:13 +0800)]
crush: fix tree bucket functions

There are incorrect nodes' weight in tree bucket when construct tree
bucket. The tree bucket don't store item id in items array, so the tree
bucket will not work correctly. The patch fix above bugs and add a
simple test for tree bucket.

Signed-off-by: Rongze Zhu <zrzhit@gmail.com>
10 years agocrush/builder: replace printf with an empty dprintk macro
Sage Weil [Tue, 11 Nov 2014 19:16:58 +0000 (11:16 -0800)]
crush/builder: replace printf with an empty dprintk macro

This mirrors mapper.c.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoRevert "osd: detect (some) misordered ondisk tmaps" 2897/head
Danny Al-Gaaf [Tue, 11 Nov 2014 18:06:12 +0000 (19:06 +0100)]
Revert "osd: detect (some) misordered ondisk tmaps"

This reverts commit 10b68b2e1a1479c478843fab8232537675053c9b.

The check for 'nextkey < last_disk_key' makes not much sense since
last_disk_key is an empty string and not set before. Comparing a
decoded string to be less than an empty string will be never true.

Since this if() isn't part of a loop last_disk_key is only set
once and there is no other consumer: revert this dead code.

Conflicts:
src/osd/ReplicatedPG.cc

10 years ago0.88 v0.88
Jenkins [Tue, 11 Nov 2014 17:33:12 +0000 (09:33 -0800)]
0.88

10 years agoMerge pull request #2562 from ceph/wip-5595
Josh Durgin [Tue, 11 Nov 2014 17:18:43 +0000 (18:18 +0100)]
Merge pull request #2562 from ceph/wip-5595

Wip 5595

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agodoc/rados/configuration fix 'ods mkfs options' default
Sage Weil [Tue, 11 Nov 2014 15:52:39 +0000 (07:52 -0800)]
doc/rados/configuration fix 'ods mkfs options' default

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2466 from nereocystis/osd-filesystem-options
Sage Weil [Tue, 11 Nov 2014 15:50:44 +0000 (07:50 -0800)]
Merge pull request #2466 from nereocystis/osd-filesystem-options

doc: Add file system osd config settings

10 years agoMerge pull request #2883 from ceph/wip-da-SCA-20141028
Sage Weil [Tue, 11 Nov 2014 15:48:12 +0000 (07:48 -0800)]
Merge pull request #2883 from ceph/wip-da-SCA-20141028

Fixes for coverity and SCA issues

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2889 from xuechendi/move_buffers_to_BufferTransaction
Sage Weil [Tue, 11 Nov 2014 15:11:55 +0000 (07:11 -0800)]
Merge pull request #2889 from xuechendi/move_buffers_to_BufferTransaction

KeyValueStore: move buffers from strip_header to BufferTransaction

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #2739 from majianpeng/fix2
Sage Weil [Tue, 11 Nov 2014 15:09:55 +0000 (07:09 -0800)]
Merge pull request #2739 from majianpeng/fix2

buffer: Judge bufferlist whether need  rebuild

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2894 from ceph/wip-scrub-coverity
Yan, Zheng [Tue, 11 Nov 2014 14:52:52 +0000 (22:52 +0800)]
Merge pull request #2894 from ceph/wip-scrub-coverity

Wip scrub coverity

10 years agoAuthSessionHandler.h: init protocol in constructor 2883/head
Danny Al-Gaaf [Fri, 7 Nov 2014 20:44:29 +0000 (21:44 +0100)]
AuthSessionHandler.h: init protocol in constructor

Init protocol in AuthSessionHandler constructor with
with CEPH_AUTH_UNKNOWN.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agosrc/librbd/librbd.cc: fix potential null pointer deref
Danny Al-Gaaf [Fri, 7 Nov 2014 15:52:04 +0000 (16:52 +0100)]
src/librbd/librbd.cc: fix potential null pointer deref

Fix potential deref after null check. Move check for max_snaps in
rbd_snap_list up to fail early before call any functions.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoosd/ReplicatedPG.cc: remove redundant check
Danny Al-Gaaf [Thu, 30 Oct 2014 04:16:34 +0000 (05:16 +0100)]
osd/ReplicatedPG.cc: remove redundant check

Fix for:

[src/osd/ReplicatedPG.cc:2171]: (style) Redundant checking of STL
 container element existence before removing it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agotest/librados/c_read_operations.cc: fix invalid checks
Danny Al-Gaaf [Thu, 30 Oct 2014 02:57:16 +0000 (03:57 +0100)]
test/librados/c_read_operations.cc: fix invalid checks

Wrong variable for return of rados_getxattrs_next() and
rados_omap_get_next() used (len vs. val_len).

Fix for:

CID 1219464 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this expression
 key == NULL inside statement if (len == 0UL && key == NU...

CID 1219465 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this expression
 key == NULL inside statement if (len == 0UL && key == NU...

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agorgw_rados.cc: remove dead code
Danny Al-Gaaf [Thu, 30 Oct 2014 02:44:30 +0000 (03:44 +0100)]
rgw_rados.cc: remove dead code

Fix for:

CID 1128391 (#1 of 1): Logically dead code (DEADCODE)
 dead_error_line: Execution cannot reach this statement goto done_err;

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agorados_sync.cc: fix xattr_diff() for the only_in_b checks
Danny Al-Gaaf [Thu, 30 Oct 2014 02:14:41 +0000 (03:14 +0100)]
rados_sync.cc: fix xattr_diff() for the only_in_b checks

In the checks to build only_in_b up the wrong const_iterator x is
build up. it should compare rhs->xattrs with xattrs entries and
not twice rhs->xattrs.

Fix for:

CID 716957 (#1 of 1): Invalid iterator comparison (MISMATCHED_ITERATOR)
 mismatched_comparison: Comparing x from rhs->xattrs to this->xattrs.end()
 from this->xattrs.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agobench_log.cc: catch ceph::FailedAssertion exception
Danny Al-Gaaf [Tue, 28 Oct 2014 19:06:25 +0000 (20:06 +0100)]
bench_log.cc: catch ceph::FailedAssertion exception

Fix for:

CID 717177 (#2-1 of 3): Uncaught exception (UNCAUGHT_EXCEPT)
 root_function: In function main(int, char const **) an exception of
 type ceph::FailedAssertion is thrown and never caught.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoosd/PGLog.cc: prefer empty() over size() for emptiness check
Danny Al-Gaaf [Tue, 28 Oct 2014 19:05:19 +0000 (20:05 +0100)]
osd/PGLog.cc: prefer empty() over size() for emptiness check

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agolibrbd: Python unit tests now use unique pools and images 2898/head
Jason Dillaman [Tue, 11 Nov 2014 07:17:28 +0000 (02:17 -0500)]
librbd: Python unit tests now use unique pools and images

RBD python unit tests no longer utilize the 'rbd' pool for
test cases.  Instead, a new temporary pool is created and
deleted. Additionally, each unit test now uses a unique
image name to reduce the possibility of test case failures
affecting subsequent tests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #2873 from ceph/wip-rbd-test-fixtures
Josh Durgin [Tue, 11 Nov 2014 06:42:39 +0000 (07:42 +0100)]
Merge pull request #2873 from ceph/wip-rbd-test-fixtures

librbd: Refactor librbd unit tests to use test fixtures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agobufferlist: Don't call rebuild(), c_strt() call it if bufferlist not contiguous. 2739/head
Jianpeng Ma [Tue, 21 Oct 2014 06:30:17 +0000 (14:30 +0800)]
bufferlist: Don't call rebuild(), c_strt() call it if bufferlist not contiguous.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosdc: Constrain max number of in-flight read requests 2820/head
Jason Dillaman [Mon, 27 Oct 2014 18:47:19 +0000 (14:47 -0400)]
osdc: Constrain max number of in-flight read requests

Constrain the number of in-flight RADOS read requests to the
cache size.  This reduces the chance of the cache memory
ballooning during certain scenarios like copy-up which can
invoke many concurrent read requests.

Fixes: #9854
Backport: giant, firefly, dumpling
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #2893 from ceph/wip-10045
Sage Weil [Tue, 11 Nov 2014 02:11:18 +0000 (18:11 -0800)]
Merge pull request #2893 from ceph/wip-10045

common/Readahead: use correct lock when waiting on the pending ops

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2878 from ceph/wip-10025
Gregory Farnum [Tue, 11 Nov 2014 01:20:48 +0000 (17:20 -0800)]
Merge pull request #2878 from ceph/wip-10025

#10025 Fix 'journal import' (aka undump)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agocommon/Readahead: use correct lock when waiting on the pending ops 2893/head
Jason Dillaman [Mon, 10 Nov 2014 21:08:05 +0000 (16:08 -0500)]
common/Readahead: use correct lock when waiting on the pending ops

Readahead was using the incorrect lock with the pending condition,
resulting in a failed assertion.  It now uses the lock associated
with pending ops.

Fixes: #10045
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agomds: remove dead code from inode_t::compare() 2894/head
Greg Farnum [Tue, 11 Nov 2014 00:52:48 +0000 (16:52 -0800)]
mds: remove dead code from inode_t::compare()

CID 1251354

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: CInode: catch exception by reference, not value
Greg Farnum [Tue, 11 Nov 2014 00:47:35 +0000 (16:47 -0800)]
mds: CInode: catch exception by reference, not value

CID 1251353

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #2380 from osynge/wip-suse-systemd-integration
Sage Weil [Tue, 11 Nov 2014 00:44:26 +0000 (16:44 -0800)]
Merge pull request #2380 from osynge/wip-suse-systemd-integration

systemd support in ceph-disk activate

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2446 from xylv/wip-9359
Yehuda Sadeh [Tue, 11 Nov 2014 00:35:02 +0000 (16:35 -0800)]
Merge pull request #2446 from xylv/wip-9359

rgw: Export user stats in get-user-info Adminops API

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #2725 from CzBiX/rgw-modified-since
Yehuda Sadeh [Tue, 11 Nov 2014 00:29:21 +0000 (16:29 -0800)]
Merge pull request #2725 from CzBiX/rgw-modified-since

rgw: correct "If-Modified-Since" handle.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #2782 from boydc2014/master
Sage Weil [Tue, 11 Nov 2014 00:21:08 +0000 (16:21 -0800)]
Merge pull request #2782 from boydc2014/master

rgw: fix can not disable max_size quota

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #2624 from ceph/wip-8911
Sage Weil [Tue, 11 Nov 2014 00:14:10 +0000 (16:14 -0800)]
Merge pull request #2624 from ceph/wip-8911

rgw: swift GET / HEAD object returns X-Timestamp field

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2851 from ceph/wip-9986
Samuel Just [Mon, 10 Nov 2014 23:00:26 +0000 (15:00 -0800)]
Merge pull request #2851 from ceph/wip-9986

objecter: fix map skipping

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2667 from yuandong1222/avoid-unused-pg_to_acting_osds-call
Samuel Just [Mon, 10 Nov 2014 22:58:56 +0000 (14:58 -0800)]
Merge pull request #2667 from yuandong1222/avoid-unused-pg_to_acting_osds-call

Avoid unused pg_to_acting_osds call in OSDMap::get_primary_shard

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2474 from dachary/wip-9420-erasure-code-non-regression
Samuel Just [Mon, 10 Nov 2014 22:57:42 +0000 (14:57 -0800)]
Merge pull request #2474 from dachary/wip-9420-erasure-code-non-regression

erasure-code: store and compare encoded contents

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2456 from ceph/wip-9031-9262
Samuel Just [Mon, 10 Nov 2014 22:56:30 +0000 (14:56 -0800)]
Merge pull request #2456 from ceph/wip-9031-9262

Wip 9031 9262

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
10 years agoMerge pull request #2553 from ceph/wip-aio-journal
Samuel Just [Mon, 10 Nov 2014 22:55:04 +0000 (14:55 -0800)]
Merge pull request #2553 from ceph/wip-aio-journal

osd: clean up journal aio+dio header issue

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2745 from ceph/wip-6756
Samuel Just [Mon, 10 Nov 2014 22:53:56 +0000 (14:53 -0800)]
Merge pull request #2745 from ceph/wip-6756

JounralingObjectStore: journal->committed_thru after replay

10 years agoMerge pull request #2773 from ceph/wip-9852
Samuel Just [Mon, 10 Nov 2014 22:52:10 +0000 (14:52 -0800)]
Merge pull request #2773 from ceph/wip-9852

mon: MDSMonitor: proper error output if pool DNE on 'add_data_pool'

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #2822 from ceph/wip-9887
Samuel Just [Mon, 10 Nov 2014 22:51:15 +0000 (14:51 -0800)]
Merge pull request #2822 from ceph/wip-9887

Wip 9887

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2850 from ceph/wip-9987
Samuel Just [Mon, 10 Nov 2014 22:49:51 +0000 (14:49 -0800)]
Merge pull request #2850 from ceph/wip-9987

mon: fix min_last_epoch_started tracking

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #2862 from ceph/wip-log-client
Samuel Just [Mon, 10 Nov 2014 22:47:15 +0000 (14:47 -0800)]
Merge pull request #2862 from ceph/wip-log-client

osd, mds: fix cluster log

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoqa/workunits/cephtool/test.sh: ceph, not ./ceph
Sage Weil [Mon, 10 Nov 2014 22:12:11 +0000 (14:12 -0800)]
qa/workunits/cephtool/test.sh: ceph, not ./ceph

Fixes: #10053
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoqa/workunits/fs/misc: combine sudo and echo effectively
Greg Farnum [Fri, 7 Nov 2014 01:59:22 +0000 (17:59 -0800)]
qa/workunits/fs/misc: combine sudo and echo effectively

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit abc995b6b4e0117b74c301abcb4faf4ea2ebef25)

10 years agoMerge pull request #2689 from zhurongze/fix-crush
Sage Weil [Mon, 10 Nov 2014 17:02:28 +0000 (09:02 -0800)]
Merge pull request #2689 from zhurongze/fix-crush

crush: fix incorrect use of adjust_item_weight method

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2881 from ceph/wip-10030
Sage Weil [Mon, 10 Nov 2014 16:41:58 +0000 (08:41 -0800)]
Merge pull request #2881 from ceph/wip-10030

librbd: don't close an already closed parent image upon failure

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocrush: fix incorrect use of adjust_item_weight method 2689/head
Rongze Zhu [Fri, 10 Oct 2014 11:18:00 +0000 (19:18 +0800)]
crush: fix incorrect use of adjust_item_weight method

adjust_item_weight method will adjust all buckets which the item
inside. If the osd.0 in host=fake01 and host=fake02, we execute
"ceph osd crush osd.0 10 host=fake01", it not only will adjust fake01's
weight, but also will adjust fake02's weight.

the patch add adjust_item_weightf_in_loc method and fix remove_item,
_remove_item_under, update_item, insert_item, detach_bucket methods.

Signed-off-by: Rongze Zhu <zrzhit@gmail.com>
10 years agoerasure-code: erasure_code_benchmark exhaustive erasure exploration 2474/head
Loic Dachary [Thu, 25 Sep 2014 12:46:07 +0000 (14:46 +0200)]
erasure-code: erasure_code_benchmark exhaustive erasure exploration

Add the --erasure-generation exhaustive flag to try all combinations of
erasures, not just one at random.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoerasure-code: add erasure_code_benchmark --verbose
Loic Dachary [Mon, 29 Sep 2014 09:17:13 +0000 (11:17 +0200)]
erasure-code: add erasure_code_benchmark --verbose

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoerasure_code: implement ceph_erasure_code to assert the existence of a plugin
Loic Dachary [Tue, 23 Sep 2014 12:37:57 +0000 (14:37 +0200)]
erasure_code: implement ceph_erasure_code to assert the existence of a plugin

This is handy when scripting in the context of teuthology and only
conditionally run tests for the isa plugin, for instance.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoerasure-code: ceph_erasure_code does not need to avoid dlclose
Loic Dachary [Tue, 23 Sep 2014 12:36:08 +0000 (14:36 +0200)]
erasure-code: ceph_erasure_code does not need to avoid dlclose

The only reason for not dlclosing plugins at exit is for callgrind but
ceph_erasure_code has no workload that would require callgrind.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>