]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoblkdev: using strncpy instead of strcpy. 2978/head
Jianpeng Ma [Fri, 21 Nov 2014 01:55:02 +0000 (09:55 +0800)]
blkdev: using strncpy instead of strcpy.

Coverity Scan reported this bug:
> New defect(s) Reported-by: Coverity Scan Showing 1 of 1 defect(s)
> *** CID 1255369:  Copy into fixed size buffer  (STRING_OVERFLOW)
> /common/blkdev.cc: 34 in block_device_support_discard(const char *)()
> 28     bool block_device_support_discard(const char *devname)
> 29     {
> 30       bool can_trim = false;
> 31       char *p = strstr((char *)devname, "sd");
> 32       char name[32] = {0};
> 33
> >>>     CID 1255369:  Copy into fixed size buffer  (STRING_OVERFLOW)
> >>>     You might overrun the 32 byte fixed-size string "name" by
> >>>     copying "p" without checking the length.
> 34       strcpy(name, p);
> 35       for (unsigned int i = 0; i < strlen(name); i++) {
> 36         if(isdigit(name[i])) {
> 37           name[i] = 0;
> 38           break;
> 39         }
>

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #2974 from ceph/wip-sepia-update
Sage Weil [Thu, 20 Nov 2014 19:34:36 +0000 (11:34 -0800)]
Merge pull request #2974 from ceph/wip-sepia-update

Updated sepia hardware list.

10 years agoUpdated sepia hardware list. 2974/head
Sandon Van Ness [Thu, 20 Nov 2014 19:13:38 +0000 (11:13 -0800)]
Updated sepia hardware list.

Added missing details and additional list of hardware.

Signed-off-by: Sandon Van Ness <sandon@redhat.com>
10 years agoMerge pull request #2752 from dachary/wip-9817-deep-scrub-start
Samuel Just [Thu, 20 Nov 2014 17:45:33 +0000 (09:45 -0800)]
Merge pull request #2752 from dachary/wip-9817-deep-scrub-start

osd: log when scrub,deep scrub, repair starts

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2891 from XinzeChi/master
Samuel Just [Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)]
Merge pull request #2891 from XinzeChi/master

OSD: batch trim for pg_log

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2885 from ceph/wip-flush-snaps
Samuel Just [Thu, 20 Nov 2014 17:42:47 +0000 (09:42 -0800)]
Merge pull request #2885 from ceph/wip-flush-snaps

osd/ReplicatedPG: flush snaps immediately

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2973 from wonzhq/unused-parm
Loic Dachary [Thu, 20 Nov 2014 10:19:37 +0000 (11:19 +0100)]
Merge pull request #2973 from wonzhq/unused-parm

ReplicatedPG: remove unused parameter in function write_update_size_and_usage

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoReplicatedPG: remove unused parameter in function write_update_size_and_usage 2973/head
Zhiqiang Wang [Thu, 20 Nov 2014 08:26:32 +0000 (16:26 +0800)]
ReplicatedPG: remove unused parameter in function write_update_size_and_usage

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #2967 from ceph/wip-10077
David Zafman [Wed, 19 Nov 2014 19:37:22 +0000 (11:37 -0800)]
Merge pull request #2967 from ceph/wip-10077

ceph_objectstore_tool shard feature handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2971 from dachary/wip-mailmap
Loic Dachary [Wed, 19 Nov 2014 19:30:38 +0000 (20:30 +0100)]
Merge pull request #2971 from dachary/wip-mailmap

mailmap: Loic Dachary name normalization

10 years agomailmap: Loic Dachary name normalization 2971/head
Loic Dachary [Wed, 19 Nov 2014 19:25:24 +0000 (20:25 +0100)]
mailmap: Loic Dachary name normalization

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2962 from ceph/wip-9439
Loic Dachary [Wed, 19 Nov 2014 18:27:15 +0000 (19:27 +0100)]
Merge pull request #2962 from ceph/wip-9439

osd: Check filter ops for pgls and pgnls

Reviewed-by: Loic Dachary <ldachary@dachary.org>
10 years agoMerge pull request #2969 from dachary/wip-erasure-code-documentation
Loic Dachary [Wed, 19 Nov 2014 10:24:01 +0000 (11:24 +0100)]
Merge pull request #2969 from dachary/wip-erasure-code-documentation

doc: erasure-code developer documentation typo

Reviewed-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
10 years agodoc: erasure-code developer documentation typo 2969/head
Loic Dachary [Wed, 19 Nov 2014 10:06:31 +0000 (11:06 +0100)]
doc: erasure-code developer documentation typo

Reported-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2953 from yuyuyu101/fix-keyvaluestore-remove-col-attr
Sage Weil [Wed, 19 Nov 2014 05:49:31 +0000 (21:49 -0800)]
Merge pull request #2953 from yuyuyu101/fix-keyvaluestore-remove-col-attr

KeyValueStore: Remove assert for collection_getattr method

Reviewed-by: Sage Weil <sage@redhat.com>
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 agoceph_objectstore_tool: Add feature called set-allow-sharded-objects 2967/head
David Zafman [Tue, 18 Nov 2014 21:00:15 +0000 (13:00 -0800)]
ceph_objectstore_tool: Add feature called set-allow-sharded-objects

Uses --op set-allow-sharded-objects option
This operation will be rejected if on the target OSD's osdmap there is
    at least one OSD which does not support ERASURE CODES.
Prompt the user that they could import if sharded state allowed
Prompt the user to use new feature if sharded state found inconsistent

Fixes: #10077
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Add utility routine get_osdmap()
David Zafman [Tue, 18 Nov 2014 19:59:18 +0000 (11:59 -0800)]
ceph_objectstore_tool: Add utility routine get_osdmap()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Clear ...INCOMPAT_SHARDS from feature if exporting replicated pg
David Zafman [Thu, 13 Nov 2014 05:14:11 +0000 (21:14 -0800)]
ceph_objectstore_tool: Clear ...INCOMPAT_SHARDS from feature if exporting replicated pg

Don't require importing OSD to have shards feature for replicated pg

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

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #2648 from dachary/wip-9665-ceph-disk-partprobe
Loic Dachary [Wed, 19 Nov 2014 01:54:10 +0000 (02:54 +0100)]
Merge pull request #2648 from dachary/wip-9665-ceph-disk-partprobe

ceph-disk: run partprobe/partx after zap and data partition creation

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoFileJournal: add journal_discard to control ssd whether support discard
Jianpeng Ma [Thu, 13 Nov 2014 05:21:32 +0000 (13:21 +0800)]
FileJournal: add journal_discard to control ssd whether support discard

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoFileJournal: Add ssd discard for journal which using ssd disk as journal.
Jianpeng Ma [Thu, 13 Nov 2014 03:32:57 +0000 (11:32 +0800)]
FileJournal: Add ssd discard for journal which using ssd disk as journal.

Journal is like a ring buffer. After data wrote to media disk, journal
can overwrite. But for those data, ssd dont't know it's nouse and can
remove. So add discard to tell ssd to remove those data.
This maybe not increase the performance. But it can increase the
lifetime of ssd.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #2960 from ceph/wip-10114-fix-warning
Sage Weil [Tue, 18 Nov 2014 23:31:32 +0000 (15:31 -0800)]
Merge pull request #2960 from ceph/wip-10114-fix-warning

erasure-code isa-l: remove duplicated lines (fix warning)

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoerasure-code isa-l: remove duplicated lines (fix warning) 2960/head
Dan Mick [Tue, 18 Nov 2014 23:21:30 +0000 (15:21 -0800)]
erasure-code isa-l: remove duplicated lines (fix warning)

06a245a added a section def to assembly files; I added it twice to
this file.  There's no damage, but a compiler warning (on machines with
yasm installed)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agoMerge pull request #2951 from sponce/master
Loic Dachary [Tue, 18 Nov 2014 12:46:10 +0000 (13:46 +0100)]
Merge pull request #2951 from sponce/master

