Commit Graph

37088 Commits

Author SHA1 Message Date
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
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
David Zafman
eaf1d1e352 tests: ceph_objectstore_tool.py fix off by 1 ATTR_OBJS handling
Signed-off-by: David Zafman <dzafman@redhat.com>
2014-11-15 23:29:08 +01:00
Loic Dachary
dcf09aed12 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
6d04b3c13a 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
4c94f1778f 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
fc435ff362 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
0f3d7b1315 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
e8f34bd62b 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
e303d1afde 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
235257c257 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
f04d4e7539 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
783378c019 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
74506d2506 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>
2014-11-15 23:27:15 +01:00
Loic Dachary
d1c4e5b640 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>
2014-11-15 23:27:15 +01:00
Dan Mick
06a245a984 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>
2014-11-14 17:59:57 -08:00
Greg Farnum
b10bd19f34 tools: Close the fd before returning in Dumper
CID 1251577
CID 717084

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2014-11-14 14:28:25 -08:00
Loic Dachary
8144ab0c23 Merge pull request #2935 from dachary/wip-mailmap
mailmap: Loic Dachary name normalization
2014-11-14 22:46:28 +01:00
Loic Dachary
0c8955bac4 mailmap: Loic Dachary name normalization
Do not rewrite the past.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2014-11-14 22:42:24 +01:00
Sage Weil
b6d618005f test_async_driver: fix warning
test/msgr/test_async_driver.cc:233:209: instantiated from here

Signed-off-by: Sage Weil <sage@redhat.com>
2014-11-14 10:37:10 -08:00
John Wilkins
bec99559f3 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>
2014-11-14 10:13:12 -08:00
John Wilkins
175d6e03ba doc: Removed separate build file for rpm.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-11-14 10:11:35 -08:00
Yehuda Sadeh
ad431b284d Merge pull request #2801 from CzBiX/permanent-location
rgw: add location when data in another region.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-11-14 09:03:42 -08:00
Loic Dachary
069785e631 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>
2014-11-14 17:18:12 +01:00
Haomai Wang
d957fbdb74 Merge pull request #2930 from dachary/wip-warning
tests: fix cast compilation warning
2014-11-15 00:12:05 +08:00
Nilamdyuti Goswami
a5a0d5c83f doc: Adds build-doc guidelines for Fedora and CentOS/RHEL.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-11-14 21:06:15 +05:30