Commit Graph

29531 Commits

Author SHA1 Message Date
Sage Weil
904859e929 osd/ReplicatedPG: use vectorized osd_op outdata for pg ops
This lets us put PGLS in a compound operation.  Nothing does that yet, but
this would allow it.
Despite appearances, this is not a protocol change and does not require
a feature bit for clients: using the osd_ops vector mechanisms store all
the data in the same places as before, it just fills in some of the
already-decoded-but-empty data structures in the MOSDOpReply header.
<Greg note:> We may need a feature bit to let clients know they can send
compound PG ops to OSDs, though? Or maybe we can let it be covered
by supporting hitset ops.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:27 -08:00
Sage Weil
a97129f197 osd/ReplicatedPG: add basic HitSet tracking
Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:27 -08:00
Sage Weil
b92f431100 mon/OSDMonitor: set hit_set fields
Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:27 -08:00
Sage Weil
db3fd1152a osd: add hit_set_* parameters to pg_pool_t
Add pool properties to control what type of HitSet we want to use, along with
some (mostly generic) parameters.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:27 -08:00
Sage Weil
e8ef72490b osd/osd_types: include pg_hit_set_history_t in pg_info_t
Track metadata about the currently accumulating HitSet as well as
previously archived ones in the pg_info_t.  This will not scale well for
extremely long histories, but does let us avoid explicitly sharing this
metadata during recovery or other normal update activity.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:27 -08:00
Sage Weil
a430525ca7 osd/osd_types: add pg_hit_set_{info,history}_t
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:26 -08:00
Sage Weil
b5ea47008b common/bloom_filter: fix operator=
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:37:26 -08:00
Sage Weil
c01b183da0 osd_types: add generic HitSet type with bloom and explicit implementations
Track a set of hash values, either explicitly or using a bloom_filter. Hide
the implementation and allow us to transparently encode and decode.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:26 -08:00
Sage Weil
0b9874cd02 osd/ReplicatedPG: factor out simple_repop_{create,submit} helpers
This makes it easier to create repops correctly, and should help
prevent bugs like the one we remove here in process_copy_op (we were
serializing on the wrong object!)

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:26 -08:00
Greg Farnum
9776e97af2 osd/PG: factor out get_next_version()
Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:26 -08:00
Greg Farnum
0b0d1e8e42 librados: add wait_for_latest_osdmap()
There are times when users may need to make sure the client has the
latest osdmap, for example after sending a mon command modifying
pool properties.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>

squash "librados: add wait_for_latest_osdmap()"
2013-12-06 14:37:26 -08:00
Sage Weil
828590688f librados: expose methods for calculating object hash position
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:26 -08:00
Sage Weil
4b5ab3f106 osdc/Objecter: expose methods for getting object hash position and pg
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:26 -08:00
Sage Weil
92879f7787 osd: capture hashing of objects to hash positions/pgs in pg_pool_t
The hashing is dependent on pool properties; capture (more of) it in a
method instead of having it in OSDMap.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Sage Weil
76e0b88f56 osd/OSDMap: use new object_locator_t::hash to place object in a pg
The hash value, if provided, becomes the ps (placement seed) portion of the
pg_t, skipping any hashing of the object name (or locator key).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Greg Farnum
d692da34ab osd/osd_types: add explicit hash to object_locator_t
Instead of hashing the object name or key, we allow the hash position to be
provided explicitly.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Greg Farnum
0d4ea9f746 encoding: allow users to specify a different compatv after encoding
This way we can set the compatv preferentially depending on whether
we've actually encoded new information or not.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Sage Weil
d2963c0a3d librados: add mon_command to C++ API
This way librados users can execute monitor commands.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Sage Weil
468fffa529 librados: document aio_flush()
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Sage Weil
bc7ace2eef librados: constify inbl command args
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:25 -08:00
Sage Weil
a29d4fc3fd osdc/Objecter: constify inbl command args
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:24 -08:00
Sage Weil
fb49065fe7 mon/MonClient: constify inbl command args
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:37:24 -08:00
Sage Weil
ef0f255a4a osdc/Objecter: reimplement list_objects
Return to caller at the end of each PG.  This allows the caller to look at
the [pg_]hash_position and get something meaningful.

If there are no objects in the PG, we skip it so that every callback has
*some* data (unless the pool is totally empty!).  So the real difference
here is that we don't move on to the next PG just to reach max_entries.

This gives the client some data sooner, but may mean more callbacks into
client code.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:52 -08:00
Sage Weil
d2e6cc635f librados: add get_pg_hash_position to determine pg while listing objects
Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:49 -08:00
Sage Weil
eff932c60a osdc/Objecter: stick bl inside ListContext
This is simpler and less error-prone.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:45 -08:00
Sage Weil
8e5803abf7 osdc/Objecter: factor pg_read out of list_objects code
This will get used later for other ops against PGs (instead of objects).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:41 -08:00
Sage Weil
dd8c939841 osdc/Objecter: separate explicit pg target from current target
The pgid field is used to store the pg the op mapped to.  We were just
setting it directly for PGLS.  Instead, fill in a new base_pgid, and copy that
to pgid in recalc_op_target(), the same way we do when we map an object
name to a PG.

In particular, we take this opportunity to map a raw pgid to an actual
pgid.  This means the base_pg could come from a raw hash value (although
it doesn't, yet).

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-12-06 14:36:37 -08:00
Sage Weil
9381b69378 osdc/Objecter: drop redundant condition
We are inside an if (response_size) block.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:34 -08:00
Sage Weil
bffcca6a0a osd/osd_types: make pref optional in pg_t constructor
We don't use preferred placements any more, so this will
make it easier to start dropping references to it in new code.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-12-06 14:36:31 -08:00
Gary Lowell
5832e2603c v0.72 2013-11-07 20:27:35 +00:00
Yehuda Sadeh
84fb1bf3ee rgw: deny writes to a secondary zone by non-system users
Fixes: #6678
We don't want to allow regular users to write to secondary zones,
otherwise we'd end up with data inconsistencies.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-11-07 09:17:22 -08:00
Sage Weil
d8f05024e7 doc/release-notes: note crush update timeout on startup change
Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-06 20:02:09 -08:00
Sage Weil
1ee112fa2e osdmaptool: fix cli tests
From c22c84a88c.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-11-06 19:59:56 -08:00
Li Wang
082e7c9eed Ceph: Fix memory leak in chain_flistxattr()
Free allocated memory before return.

Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-06 19:00:52 -08:00
Samuel Just
c7a30b8811 ReplicatedPG: don't skip missing if sentries is empty on pgls
Formerly, if sentries is empty, we skip missing.  In general,
we need to continue adding items from missing until we get
to next (returned from collection_list_partial) to avoid
missing any objects.

Fixes: #6633
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-06 17:55:12 -08:00
Samuel Just
c6826c1e8a PG: fix operator<<,log_wierdness log bound warning
Split may cause holes such that head != tail and yet
log.empty().

Fixes: #6722
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-06 11:02:32 -08:00
Samuel Just
f4648bc6fe PGLog::rewind_divergent_log: log may not contain newhead
Due to split, there may be a hole at newhead.

Fixes: #6722
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-06 11:02:19 -08:00
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
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
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
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
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
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
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
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
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