Fixed trivial locking issue in the trunc method of libradosstriper

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoautotools: add --enable-docker 2648/head
Loic Dachary [Tue, 7 Oct 2014 19:18:00 +0000 (21:18 +0200)]
autotools: add --enable-docker

Docker based tests should be explicit instead of auto-detected. It is
good that they do not run if docker is not available. It would be bad if
they run when the developer does not expect them to create docker
containers.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoceph-disk: test prepare / activate on a device
Loic Dachary [Tue, 7 Oct 2014 17:02:45 +0000 (19:02 +0200)]
ceph-disk: test prepare / activate on a device

This indirectly tests that partprobe is called after zap because it
would fail to map the partitions to /dev/disk/by-partuuid otherwise.

It also indirectly test the implementation of init=none when using a
block device because the test would fail to put an object into the rbd
pool using the device otherwise.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agotests: helper to run unit / function tests in docker
Loic Dachary [Tue, 7 Oct 2014 16:40:54 +0000 (18:40 +0200)]
tests: helper to run unit / function tests in docker

For instance

   test/docker-test.sh --os-type ubuntu --os-version 14.04 \
        test/ceph-disk.sh

runs test/ceph-disk.sh in a ubuntu 14.04 docker container. Once the
container is populated and ceph compiled, running a test script roughly
requires entering the container and running make TESTS=tests/foo.sh check

