Commit Graph

29887 Commits

Author SHA1 Message Date
Sage Weil
14dfb810c4 Merge pull request #824 from dmick/next
osdmaptool: don't put progress on stdout

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-06 07:46:02 -08:00
Sage Weil
89f27a9144 Merge pull request #825 from ceph/port/utime
utime: use to_timespec for conversion

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-06 07:45:17 -08:00
Samuel Just
a3ccd29716 RadosModel: use sharedptr_registry for snaps_in_use
There might be two concurrent rollback ops each of which
adds snap x to snaps_in_use.  Between when the first
completes and the second completes, snap x may be removed
since the first would have removed snap x from snaps_in_use.
Using sharedptr_registry here avoids this by ensuring that
the snap won't be removed from snaps_in_use until all refs
are gone.

This patch also adds size() to sharedptr_registry.

Fixes: #6719
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-05 18:00:04 -08:00
Dan Mick
c22c84a88c osdmaptool: don't put progress on stdout
If one requests JSON output, the progress message pollutes the output;
don't do that, send it to stderr instead

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-11-05 16:20:50 -08:00
Noah Watkins
81a3ea1bc0 rgw: add compat file for name service macros
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:38:48 -08:00
Noah Watkins
5dc64193cc rgw: avoid sighandler_t in favor of sig_t
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:30:24 -08:00
Noah Watkins
e9880cfc1e crush: add mising header for count
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:26:43 -08:00
Noah Watkins
a10345a552 auth: add missing header for list
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:26:33 -08:00
Noah Watkins
01a5a83841 mon: add missing header for std::find
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:26:27 -08:00
Noah Watkins
e71a2f0c8f auth: add missing header file for std::replace
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 13:26:19 -08:00
Yehuda Sadeh
8ca71b86f8 Merge pull request #811 from dmsimard/wip_6710
Be more verbose in radosgw init script issues, return the right exit codes

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-11-05 12:25:20 -08:00
Noah Watkins
0209568c57 utime: use to_timespec for conversion
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 11:49:35 -08:00
David Moreau Simard
bbcddef877 Add a verbose argument and some verbosity
This allows a user to use "-v|--verbose" to get some insight as to
what could be preventing radosgw from starting properly.

Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
2013-11-05 12:07:18 -05:00
David Moreau Simard
c4b0431b02 Verify that radosgw started, return appropriate exit code
Changed "/etc/init.d/radosgw status" into a function that now
returns the appropriate exit code.
We now also verify that radosgw actually started properly.

Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
2013-11-05 11:57:26 -05:00
David Moreau Simard
0c610918c4 We should exit 1 if radosgw is not executable
An exit 0 means everything went okay - we should exit 1 if there is a problem in
starting radosgw.

Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
2013-11-05 11:32:58 -05:00
Noah Watkins
1cc8558b60 autoconf: check for res_nquery explicitly
Creates a test that checks explicitly for res_nquery, which can be a
macro in resolv.h. Defines RESOLV_LIBS that contains any libraries that
need to be linked against.

Notes from later fix:

Based on the 2013-09-30 version of wip-port.  On FreeBSD, one must
include netinet/in.h to get the definitions for stuff in resolv.h.
Also, resolv.h's functions are part of libc instead of libresolv.

Signed-off-by: Alan Somers <asomers@gmail.com>
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 08:24:11 -08:00
Noah Watkins
ea725d3a90 autogen.sh: use glibtoolize when available
libtoolize is called glibtoolize on osx.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 08:06:24 -08:00
Noah Watkins
00734ec7c1 autogen: set exit on error
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-05 08:06:05 -08:00
Sage Weil
74873fd110 Merge pull request #816 from ceph/wip-fadvise
wbthrottle: use posix_fadvise if available

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-05 05:31:57 -08:00
Sage Weil
fe8e3be6dd Merge pull request #815 from ceph/wip-static-cast
assert: use feature test for static_cast

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-05 05:29:54 -08:00
Sage Weil
b4d0833dc2 Merge pull request #813 from ceph/wip-blkdev
support blkdev size query on osx/freebsd 

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-05 05:27:40 -08:00
Samuel Just
154ee0b034 FileStore::_collection_move_rename: handle missing dst dir on replay
In case of a replay, a missing destination directory indicates that
the destination object and directory have been removed by a later
transaction.  Thus, we need to remove the src object and return
0.

Fixes: #6714
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-04 20:33:56 -08:00
Sage Weil
d35b282d9d Merge pull request #803 from ceph/wip-6698
upstart: fix ceph-crush-location default

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-04 18:37:59 -08:00
Loic Dachary
1cd2e6534c Merge pull request #814 from ceph/wip-da-fix-galois-warning
galois.c: fix compiler warning

Reviewed-by: Loic Dachary <loic@dachary.org>
2013-11-04 16:36:32 -08:00
John Wilkins
2fcaa1fcb2 pdatedoc: Added index link to new install doc. Requires merge of wip-doc-install to work.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 15:11:49 -08:00
John Wilkins
917dd716ae doc: Deleted old manual install doc.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 15:11:05 -08:00
John Wilkins
195e86134d doc: Mentioned that install procedure is for manual deployments, not ceph-deploy or others.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 14:57:41 -08:00
John Wilkins
2aa6cde56d doc: Changed text for ceph-extras. Made it required. Mentioned newer versions.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 14:57:07 -08:00
Danny Al-Gaaf
d03924ca60 galois.c: fix compiler warning
galois_create_split_w8_tables() takes no parameter, remove '8' passed
to the function in one case.

