Commit Graph

31707 Commits

Author SHA1 Message Date
Josh Durgin
abca34aa59 Objecter: keep ObjectOperation rval pointers for writes
Just before sending an op, prepare_mutate_op() is called, creating a
new Op. prepare_read_op() already copied over all the out-params
correctly, but for write operations the individual op return value
pointers were not copied, so they would not be filled in. With this
fixed, librados users can get the per-op return codes again.

Partially fixes: #6483
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2014-02-18 12:34:31 -08:00
Gregory Farnum
393a202198 Merge pull request #1227 from ceph/wip-7394
Improve the OSD and generic monitor timeout mechanisms

Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-18 12:34:29 -08:00
Samuel Just
43b5cf977c Merge remote-tracking branch 'upstream/wip-ecbackend-for-review'
Reviewed-by: Sage Weil <sage@inktank.com>
2014-02-18 10:56:12 -08:00
Sage Weil
45a782ff56 Merge pull request #1255 from ceph/wip-cache-perf
osd: add perfcounters for new cache and agent events

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2014-02-18 08:22:17 -08:00
Sage Weil
4bee6ff1bc osd/ReplicatedPG: clean up agent skip debug output
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
d1a185bd4b osd: l_osd_agent_{wake,skip,flush,evict}
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
dbec1096f4 osd: l_osd_tier_[dirty|clean]
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
150e87a163 osd: l_osd_tier_whiteout
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
2d5371ddaf osd: l_osd_tier_evict
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Sage Weil
c45a477efc osd: l_osd_tier_[try_]flush[_fail]
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Sage Weil
4b0a0a1023 osd: l_osd_copyfrom
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Samuel Just
5e727bfe1a RadosModel: only output if missing header is actually a problem
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:17 -08:00
Samuel Just
11f288e5d5 Objecter: track primary explicitly to detect changing primaries
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:17 -08:00
Samuel Just
bc31c4b32a ReplicatedPG: add some debugging if waiting_for_commit is non-empty
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
b90584a837 osd/: instantiate the right backend based on pool
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
792f0a85d0 ECBackend: flesh out ECBackend implementation
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
45b6c59e5b osd/ECTransaction: add type encapsulating EC transaction
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
33c3830158 osd/ECUtil: add ec encode/decode util helpers
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
7731a9490c ObjectStore: add bufferlist/string getattr
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
258af5ebe6 buffer: allow caller to initialize bufferhash state
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
ae827cfe4d osd_types: add swap, claim_append to ObjectModDesc
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
7772014a4a OSD,PG: pass through EC messages
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:16 -08:00
Samuel Just
6cd64a507d messages,osd: add EC messages and associated types
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
e8820ac42a src/osd/: add ECBackend stubs
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
0661d8025a PGBackend: make getattrs virtual
This way, the backend can choose to filter private attrs.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
ca323ff627 ReplicatedPG: fix size checking for ECBackend pools
Allow the backend to adjust the logical object size before
checking against the ondisk size.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
510585b795 PGBackend/ReplicatedBackend: factor out logical to ondisk size mapping
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
26745ca899 PGBackend/ReplicatedBackend: move the backend agnostic code into PGBackend for scrub
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
1835c29f6d ReplicatedBackend: factor out be_deep-scrub
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
f0b69b384b osd/: replace bufferptr with bufferlist for attrs in recovery
Now we won't have to keep converting back and forth!

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:15 -08:00
Samuel Just
0b180e6a62 PG::discover_all_missing: request a FULLLOG
Otherwise, we cannot correct for divergent objects in the missing
set.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
84e2f39c55 PG,ReplicatedPG: Generalize missing_loc for ECBackend
Prior to EC pools, unfound => missing.  Now, unfound (unreadable,
really) is dependent on the PGBackend requirements for reconstituting
an object.  This also means recovering an object missing on a replica
but not the primary requires tracking the missing_loc set.

Thus, rather than maintaining missing_loc only for objects missing
on the primary, the MissingLoc structure will track all missing
objects actingbackfill-wide until each object is recovered.