* docker build ceph-ubuntu-14.04 using ubuntu.dockerfile as a Dockerfile
* it will run apt-get install ceph compilation / run dependencies
* git clone the-local-clone ceph-ubuntu-14.04
* docker run ceph-ubuntu-14.04 make -j4 in the ceph-ubuntu-14.04 clone
* docker run test/ceph-disk.sh

test/docker-test.sh is the command line interface for
test/docker-test-helper.sh which can be invoked from shell scripts.
test/ubuntu.dockerfile and test/ubuntu.dockerfile are regular
Dockerfiles which allow substitution of environment variables.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoceph-disk: implement init=none for block devices
Loic Dachary [Mon, 6 Oct 2014 15:58:46 +0000 (17:58 +0200)]
ceph-disk: implement init=none for block devices

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoceph-disk: run partprobe after zap
Loic Dachary [Thu, 9 Oct 2014 16:52:17 +0000 (18:52 +0200)]
ceph-disk: run partprobe after zap

Not running partprobe after zapping a device can lead to the following:

* ceph-disk prepare /dev/loop2
* links are created in /dev/disk/by-partuuid
* ceph-disk zap /dev/loop2
* links are not removed from /dev/disk/by-partuuid
* ceph-disk prepare /dev/loop2
* some links are not created in /dev/disk/by-partuuid

This is assuming there is a bug in the way udev events are handled by
the operating system.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoceph-disk: use update_partition in prepare_dev and main_prepare
Loic Dachary [Fri, 10 Oct 2014 08:26:31 +0000 (10:26 +0200)]
ceph-disk: use update_partition in prepare_dev and main_prepare

In the case of prepare_dev the partx alternative was missing and is not
added because update_partition does it.

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

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoceph-disk: encapsulate partprobe / partx calls
Loic Dachary [Fri, 10 Oct 2014 08:23:34 +0000 (10:23 +0200)]
ceph-disk: encapsulate partprobe / partx calls

Add the update_partition function to reduce code duplication.
The action is made an argument although it always is -a because it will
be -d when deleting a partition.

Use the update_partition function in prepare_journal_dev

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agodoc: update debian compilation dependencies
Loic Dachary [Sun, 5 Oct 2014 20:14:02 +0000 (22:14 +0200)]
doc: update debian compilation dependencies

Using the content of debian/control.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoMerge pull request #2910 from swamireddy/wip-organizationmap
Loic Dachary [Tue, 18 Nov 2014 11:17:00 +0000 (12:17 +0100)]
Merge pull request #2910 from swamireddy/wip-organizationmap

mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2907 from xuechendi/update_organizationmap
Loic Dachary [Tue, 18 Nov 2014 11:15:58 +0000 (12:15 +0100)]
Merge pull request #2907 from xuechendi/update_organizationmap

Add myself to <contact@intel.com>

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoFixed locking issue in the trun method of libradosstriper leading to potential race... 2951/head
Sebastien Ponce [Tue, 18 Nov 2014 09:30:36 +0000 (10:30 +0100)]
Fixed locking issue in the trun method of libradosstriper leading to potential race conditions - Fixes: #10129

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
10 years agoMerge pull request #2917 from leseb/rbd-update-glance-config
Loic Dachary [Tue, 18 Nov 2014 10:12:59 +0000 (11:12 +0100)]
Merge pull request #2917 from leseb/rbd-update-glance-config

