Commit Graph

29980 Commits

Author SHA1 Message Date
Loic Dachary
3502d4f4b9 init: fix typo s/{$update_crush/${update_crush/
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2013-11-21 18:51:06 +01:00
Josh Durgin
b493178f6c Merge branch 'next' 2013-11-20 18:38:59 -08:00
Josh Durgin
f753d56a9e test: use older names for module setup/teardown
setUp and tearDown require nosetests 0.11, but 0.10.4 is the latest on
centos. Rename to use the older aliases, which still work with newer
versions of nosetests as well.

Fixes: #6368
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-11-20 18:37:32 -08:00
John Wilkins
72bba1f31d doc: Added fixes to osd reporting section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-20 14:28:18 -08:00
Dan Mick
a3f4148467 Merge pull request #854 from ceph/wip-osd-bench-size
osd: fix bench block size

Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-11-19 15:41:11 -08:00
David Zafman
86e4fd4f7a osd: Backfill peers should not be included in the acting set
Create actingbackfill in choose_acting()
Use first backfill target as previously
Add asserts to catch inappropriate use of actingbackfill
Use is_acting() in proc_replica_info() because this is before actingbackfill set
Remove backfill_targets from stray_set to prevent purge_strays from removing collection
Can't check is_replica() anymore for backfill operations since a backfill isn't
a replica due to acting set change.

fixes: #5855

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-11-19 14:45:20 -08:00
David Zafman
19dbf7bc1e osd: Simple dout() fix
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
82e1e7e9be PG: remove unused Peering::flushed
This has been unused for quite some time!

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
9ff0150963 PG: don't requeue waiting_for_active unless flushed and active
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
41272e71cd ReplicatedPG/PGBackend: block all ops other than Pull prior to active
Previously, it was guarranteed that prior to activation, flushed would
be false on a replica.  Now, there may be a period where flushed is true
due to the flush in Stray completing prior to activation and flushed
being false again.  This is necessary since shortly it won't be possible
to determine from the osdmap whether a stray will be activated in a
particular interval.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
6c1aaa4f80 PG: call start_flush in Active() instead of using do_pending_flush()
This way, we don't block an OpWQ thread while waiting on the filestore.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
e657369c07 PG,ReplicatedPG: allow multiple flushes to be in progress
Shortly, we won't know precisely when to flush, so Strays
may need to flush twice.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
David Zafman
da7755324d ReplicatedPG,PG: move duplicate FlushedEvt logic info on_flushed()
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-11-19 10:06:24 -08:00
Samuel Just
68e0e06370 doc: warn about #6796 in release notes
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-11-18 19:35:14 -08:00
Josh Durgin
574cb61efe man: re-generate changed man pages
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-18 18:13:40 -08:00
rallred
0de0efa936 RBD Documentation and Example fixes for --image-format
- RBD Documentation, --image-format wrongly specified as --format in examples
 - RBD Documentation, better describe image format, to differentiate from --format

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-18 18:12:38 -08:00
Josh Durgin
40a76ef0d0 osd: fix bench block size
The command was declared to take 'size' in dumpling, but was trying to
read 'bsize' instead, so it always used the default of 4MiB. Change
the bench command to read 'size', so it matches what existing clients
are sending.

Fixes: #6795
Backport: emperor, dumpling
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-18 14:39:23 -08:00
Samuel Just
2301c04aad Merge branch 'next' 2013-11-18 12:59:04 -08:00
Samuel Just
703f9a09e2 Revert "JounralingObjectStore: journal->committed_thru after replay"
committed_thru can race with the sync thread.

This reverts commit d8d27f13e1.
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-18 12:58:27 -08:00
Samuel Just
f0c89311f6 release-notes: clarify that the osd data directory needs to be mounted
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-15 13:08:45 -08:00
Samuel Just
ba67b9f0f7 doc/release-notes.rst: v0.72.1 release notes
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-15 11:50:40 -08:00
Wido den Hollander
96d7a2e905 doc: Fix wrong package names on Debian Wheezy for building Ceph 2013-11-15 12:47:11 +01:00
Wido den Hollander
f6d20ceedb Merge branch 'master' of https://github.com/ceph/ceph 2013-11-15 12:46:04 +01:00
Samuel Just
7e53473a7a Merge remote-tracking branch 'upstream/next' 2013-11-14 21:40:01 -08:00
Samuel Just
878f3540d1 ceph-filestore-tool: add tool for fixing lost objects
Used to repair: #6761
Backport: emperor
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-14 21:38:38 -08:00
Samuel Just
bf7c09a893 osd_types: fix object_info_t backwards compatibility
Shipping an object_info_t to a replica with the dirty
flag set would cause the replica to interpret that
object as being lost.  Instead, we always encode
lost into the slot where dumpling expects to find
it and add another field at the end of the encoding.

Backport: emperor
Fixes: #6761
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-14 21:38:38 -08:00
Samuel Just
1212a2119f CephContext: unregister lockdep after stopping service thread
Fixes: #6769
Fixes: #6674
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-14 14:07:23 -08:00
Samuel Just
dd9d8b0202 ReplicatedPG: test for missing head before find_object_context
find_object_context doesn't return EAGAIN for a missing head.
I chose not to change that behavior since it might hide bugs
in the future.  All other callers check for missing on head
before calling into find_object_context because we potentially
need head or snapdir to map a snapid onto a clone.

Backport: emperor
Fixes: 6758
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-14 12:25:36 -08:00
Samuel Just
d8d27f13e1 JounralingObjectStore: journal->committed_thru after replay
It's possible that the osd stopped between when the filestore
op_seq file was updated and when the journal was trimmed.  In
that case, it's possible that on boot the journal might be
full, and yet not be trimmed because commit_start assumes
there is no work to do.  Calling committed_thru on the journal
ensures that the journal matches committed_seq.

Backport: emperor dumpling
Fixes: 6756
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-14 12:24:22 -08:00
Gregory Farnum
2555dd7b63 Merge pull request #851 from ceph/wip-6768
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-13 17:38:40 -08:00
David Zafman
a7063a11ab Use clearer "local monitor storage" in log messages
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-11-13 14:16:11 -08:00
Wido den Hollander
bf9c9d0f38 Merge branch 'master' of https://github.com/ceph/ceph 2013-11-11 09:38:18 +01:00
Xing Lin
dcef9fb9bd automake: replaced hardcoded '-lboost_program_options' with a macro
replaced '-lboost_program_options' with the BOOST_PROGRAM_OPTIONS_LIBS
macro in related Makefile.am files

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
2013-11-10 17:13:07 -07:00
Xing Lin
125582e08e autoconf: add check for the boost_program_options library
check for the existence of boost_program_options library in
configure.ac since several files need that library

Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
2013-11-10 17:06:55 -07:00
Sage Weil
729c1528a8 Merge pull request #839 from kri5/master
doc: Remove redundant command for quick start preflight

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-09 22:28:03 -08:00
Sage Weil
d39ff4c3d8 mon/OSDMonitor: 'osd metadata N' command
Report recorded metadata about an OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-09 06:10:14 -08:00
Sage Weil
ea164352f7 mon/OSDMonitor: record osd metadata key/value info
Shove what the OSD gives us on boot into the store.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-09 06:10:14 -08:00
Sage Weil
6d40e941aa osd: send host/kernel metadata to mon on boot
Send a bunch of interesting information about the host we are running on
to the monitor on startup.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-09 06:10:14 -08:00
Sage Weil
3596b4cfdb Merge pull request #823 from ceph/port/detect-libresolv
autoconf: check for res_nquery explicitly
2013-11-09 00:36:08 -08:00
Sage Weil
b2acac02c6 Merge pull request #789 from ceph/wip-6683
mon: MonmapMonitor: support 'mon getmap [epoch]'

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-08 22:44:37 -08:00
Sage Weil
a8a0d4f2a1 Merge pull request #836 from ceph/port/unused-headers
trace: remove unused header
2013-11-08 22:15:26 -08:00
Sage Weil
aef3402380 doc/release-notes: fix dup
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-08 21:24:03 -08:00
John Wilkins
3c91ea1437 Merge branch 'master' of https://github.com/ceph/ceph 2013-11-08 10:23:23 -08:00
John Wilkins
21637cc615 doc: Updated Emperor reference to 0.72.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-08 10:22:44 -08:00
John Wilkins
8b5719f866 doc: Added Emperor upgrade.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-08 10:22:22 -08:00
John Wilkins
7f45e72b6b doc: Added dumpling to the sequence.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-11-08 10:21:42 -08:00
Wido den Hollander
62486276ef Merge branch 'master' of https://github.com/ceph/ceph 2013-11-08 15:21:14 +01:00
Christophe Courtaut
efe55b15a2 doc: Remove redundant command for quick start preflight
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>

This patch removes a few commands, which are redundant with following
commands.

Btw, they are also unrelated with the subtitle of the section, which is
"Add the release key".
2013-11-08 13:48:57 +01:00
Sage Weil
3c70da20e3 Merge pull request #834 from ceph/port/stat
client: use platform-specific stat time members

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-08 00:26:17 -08:00
Sage Weil
3047148b37 Merge pull request #833 from ceph/wip-da-SCA-master
Various fixes from SCA

Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-08 00:23:47 -08:00