Commit Graph

14349 Commits

Author SHA1 Message Date
Sage Weil
d4b44f9e5a osd: do not exclude me during build_prior
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-19 23:38:25 -07:00
Sage Weil
f7e6b1c1fe osd: show final build_prior result
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-19 23:25:32 -07:00
Josh Durgin
dfe52d9e02 OSD, PG: ignore peering messages from before the last peering restart
Check them before entering the state machine so we can
safely enter the Crashed state on unexpected messages
from the current interval.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-19 18:02:55 -07:00
Josh Durgin
628665bcb9 OSD: decrement message refcount before returning
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-19 18:02:42 -07:00
Samuel Just
a71981c00d PG: add_event, add_next_event: ignore prior_version on backlog events
We would not have the previous version if we are merging backlog events.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-19 15:59:40 -07:00
Josh Durgin
bc2c31e070 PG: choose_log_location: prefer OSDs with a backlog
Without preferring an OSD with a backlog, PGs would get stuck in the
active state when acting != up and the backlog was on an OSD with the
same last_update but a lower number or log_tail.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-19 14:33:29 -07:00
Josh Durgin
fe298f6461 OSD: send a log in response to a log query when the pg dne
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-19 14:33:29 -07:00
Samuel Just
bcbcf30237 ReplicatedPG: wait_for_missing_object in _rollback_to
Previously, we failed if the relevant clone had not yet been recovered.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-19 12:24:36 -07:00
Josh Durgin
2a0f0cd179 PG: remove unused argument to adjust_need_up_thru
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-18 17:04:17 -07:00
Josh Durgin
2452d41503 PG: include ourselves in the prior set
All acting OSDs should be in the prior set, since any of them may have
the newest update.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-18 17:04:17 -07:00
Josh Durgin
cad3dfaeaf PG: choose acting set and newest_update_osd based on a map of all osds
newest_update osd should be stable when the primary changes, to
prevent cycles of acting set choices. For the same reason, we should
not treat the primary as a special case in choose_acting.

Also remove the magic -1 from representing the current primary.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-18 17:04:17 -07:00
Josh Durgin
524ab3a6f8 PG: GetLog: don't fail if we get an outdated log
If we request a log from one osd, and then another member of our prior
set comes up with a later last_update, we should not fail when we
receive the first log.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-18 17:04:17 -07:00
Samuel Just
92706af3cf PG: reset pg_trim_to in clear_primary_state
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-18 17:04:17 -07:00
Samuel Just
51daa43590 PG: choose_acting: we need best_info to have a backlog, not the primary
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-18 17:04:17 -07:00
Samuel Just
dbb2c38380 PG: _remove_pg, reset info.last_update and info.log_tail on log zero
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-18 17:04:17 -07:00
Samuel Just
0aeb8efbb8 PG: merge_log- fix extend log case
Previously, when extending an empty log with a log with the same
last_update, we would fail an assert since we would reach the end of the
new log.
2011-05-18 17:04:17 -07:00
Samuel Just
9b9797978c PG: prefer log with longer tail
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-18 17:04:17 -07:00
Sage Weil
8c6ce348d8 osd: clean up choose_acting output
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-18 17:04:17 -07:00
Samuel Just
5d161aa0a9 PG: make choose_acting a bit smarter
This change allows old strays that don't need backlogs
to stay acting until current members of the up set are caught up.
This allows the up set to maintain its full size during peering.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-18 17:04:17 -07:00
Sage Weil
0d79f1dedc man: update cosd man page
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-18 11:45:46 -07:00
Sage Weil
071881d7e5 v0.28 2011-05-18 10:17:49 -07:00
Sage Weil
baba0a7ab3 msgr: fix signedness in alloc_aligned_buffer
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-18 10:07:02 -07:00
Sage Weil
38ba4762da crush: fix clitest now that leading spaces are stripped
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-18 09:27:02 -07:00
Yehuda Sadeh
883a980a3c Makefile: don't clean up some files 2011-05-18 09:22:19 -07:00
Sage Weil
2b729875ed Merge remote branch 'origin/stable' into next 2011-05-17 22:04:44 -07:00
Sage Weil
09810cb29b page: fix #ifdef guard
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 22:00:19 -07:00
Sage Weil
2f9ff02258 page: redefine PAGE_* macros
Saw this on sid i386:

msg/SimpleMessenger.cc: In function 'void alloc_aligned_buffer(ceph::bufferlist&
, int, int)':
msg/SimpleMessenger.cc:1782:14: error: '__sysconf' was not declared in this scop
e
msg/SimpleMessenger.cc:1789:23: error: '__sysconf' was not declared in this scop