doc: update the OpenStack glance configuration

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2950 from ceph/wip-10128
Loic Dachary [Tue, 18 Nov 2014 09:40:55 +0000 (10:40 +0100)]
Merge pull request #2950 from ceph/wip-10128

Wip 10128

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py test all variants of export/import 2950/head
David Zafman [Tue, 18 Nov 2014 08:10:41 +0000 (00:10 -0800)]
tests: ceph_objectstore_tool.py test all variants of export/import

Handle change of error message text

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: Make --file option consistent by treating "-" as stdout/stdin
David Zafman [Tue, 18 Nov 2014 07:23:40 +0000 (23:23 -0800)]
ceph_objectstore_tool: Make --file option consistent by treating "-" as stdout/stdin

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph_objectstore_tool: When exporting to stdout, don't cout messages
David Zafman [Tue, 18 Nov 2014 07:02:50 +0000 (23:02 -0800)]
ceph_objectstore_tool: When exporting to stdout, don't cout messages

Fixes: #10128
Caused by a2bd2aa7

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #2946 from ceph/wip-execstack
Sage Weil [Tue, 18 Nov 2014 06:33:41 +0000 (22:33 -0800)]
Merge pull request #2946 from ceph/wip-execstack

Add annotation to all assembly files to turn off stack-execute bit

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2933 from ceph/wip-librbd-symbols
Josh Durgin [Tue, 18 Nov 2014 02:23:27 +0000 (18:23 -0800)]
Merge pull request #2933 from ceph/wip-librbd-symbols

librbd: Only public API symbols from the shared library

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2947 from HP-Scale-out-Storage/wip-10096
Sage Weil [Mon, 17 Nov 2014 23:44:38 +0000 (15:44 -0800)]
Merge pull request #2947 from HP-Scale-out-Storage/wip-10096

Wip 10096 (ceph-disk umount race condition)

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoFix bug #10096 (ceph-disk umount race condition) 2947/head
Blaine Gardner [Mon, 17 Nov 2014 23:17:15 +0000 (17:17 -0600)]
Fix bug #10096 (ceph-disk umount race condition)

Bug: http://tracker.ceph.com/issues/10096

Brief: Unmounting temporary mount point failed due to file being 'busy'.
Root cause could not be easily determined due to timing variances caused
by debug attempts. Race condition exists.

Solution: Implement a retry with incremental backoff as a viable
workaround. This workaround is okay because (1) Finding the root cause
would take a not insignificant amount of time/effort. (2) The workaround
is a more general fix for any process that might cause the exhibited
behavior.

Signed-off-by: Blaine Gardner <blaine.gardner@hp.com>
10 years agoMerge pull request #2914 from dachary/wip-10093-monstore-tool
João Eduardo Luís [Mon, 17 Nov 2014 18:03:35 +0000 (18:03 +0000)]
Merge pull request #2914 from dachary/wip-10093-monstore-tool

mon: ceph-monstore-tool must close()

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #2943 from ceph/wip-dumper-coverity
Sage Weil [Mon, 17 Nov 2014 14:57:58 +0000 (06:57 -0800)]
Merge pull request #2943 from ceph/wip-dumper-coverity

tools: Close the fd before returning in Dumper

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2942 from tchaikov/wip-fix-rongze-affiliation
Loic Dachary [Mon, 17 Nov 2014 13:31:07 +0000 (14:31 +0100)]
Merge pull request #2942 from tchaikov/wip-fix-rongze-affiliation

mailmap: fix Rongze's affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: fix Rongze's affiliation 2942/head
Kefu Chai [Mon, 17 Nov 2014 12:50:30 +0000 (20:50 +0800)]
mailmap: fix Rongze's affiliation

10 years agoMerge pull request #2915 from dachary/wip-10063-objectstore-tool-erasure-code
Loic Dachary [Mon, 17 Nov 2014 11:29:58 +0000 (12:29 +0100)]
Merge pull request #2915 from dachary/wip-10063-objectstore-tool-erasure-code

ghobject::dump must display shard_id + make ceph_objectstore_tool run from make check

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2929 from thesues/master
Loic Dachary [Mon, 17 Nov 2014 10:28:07 +0000 (11:28 +0100)]
Merge pull request #2929 from thesues/master

