Commit Graph

37113 Commits

Author SHA1 Message Date
Loic Dachary
92662a9b57 mailmap: Loic Dachary name normalization
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-11-19 20:25:24 +01:00
Loic Dachary
cb60a3e8dd Merge pull request #2962 from ceph/wip-9439
osd: Check filter ops for pgls and pgnls

Reviewed-by: Loic Dachary <ldachary@dachary.org>
2014-11-19 19:27:15 +01:00
Loic Dachary
5997635d0b Merge pull request #2969 from dachary/wip-erasure-code-documentation
doc: erasure-code developer documentation typo

Reviewed-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
2014-11-19 11:24:01 +01:00
Loic Dachary
a4b42d66a0 doc: erasure-code developer documentation typo
Reported-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-11-19 11:06:31 +01:00
Sage Weil
9c1b199aee 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>
2014-11-18 21:49:31 -08:00
Haomai Wang
b2e82543f9 StoreTest: Clean up warning
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-19 13:11:37 +08:00
Haomai Wang
dcecfb89fe MemStore: Return -ENODATA when collection_getattr hit nonexist attr
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-19 13:11:31 +08:00
Haomai Wang
7a9b75577b KeyValueStore: Fix collection_getattrs problem when zero-length attr
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-19 13:11:23 +08:00
Haomai Wang
877237f096 KeyValueStore: Return -ENODATA if collection_getattr is nonexist
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-19 11:53:12 +08:00
Haomai Wang
00b275b0ae StoreTest: Add collection_getattr(s) tests
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-11-19 11:52:52 +08:00
Haomai Wang
ffb6f78fd0 KeyValueStore: Remove assert for collection_getattr method
Merge 22b6c1a531 introduce
5dc990c1ca 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>
2014-11-19 11:52:33 +08:00
Loic Dachary
4f37c50074 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>
2014-11-19 02:54:10 +01:00
Jianpeng Ma
d3d58524dc FileJournal: add journal_discard to control ssd whether support discard
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-11-18 16:17:17 -08:00
Jianpeng Ma
9f9eb6799e 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>
2014-11-18 16:16:53 -08:00
Sage Weil
ef2ff5f476 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>
2014-11-18 15:31:32 -08:00
Dan Mick
10f6ef185a 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>
2014-11-18 15:21:30 -08:00
Loic Dachary
5bb65b33dd Merge pull request #2951 from sponce/master
Fixed trivial locking issue in the trunc method of libradosstriper

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-18 13:46:10 +01:00
Loic Dachary
c9121167d0 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
26bf8d1ecc 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
ecccb39769 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
23aaf6c90d ceph-disk: implement init=none for block devices
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-18 12:20:01 +01:00
Loic Dachary
fed3b06c47 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
23e71b1ee8 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
922a15ea68 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>
2014-11-18 12:20:01 +01:00
Loic Dachary
0e6db90a65 doc: update debian compilation dependencies
Using the content of debian/control.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-11-18 12:20:01 +01:00
Loic Dachary
c2e46755da Merge pull request #2910 from swamireddy/wip-organizationmap
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-18 12:17:00 +01:00
Loic Dachary
1ce19a8ef4 Merge pull request #2907 from xuechendi/update_organizationmap
Add myself to <contact@intel.com>

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-18 12:15:58 +01:00
Sebastien Ponce
8613984373 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>
2014-11-18 11:34:56 +01:00
Loic Dachary
0306cad406 Merge pull request #2917 from leseb/rbd-update-glance-config
doc: update the OpenStack glance configuration

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-18 11:12:59 +01:00
Loic Dachary
1c6a536806 Merge pull request #2950 from ceph/wip-10128
Wip 10128

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-18 10:40:55 +01:00
David Zafman
9e53c3554c 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>
2014-11-18 00:16:43 -08:00
David Zafman
8c87f3284f ceph_objectstore_tool: Make --file option consistent by treating "-" as stdout/stdin
Signed-off-by: David Zafman <dzafman@redhat.com>
2014-11-18 00:16:43 -08:00
David Zafman
0d5262ac2f ceph_objectstore_tool: When exporting to stdout, don't cout messages
Fixes: #10128
Caused by a2bd2aa7

Signed-off-by: David Zafman <dzafman@redhat.com>
2014-11-18 00:16:43 -08:00
Sage Weil
5c0562610b 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>
2014-11-17 22:33:41 -08:00
Josh Durgin
14ec4b4802 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>
2014-11-17 18:23:27 -08:00
Sage Weil
632e84e774 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>
2014-11-17 15:44:38 -08:00
Blaine Gardner
de547c990c 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>
2014-11-17 17:17:15 -06:00
João Eduardo Luís
1c2b093d4b Merge pull request #2914 from dachary/wip-10093-monstore-tool
mon: ceph-monstore-tool must close()

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2014-11-17 18:03:35 +00:00
Sage Weil
7055c88ac2 Merge pull request #2943 from ceph/wip-dumper-coverity
tools: Close the fd before returning in Dumper

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-17 06:57:58 -08:00
Loic Dachary
b2d0810a7c Merge pull request #2942 from tchaikov/wip-fix-rongze-affiliation
mailmap: fix Rongze's affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-17 14:31:07 +01:00
Kefu Chai
948f207a72 mailmap: fix Rongze's affiliation 2014-11-17 20:50:30 +08:00
Loic Dachary
2ad0cde78f 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>
2014-11-17 12:29:58 +01:00
Loic Dachary
e4e7fe22bc Merge pull request #2929 from thesues/master
Fix libstriprados::stat, use strtoll insdead of strtol

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-17 11:28:07 +01:00
Dongmao Zhang
fe6679dca4 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>
2014-11-17 14:49:52 +08:00
Sage Weil
babd93a453 Merge pull request #2939 from aspiers/fix/architecture-docs
minor tweaks to architecture document

Reviewed-by: Sage Weil <sage@redhat.com>
2014-11-16 15:23:39 -08:00
Adam Spiers
11aa383179 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>
2014-11-16 16:03:24 -05:00
Adam Spiers
2379c57a3c doc: fix incorrect equalities
The previous punctuation accidentally implied that K == 1 and M == -1.

Signed-off-by: Adam Spiers <aspiers@suse.com>
2014-11-16 16:03:18 -05:00
Adam Spiers
625dd4040f doc: fix typo (superfluous "no")
Signed-off-by: Adam Spiers <aspiers@suse.com>
2014-11-16 16:02:57 -05:00
David Zafman
cbecab477a 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>
2014-11-15 23:31:34 +01:00
David Zafman
40717aa4c3 tests: ceph_objectstore_tool.py check for malformed JSON for erasure code objs
Signed-off-by: David Zafman <dzafman@redhat.com>
2014-11-15 23:29:10 +01:00