For simplicity, since we don't really know what objects need recovery
until activation (and since we can't do anything with that information
prior to activation anyway), we defer populating the missing_loc
information until activation.

We need peers to rollback divergent log entries before we attempt to
read the relevant objects.  The simplest way to accomplish this seems to
be the simply choose to always activate peers if search_for_missing
turns up missing objects.

Due to EC pools, missing is necessary, but not sufficient for readability.
Thus, we instead check is_unreadable for cases where we need to read the object
and reserve is_missing for cases where we need the object context.

wait_for_missing_object becomes waiting_for_unreadable_object in order to avoid
having another layer of waiting_for_* maps.  These ops may be requeued
either when the primary is recovered or when the object is no longer degraded,
depending on when the object becomes readable.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
8b33d60fc4 PG: allow PGBackend to set criteria for PG up-ness
ECBackend needs to be able to require that a readable
set of the most recent interval to write be available
in order to ensure that it rolls back the log far
enough.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
facec7654c PGBackend: add some additional helpers.
ECBackend's primary specific logic mostly won't treat the
primary shard specially, so it'll be handy to have primary
agnostic helpers for get_shard_info and get_shard_missing.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
74b8a0c05c PG,PGBackend: expose acting and backfill_targets
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
5a8c0bb952 os/: allow objects with NO_GEN but non-NO_SHARD shard
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
2d3205ff1a PG: skip CRUSH_ITEM_NONE in acting set in various places
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
5db3b2dc2c osd/: extend pg_interval_t to include primary
Otherwise, we cannot correctly determine up_from/up_thru for
old intervals.  Also, we need this information to determine
when a new interval starts due to a new primary without a
change in the acting set.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:14 -08:00
Samuel Just
9d8be1b082 Objecter: handle primary other than acting[0]
EC pool particularly might have CRUSH_ITEM_NONE as acting[0] which
is not a valid osd.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:13 -08:00
Samuel Just
904704ac7f OSDMap: handle CRUSH_ITEM_NONE in acting sets
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:13 -08:00
Samuel Just
109b3c9e7f OSDMap: fill in get_primary_shard
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:13 -08:00
Samuel Just
285cf7728a PG: introduce calc_ec_acting
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:13 -08:00
Samuel Just
41e194531b PG: refactor calc_acting to handle pg_shard_t changes
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:13 -08:00
Samuel Just
035d6cc2a3 osd/: refer to pg by spg_t and replica by pg_shard_t
We may have multiple pg shards on the same osd for an
ec pool.  Thus, replicas must be referred to by <osd, shard>
and pgs by <pgid, shard>.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:12:10 -08:00
Samuel Just
8b46dd1dc0 messages/: include shard information in various pg messages
We can no longer use the messenger source information to determine
the origin of the message since an osd might have more than one
shard of a particular pg.  Thus, we need to include a pg_shard_t
from field to indicate origin.  Similarly, pg_t is no longer
sufficient to specify the destination pg, we instead use spg_t.
In the event that we get a message from an old peer, we default
from to pg_shard_t(get_source().num(), ghobject_t::no_shard())
and spg_t to spg_t(pgid, ghobject_t::no_shard()).  This suffices
because non-NO_SHARD shards can only appear once ec pools have
been enabled -- and doing that bans unenlightened osds.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:06 -08:00
Samuel Just
fa980644bd ReplicatedBackend: excise OSDService*
This should eventually make it easier to mock out a PGBackend::Listener.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:06 -08:00
Samuel Just
31b7937bae PGBackend/ReplicatedBackend: move temp handling into PGBackend
Temp handling is also the same in ReplicatedBackend as in ECBackend.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:06 -08:00
Samuel Just
761f0b1e18 PGBackend: use whoami_shard().shard in rollback*, objects*
Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:06 -08:00
Samuel Just
5d01f88caf ReplicatedBackend/PGBackend: move objects_* methods into PGBackend
These also are unchanged in ECBackend.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:06 -08:00
Samuel Just
8ca875b6f4 PGBackend/ReplicatedBackend: move rollback methods into PGBackend
These will end up essentially unchanged in ECBackend as it turns out.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2014-02-17 20:11:05 -08:00