Fix libstriprados::stat, use strtoll insdead of strtol

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoFix libstriprados::stat, use strtoll insdead of strtol 2929/head
Dongmao Zhang [Fri, 14 Nov 2014 10:48:58 +0000 (18:48 +0800)]
Fix libstriprados::stat, use strtoll insdead of strtol

The return value(long int) of strict_strtol is too small for unstriped
object.

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
10 years agoMerge pull request #2939 from aspiers/fix/architecture-docs
Sage Weil [Sun, 16 Nov 2014 23:23:39 +0000 (15:23 -0800)]
Merge pull request #2939 from aspiers/fix/architecture-docs

minor tweaks to architecture document

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc: fix typos in diagram for incomplete write 2939/head
Adam Spiers [Sun, 16 Nov 2014 20:52:36 +0000 (15:52 -0500)]
doc: fix typos in diagram for incomplete write

In this example of a write of v2 of the object being interrupted, OSD2
would never have any version of the D1 chunk.  It only has the old v1
version of the D2 chunk.

Signed-off-by: Adam Spiers <aspiers@suse.com>
10 years agodoc: fix incorrect equalities
Adam Spiers [Sun, 16 Nov 2014 20:51:16 +0000 (15:51 -0500)]
doc: fix incorrect equalities

The previous punctuation accidentally implied that K == 1 and M == -1.

Signed-off-by: Adam Spiers <aspiers@suse.com>
10 years agodoc: fix typo (superfluous "no")
Adam Spiers [Sun, 16 Nov 2014 20:49:03 +0000 (15:49 -0500)]
doc: fix typo (superfluous "no")

Signed-off-by: Adam Spiers <aspiers@suse.com>
10 years agotests: ceph_objectstore_tool.py fix list-attr for erasure code 2915/head
David Zafman [Sat, 15 Nov 2014 19:43:10 +0000 (11:43 -0800)]
tests: ceph_objectstore_tool.py fix list-attr for erasure code

Adding testing of xattr for erasure coded shards
Fix error message when finding an unexpected xattr key

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotests: ceph_objectstore_tool.py check for malformed JSON for erasure code objs
David Zafman [Sat, 15 Nov 2014 19:46:15 +0000 (11:46 -0800)]
tests: ceph_objectstore_tool.py check for malformed JSON for erasure code objs

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling
David Zafman [Sat, 15 Nov 2014 19:44:54 +0000 (11:44 -0800)]
tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agocommon: do not omit shard when ghobject NO_GEN is set
Loic Dachary [Fri, 14 Nov 2014 00:16:10 +0000 (01:16 +0100)]
common: do not omit shard when ghobject NO_GEN is set

Do not silence the display of shard_id when generation is NO_GEN.
Erasure coded objects JSON representation used by ceph_objectstore_tool
need the shard_id to find the file containing the chunk.

Minimal testing is added to ceph_objectstore_tool.py

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: run ceph_objectstore_tool.py from make check
Loic Dachary [Thu, 13 Nov 2014 16:33:42 +0000 (17:33 +0100)]
tests: run ceph_objectstore_tool.py from make check

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py skip if /dev/tty fails
Loic Dachary [Fri, 14 Nov 2014 10:00:17 +0000 (11:00 +0100)]
tests: ceph_objectstore_tool.py skip if /dev/tty fails

Some environments do not have a /dev/tty. When opening /dev/tty fails,
skip the test instead of returning an error.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py encapsulate init-ceph stop
Loic Dachary [Thu, 13 Nov 2014 18:15:50 +0000 (19:15 +0100)]
tests: ceph_objectstore_tool.py encapsulate init-ceph stop

Call init-ceph in kill_daemons and add a call to kill_daemon when main
returns on error so that it never leaves daemons hanging.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py main returns
Loic Dachary [Thu, 13 Nov 2014 18:14:49 +0000 (19:14 +0100)]
tests: ceph_objectstore_tool.py main returns

Instead of calling sys.exit() the main function returns the desired exit
code.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py replace stop.sh with init-ceph
Loic Dachary [Thu, 13 Nov 2014 16:32:14 +0000 (17:32 +0100)]
tests: ceph_objectstore_tool.py replace stop.sh with init-ceph