osd/ErasureCodePluginJerasure/galois.c: In function 'galois_w32_region_multiply':
osd/ErasureCodePluginJerasure/galois.c:696:5: warning: call to function 'galois_create_split_w8_tables' without a real prototype [-Wunprototyped-calls]
In file included from osd/ErasureCodePluginJerasure/galois.c:53:0:
osd/ErasureCodePluginJerasure/galois.h:71:12: note: 'galois_create_split_w8_tables' was declared here

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-11-04 23:35:09 +01:00
Noah Watkins
6821a6e83a assert: use feature test for static_cast
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-04 13:14:11 -08:00
Noah Watkins
330a6a769b wbthrottle: use posix_fadvise if available
Only adding information about data usage. This won't effect correctness.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-04 13:01:33 -08:00
John Wilkins
2bf8ff4b68 doc: Added DNS and SSL dialog.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 12:50:30 -08:00
Samuel Just
cd0d612e1a OSD: allow project_pg_history to handle a missing map
If we get a peering message for an old map we don't have, we
can throwit out: the sending OSD will learn about the newer
maps and update itself accordingly, and we don't have the
information to know if the message is valid. This situation
can only happen if the sender was down for a long enough time
to create a map gap and its PGs have not yet advanced from
their boot-up maps to the current ones, so we can rely on it

Fixes: #6712
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-04 11:08:31 -08:00
Samuel Just
9ab513334c OSD: don't clear peering_wait_for_split in advance_map()
I really don't know why I added this...  Ops can be discarded from the
waiting_for_pg queue if we aren't primary simply because there must have
been an exchange of peering events before subops will be sent within a
particular epoch.  Thus, any events in the waiting_for_pg queue must be
client ops which should only be seen by the primary.  Peering events, on
the other hand, should only be discarded if we are in a new interval,
and that check might as well be performed in the peering wq.

Fixes: #6681
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-04 11:08:25 -08:00
Samuel Just
545135f3e1 ReplicatedPG::recover_backfill: adjust last_backfill to HEAD if snapdir
Otherwise, if last_backfill_started is a snapdir, we will fail to send a
transaction for a client IO creating the head object and removing the
snapdir object.  The result will be that head will eventually be
backfilled, but the snapdir object will erroneously not be removed.

Fixes: #6685
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-04 11:08:19 -08:00
Noah Watkins
324dd54534 test: test helper for get_block_device_size
This is the start of a potential unit test for get_block_device_size. An
actual unit test will probably need to be run as root, and either find a
device, have one specified, or create one (e.g. ramdisk)  in a platform
agnostic way. In the mean time, this tool can be run by hand, or called
for a bash script.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-04 10:13:50 -08:00
Noah Watkins
268785ff0c blkdev: support blkdev size query on osx
Support OSX, add checks for platform specific headers.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-04 10:13:50 -08:00
John Wilkins
75b4b47046 doc: Implemented changes suggested from feedback.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-04 09:54:58 -08:00
Sage Weil
254799bb86 Merge pull request #812 from ceph/revert-struct-init
Revert "fix -Wgnu-designator warnings"
2013-11-04 07:58:49 -08:00
Noah Watkins
41e052dc20 Revert "fix -Wgnu-designator warnings"
Struct initialization using dot notation as in C99, but that happens to
not be valid C++, although apparently in C++11 it is valid. We'll need a
way to keep clang from throwing warnings at this initialization style,
either using some macros to detect the comiler environment, or perhaps
moving struct initialization to a C file rather than C++.

This reverts commit 6efc2b54d5.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-04 06:23:22 -08:00
Gregory Farnum
5687a18d91 Merge pull request #809 from ceph/wip-pgmap
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-03 09:25:28 -08:00
Xing Lin
96f4607bb0 test/libcephfs: free cmount after tests finishes
unmount and release cmount at the end of tests

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-02 23:15:28 -07:00
Xing Lin
c0bcdc3702 osd/erasurecode: correct one variable name in jerasure_matrix_to_bitmatrix()
When bitmatrix is NULL, this function returns NULL.

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-02 22:18:36 -07:00
Sage Weil
adee47f8eb Merge pull request #790 from ceph/wip-warnings
ease clang's anxieties

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-02 22:17:46 -07:00
Sage Weil
1faf4bab82 Merge pull request #793 from ceph/wip-pipe
pipe: use pipe2 feature test; check fcntl retval

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-02 22:16:18 -07:00
Sage Weil
09e159719b mon/PGMap: use const ref, not pass-by-value
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-01 23:56:56 -07:00
Sage Weil
a5f2ca0337 Merge pull request #806 from jdurgin/wip-xfstests
Don't run racy xfstest 008
2013-11-01 23:32:26 -07:00
Sage Weil
9258a1c971 Merge pull request #807 from jdurgin/wip-rbd-map-rw
rbd: omit 'rw' option during map

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-01 23:31:44 -07:00
Yehuda Sadeh
52a1d6d356 Merge pull request #804 from jdurgin/wip-rgw-replica-log-next
rgw: don't turn 404 into 400 for the replicalog api

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-11-01 21:00:24 -07:00
Josh Durgin
fb0f198644 rbd: omit 'rw' option during map
The ro and rw options were added in linux 3.7. To be compatible with
older kernels, don't specify rw. The default will probably always be
rw, so this should not present any problems in the future.

Reported-by: nicolasc <nicolas.canceill@surfsara.nl>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-01 19:08:35 -07:00