Josh Durgin [Fri, 8 Jun 2012 07:05:41 +0000 (00:05 -0700)]
librbd: remove on-disk header argument from helper functions
Make most of them take the parameters they actually use.
trim_image() now takes an ImageCtx, which means remove() must
open the image. This has the nice side effect of not duplicating
the snapshot listing code for the old format.
Josh Durgin [Fri, 8 Jun 2012 15:01:19 +0000 (08:01 -0700)]
librbd: update ictx_refresh to work with both formats
It now sets the member variables of ImageCtx so other functions
don't have to use the on-disk header. If the features use by
the new format are incompatible with this client, an error is returned.
Josh Durgin [Fri, 8 Jun 2012 06:14:17 +0000 (23:14 -0700)]
librbd: Update ImageCtx for new format
Detect the format when an image is opened by the presence of the
original format header object. Use member variables of ImageCtx to
store image metadata instead of the on-disk header format
ImageCtx::header.
This lays the foundation for changing the rest of librbd to work with
old and new formats.
Josh Durgin [Sun, 3 Jun 2012 10:41:02 +0000 (03:41 -0700)]
objclass: rename omap methods to be consistent with other interfaces
The osd ops and the librados methods all distinguish between keys
and values. It's useful to be able to read a bunch of keys without
fetching the values sometimes too.
Sage Weil [Thu, 7 Jun 2012 22:57:09 +0000 (15:57 -0700)]
crush: make magic numbers tunable
We have three magic numbers in crush_choose that are now tunable. The
first two control the local retry behavior, including fallback to a
permutation. The last is the total map descent attempts.
We can avoid a drastic incompatibility by making these tunable and encoded
in the map. That means users can enable/disable local retry, for example,
without changing the code. As long as the clients understand the tunables,
they can be adjusted.
This patch doesn't address the compatibility and feature bit issue. We may
want to roll that into a larger revision with more drastic changes, once
we know what those changes will look like. However, a careful user can
use the new code and modify the behavior.
Sage Weil [Wed, 6 Jun 2012 23:06:28 +0000 (16:06 -0700)]
assert: detect when /usr/include/assert.h clobbers us
The normal assert.h is very rude in that it clobbers any existing assert
define and replaces it with its own. An sadly, lots of things we include
include the generic version.
Be extra rude in response. Clobber any existing assert #define, and also
#define _ASSERT_H to be a magic value that our commonly-used dendl #define
depends on. This way we get a compile error if the system version replaces
out own.
This is imperfect, since we will only detect their rudeness when we use
the debug macros. I'm not coming up with something that is more widely
used that would work better, however.
Sage Weil [Wed, 6 Jun 2012 22:30:36 +0000 (15:30 -0700)]
keyserver: also authenticate against mon keyring
If we don't have a secret, also check in the extra_secrets keyring.
This means we can also authenticate as any users that appear in the mon
keyring, and get the caps defined there. This lets us bootstrap the
client.admin key with mon. key, provided mon 'allow *' caps appear in the
mon keyring.
Sage Weil [Tue, 5 Jun 2012 23:15:43 +0000 (16:15 -0700)]
logclient: fix crashes, fix which entries are sent
I was seeing crashes when the monitor tried to send log entries.
* Send log entries that haven't already been sent.
* Don't try to be tricky with the deque; i'm paranoid about the stability
of the iterator.
* various asserts
* better variable names
Sage Weil [Tue, 5 Jun 2012 21:52:42 +0000 (14:52 -0700)]
monclient: send more log entries when first set is acked
Immediately send more log messages if we had more when the first set was
sent. Otherwise, wait until the next tick to check. This semi-throttles
logging based on how much the monitor can handle.
Sage Weil [Tue, 5 Jun 2012 21:51:17 +0000 (14:51 -0700)]
logclient: not a dispatcher
Let MonClient and Monitor handle delivery of messages. This puts them in
control and lets them trigger sending of more messages when we have a
bunch queued.
Samuel Just [Tue, 5 Jun 2012 16:58:38 +0000 (09:58 -0700)]
OSD: do not convert an entire collection in one transaction
Previously, we atomically moved the collection out of the way, created a
new collection, moved the contents of the old collection to the new
collcetion and removed the old collection. For large collections, this
could result in unacceptably long transactions. Now, we create a temp
collection, link all objects into it, atomically swap them, and then
remove the old one.
Samuel Just [Fri, 1 Jun 2012 05:29:21 +0000 (22:29 -0700)]
FileStore,DBObjectMap: add SequencerPosition argument to ObjectMap
Previously, sequences like:
1. touch (c1, a)
2. link (c1, c2, a)
3. rm (c1, a)
4. setattr (c2, a)
5. clone (c2, a, b)
could result in the omap entries for a being removed once ops 2-3 are
replayed. Calls to ObjectMap::sync will include a sequencer posotion
and an hobject_t to mark. Updates to the object map will now also check
the SequencerPosition entry on the map header preventing replay of
earlier ops.
Samuel Just [Wed, 30 May 2012 23:01:38 +0000 (16:01 -0700)]
OSD,FileStore: clean up filestore convsersion
Previously, we messed with the filestore_update_collections config
option to enable upgrades in the filestore. We now pass that in as a
parameter to the FileStore,IndexManager constructors.
Further, the user must now specify the version to which to update in
order to prevent accidental updates.
Samuel Just [Wed, 30 May 2012 00:08:45 +0000 (17:08 -0700)]
ReplicatedPG: adjust missing at push_start
When we start recieving an object, we remove the old copy. This will
prevent the primary from using that old copy after that point.
We do the same on the pushee.
Samuel Just [Sat, 26 May 2012 02:18:41 +0000 (19:18 -0700)]
DBObjectMap: restructure for unique hobject_t's
Previously, the ObjectStore operated in terms of (coll_t,hobject_t)
tupples. Now that hobject_t's are globally unique within the
ObjectStore, it is no longer necessary to support multiple names for the
same DBObjectMap node.
Signed-off-by: Samuel Just <sam.just@dreamhost.com>
Samuel Just [Fri, 25 May 2012 22:06:55 +0000 (15:06 -0700)]
FileStore,DBObjectMap: remove ObjectMap link method
hobject_t's are now globally unique in filestore. Essentially, there is
a 1-to-1 mapping from inodes to hobject_t's. The entry in the
DBObjectMap is now tied to the inode/hobject_t. Thus, links needn't be
tracked. Rather, we delete the ObjectMap entry when nlink == 0.
Samuel Just [Thu, 24 May 2012 17:57:22 +0000 (10:57 -0700)]
src/: Add namespace and pool fields to hobject_t
From this point, hobjects in the ObjectStore will be globally unique. This
will allow us to avoid including the collection in the ObjectMap key encoding
and thereby enable efficient collection renames and, eventually, collection
splits.
projects / ceph.git / log