The stop.sh will stop all ceph-* processes. Use the init-ceph script
instead to selectively kill the daemons run by the vstart.sh cluster
used for ceph_objectstore_tool.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py use a dedicated directory
Loic Dachary [Thu, 13 Nov 2014 16:30:29 +0000 (17:30 +0100)]
tests: ceph_objectstore_tool.py use a dedicated directory

Set CEPH_DIR to a directory that is specific to ceph_objectstore_tool so
that it can run in parallel with other vstart.sh clusters.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py run faster by default
Loic Dachary [Thu, 13 Nov 2014 16:27:01 +0000 (17:27 +0100)]
tests: ceph_objectstore_tool.py run faster by default

By default use only a small number of objects to speed up the tests. If
the argument "big" is given, use a large number of objects as it may
help find some problems.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py run mon and osd on specific port
Loic Dachary [Thu, 13 Nov 2014 16:21:48 +0000 (17:21 +0100)]
tests: ceph_objectstore_tool.py run mon and osd on specific port

By default vstart.sh runs MDS but they are not needed for the tests,
only run mon and osd instead. Instead of using the default vstart.sh
port which may conflict with a already running vstart.sh, set the
CEPH_PORT=7400 which is not used by any other test run with make check.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py can use a WARN cluster
Loic Dachary [Thu, 13 Nov 2014 16:16:41 +0000 (17:16 +0100)]
tests: ceph_objectstore_tool.py can use a WARN cluster

The tests do not need HEALTH_OK exclusively, a HEALTH_WARN cluster can
also run them successfully.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph_objectstore_tool.py use env python
Loic Dachary [Thu, 13 Nov 2014 16:12:35 +0000 (17:12 +0100)]
tests: ceph_objectstore_tool.py use env python

Using #/usr/bin/env python instead of a hard coded path is more flexible
and can also be used to run from virtualenv.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agovstart: use hostname -s instead of fqdn
Loic Dachary [Thu, 13 Nov 2014 17:49:10 +0000 (18:49 +0100)]
vstart: use hostname -s instead of fqdn

Otherwise init-ceph.in will fail if hostname returns a fqdn. It
validates the host entry of the [osd.x] section does not contain dots.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoAdd annotation to all assembly files to turn off stack-execute bit 2946/head
Dan Mick [Sat, 15 Nov 2014 01:59:57 +0000 (17:59 -0800)]
Add annotation to all assembly files to turn off stack-execute bit

See discussion in http://tracker.ceph.com/issues/10114

Building with these changes allows output from readelf like this:

 $ readelf -lW src/.libs/librados.so.2 | grep GNU_STACK
  GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000
0x000000 RW  0x8

(note the absence of 'X' in 'RW')

Fixes: #10114
Signed-off-by: Dan Mick <dan.mick@redhat.com>
10 years agotools: Close the fd before returning in Dumper 2943/head
Greg Farnum [Fri, 14 Nov 2014 22:28:25 +0000 (14:28 -0800)]
tools: Close the fd before returning in Dumper

CID 1251577
CID 717084

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #2935 from dachary/wip-mailmap
Loic Dachary [Fri, 14 Nov 2014 21:46:28 +0000 (22:46 +0100)]
Merge pull request #2935 from dachary/wip-mailmap

mailmap: Loic Dachary name normalization

10 years agomailmap: Loic Dachary name normalization 2935/head
Loic Dachary [Fri, 14 Nov 2014 21:42:24 +0000 (22:42 +0100)]
mailmap: Loic Dachary name normalization

Do not rewrite the past.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotest_async_driver: fix warning
Sage Weil [Fri, 14 Nov 2014 18:37:10 +0000 (10:37 -0800)]
test_async_driver: fix warning

test/msgr/test_async_driver.cc:233:209: instantiated from here

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2389 from ceph/wip-doc-documenting-ceph
John Wilkins [Fri, 14 Nov 2014 18:13:12 +0000 (10:13 -0800)]
Merge pull request #2389 from ceph/wip-doc-documenting-ceph

