Commit Graph

29616 Commits

Author SHA1 Message Date
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
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
Josh Durgin
2db20d9721 qa: don't run racy xfstest 008
This test attempts to generate a random number of holes within a
particular range, but may fail because hole placement is random.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-01 18:43:36 -07:00
David Zafman
e043b6d078 Merge pull request #802 from ceph/wip-6673b
(manually merged after next branch rebuilt)

OSDMonitor: be a little nicer about letting users do pg splitting

Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-11-01 16:37:13 -07:00
Greg Farnum
9834ab9ab8 OSDMonitor: be a little nicer about letting users do pg splitting
We were previously blocking pg splits whenever pg creations were in-
progress, but we only really need to avoid splitting any pgs which are
currently being created. Let the user set a different pg_num if there
are no creating PGs on the pool in question.

Fixes: #6673, take two

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-11-01 16:33:37 -07:00
Josh Durgin
306ec7142d rgw: don't turn 404 into 400 for the replicalog api
404 is not actually a problem to clients like radosgw-agent, but 400
implies something about the request was incorrect.

Backport: dumpling
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-11-01 16:13:52 -07:00
Ray Lv
588ed60a8e Wrap hex_to_num table into class HexTable
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-11-01 16:03:55 -07:00
Ray Lv
148023d3c6 [rgw] Set initialized to true after populating table in hex_to_num()
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-11-01 16:03:38 -07:00
Samuel Just
28e4271267 sharedptr_registry.hpp: removed ptrs need to not blast contents
See the included unit test update.  Consider:
1) x = lookup_or_create(1, 1)
2) remove(1)
3) y = lookup_or_create(1, 2)
4) x.reset()
5) z = lookup(1)

The bug is that z will be null since x.reset() caused the
cleanup callback to remove y's key value from contents.

To fix this, contents also records the pointer value for
the weak_ptr.  The removal callback only removes the
key from contents if it matches the ptr in contents.

This should work since the pointer passed to the removal
callback must be unique up to that point since it has
not yet been deleted.

This allowed a pg removal -> pg recreation -> pg removal
sequence to cause the second pg removal entry to be
erroneously cleared by the first pg removal's destructor
as it finally made its way through the removal queue.

Fixes: #5951
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-11-01 16:02:21 -07:00
Noah Watkins
4402898390 prio-q: initialize cur iterator
For new SubQueues `cur` is not intialized, so front/pop_front will freak
out. I honestly I have no idea how this hasn't been seen, but it was
being triggered frequently on OSX.

Fixes: #6686

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-11-01 16:02:15 -07:00
Samuel Just
353813b2e1 PGLog: remove obsolete assert in merge_log
This assert assumes that if olog.head != log.head, olog contains
a log entry at log.head, which may not be true since pg splitting
might have left the log with arbitrary holes.

Related: 0c2769d332
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-01 16:00:15 -07:00
Samuel Just
ca4c166b7e test/osd/RadosModel.h: select and reserve roll_back_to atomically
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-01 16:00:12 -07:00
Samuel Just
99c5319c2c test/rados/list.cc: we might get some objects more than once
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-11-01 16:00:08 -07:00
Sage Weil
4a41d3d24b os/chain_listxattr: fix leak fix
e22347df38 added a bad goto; just free
explicitly instead.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2013-11-01 15:58:07 -07:00