Some header is clobbering out PAGE_* macros.  Make our header more
forceful.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 22:00:19 -07:00
Sage Weil
bfca7ac58b osd: add --mkkey mkfs option
Optionally generate a new key as part of the mkfs step.  This makes life
a bit easier for the admin.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-17 18:49:39 -07:00
Sage Weil
8ad346a3a9 mon: 'auth caps <name> [svc value [svc2 value2 [...]]]'
Avoid having to futz with cauthtool if possible.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-17 18:49:39 -07:00
Josh Durgin
a22511db22 PG: update same_acting_since when acting or up changes
This is a hack since we currently use same_up_since to denote the beginning of an interval.
We should probably change this usaged or rename it to same_interval since.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-05-17 17:30:02 -07:00
Sage Weil
50be4c464b crush: allow - and _ in crushmap type/item names
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-17 17:27:56 -07:00
Sage Weil
45494b4d0a crushtool: strip leading spaces from identifiers
No idea where these are coming from!  Weird.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-17 17:27:56 -07:00
Sage Weil
73b99163ab msgr: avoid clearing connection_state on pipe replacement
read_message and write_message both dereference connection-state, so avoid
clearing it when replacing a pipe.

read_message still uses it to find rx_buffers in ways that may interfere
when two Pipes reference the connection, but currently that is only used
for lossy pipes.  We could still take pipe_lock in that case, but it is
only an optimization (we copy the data if the buffers don't get used
directly) and probably not worth bothering with.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 17:27:56 -07:00
Sage Weil
34ffe73816 ceph.spec.in: add obsync
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 14:26:30 -07:00
Sage Weil
28e175d640 debian: obsync
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 14:26:30 -07:00
Sage Weil
6d56c20f4c obsync: no .py
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-17 14:26:29 -07:00
Samuel Just
bbb1747a0e PG: Replicas send Notifies in response to queries
Replicas only send Infos during activate.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-17 14:19:50 -07:00
Samuel Just
9c8f30f16e PG: choose_log_location, fix error when scanning up set
++up.begin() does not skip the primary. Primary might not be up[0].

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-17 14:09:37 -07:00
Samuel Just
b13bbb064c PG: PG can receive a log in WaitActingChange requested in GetLog
Discard logs requested during GetLog once we are in WaitActingChange.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-17 09:58:06 -07:00
Samuel Just
265ab99273 PG: Don't use exit to call proc_master_log
exit is also invoked when transitioning to Reset...

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-16 16:26:12 -07:00
Sage Weil
3865ca5688 mon: health WARN if monitor quorum is incomplete
Signed-off-by: Sage Weil <sage@newdream.net>
2011-05-16 13:42:31 -07:00
root
e93c0fc08b fix segfault introduced by commit de640d85fa
That commit introduces the line 'cur_con->put()' which has the possibility
of being called while cur_con is not initialized.
2011-05-15 20:56:07 -07:00
Sage Weil
cd75a9d2be osd: lazily close connections to down peers
If we hear from a peer that should be dead, tell them, but mark our
connection so that it will close after that message is delivered or if
it encounters any errors.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-14 14:07:29 -07:00
Sage Weil
a5b5aea4d8 msgr: mark_down_on_empty and mark_disposable
Mark a connection to close when messages are sent, and to close on any
error.  We can use this to tell people who should be dead that they should
be dead, but not waste resources reconnecting to them.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-14 14:07:28 -07:00
Sage Weil
5ecc42b5c2 PG: Remove downed osds from peer_missing and peer_info
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-14 13:46:09 -07:00
Samuel Just
ba753630dc PG: Only pull the master log from a member of the prior_set
There must be a member of the prior_set such that no other
osd has a more recent last_update.  This way, prior_set_affected
will ensure that we reset peering if the master log source
goes down.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-14 13:42:00 -07:00
Sage Weil
3d4971b326 Merge remote branch 'origin/osd_snap' into stable 2011-05-13 14:19:58 -07:00
Samuel Just
e0d83fe7db PG: search_for_missing takes the other osd's missing set
Previously, search_for_missing was erroneously passed the
primary's missing in a few places.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-05-13 13:56:35 -07:00
Sage Weil
89a821c6d9 radosgw_admin: fix clitest
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-13 13:13:39 -07:00
Sage Weil
91a268edc4 radosgw_admin: dump log by object
instead of only by date+bucket.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-05-12 11:01:06 -07:00