doc: Update documenting ceph to include CentOS/RHEL

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agodoc: Removed separate build file for rpm. 2389/head
John Wilkins [Fri, 14 Nov 2014 18:11:35 +0000 (10:11 -0800)]
doc: Removed separate build file for rpm.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
10 years agoMerge pull request #2801 from CzBiX/permanent-location
Yehuda Sadeh [Fri, 14 Nov 2014 17:03:42 +0000 (09:03 -0800)]
Merge pull request #2801 from CzBiX/permanent-location

rgw: add location when data in another region.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #2932 from nilamdyuti/wip-doc-documenting-ceph
Loic Dachary [Fri, 14 Nov 2014 16:18:12 +0000 (17:18 +0100)]
Merge pull request #2932 from nilamdyuti/wip-doc-documenting-ceph

doc: Adds build-doc guidelines for Fedora and CentOS/RHEL.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2930 from dachary/wip-warning
Haomai Wang [Fri, 14 Nov 2014 16:12:05 +0000 (00:12 +0800)]
Merge pull request #2930 from dachary/wip-warning

tests: fix cast compilation warning

10 years agodoc: Adds build-doc guidelines for Fedora and CentOS/RHEL. 2932/head
Nilamdyuti Goswami [Fri, 14 Nov 2014 15:36:15 +0000 (21:06 +0530)]
doc: Adds build-doc guidelines for Fedora and CentOS/RHEL.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #2923 from ktdreyer/doc-install-giant
Loic Dachary [Fri, 14 Nov 2014 15:17:54 +0000 (16:17 +0100)]
Merge pull request #2923 from ktdreyer/doc-install-giant

doc: update packages page for Giant

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: update release descriptions on packages page 2923/head
Ken Dreyer [Thu, 13 Nov 2014 23:20:14 +0000 (16:20 -0700)]
doc: update release descriptions on packages page

Firefly was listed as the "latest release" of Ceph. Add Giant and label
it as the latest release instead.

Releases A-C and E are no longer supported. D will receive updates for
some time longer, and F is a "long term stable" release.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agotests: fix cast compilation warning 2930/head
Loic Dachary [Fri, 14 Nov 2014 14:01:34 +0000 (15:01 +0100)]
tests: fix cast compilation warning

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2928 from leseb/improve-exceptions
Loic Dachary [Fri, 14 Nov 2014 10:05:02 +0000 (11:05 +0100)]
Merge pull request #2928 from leseb/improve-exceptions

Improve readability of the exception

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoImprove readability of the exception 2928/head
Sébastien Han [Thu, 13 Nov 2014 18:11:36 +0000 (19:11 +0100)]
Improve readability of the exception

The error messages were not really clear from a non-programmer
perspective. In the context of OpenStack all the drivers are falling
back to the exceptions provided by the rados library. Having clearer
error messages will help debugging misconfigured environment.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
10 years agorgw: add location when data in another region. 2801/head
VRan Liu [Fri, 14 Nov 2014 08:27:17 +0000 (16:27 +0800)]
rgw: add location when data in another region.

When the bucket of requested is in another region, Add location header
in response, so client can follow that to get data.

Signed-off-by: VRan Liu <gliuwr@gmail.com>
10 years agodoc: update the OpenStack glance configuration 2917/head
Sébastien Han [Thu, 13 Nov 2014 17:24:07 +0000 (18:24 +0100)]
doc: update the OpenStack glance configuration

Juno is now using a section for configuring the stores, so let's use it.
Put spaces between flag and value for clarity and readibility.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
10 years agolibrbd: Only public API symbols from the shared library 2933/head
Jason Dillaman [Fri, 14 Nov 2014 06:02:48 +0000 (01:02 -0500)]
librbd: Only public API symbols from the shared library

The librbd shared library was previously exporting all
symbols.  librbd public API methods are now explicitly
exported and all other symbols are hidden.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #2925 from yuyuyu101/update-mailmap
Loic Dachary [Fri, 14 Nov 2014 07:42:35 +0000 (08:42 +0100)]
Merge pull request #2925 from yuyuyu101/update-mailmap

Mailmap: add Rongze organization

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMailmap: add Rongze organization 2925/head
Haomai Wang [Fri, 14 Nov 2014 03:42:41 +0000 (11:42 +0800)]
Mailmap: add Rongze organization

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>