Commit Graph

19880 Commits

Author SHA1 Message Date
Greg Farnum
b018befd72 librbd: add cooperative image locking to the C and C++ interfaces
While we're at it, increment the version number.

Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
668aa7866a librbd: include the image lockers in the ImageCtx mutable metadata
Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
48d2376e0a test: add rbd image locking tests to test_cls_rbd
Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
71c7ed3f49 cls_rbd_client: expose locking operations
Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
71e1b1fd18 cls_rbd: add failure logging to all callers of read_key.
Previously, read_key was printing out error messages when it failed.
But because some callers are fine with it failing on ENOENT, and they
all have more context anyway, it no longer does so and they need
their own logging output. Now they have it.

Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
c88a4550ae cls_rbd: add locking functions.
Users can now place shared or exclusive locks, can remove their own
locks, can break the locks of others, and can list locks. All these
functions are considered PUBLIC_EXEC to match the other rbd methods.

Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-15 17:27:10 -07:00
Greg Farnum
92589f8806 objclass: allow class methods to retrieve their triggering entity_inst
Signed-off-by: Greg Farnum <greg@inktank.com>
2012-06-14 14:19:53 -07:00
Josh Durgin
5cd33cdd23 workunits/rbd: add workunit for running cls_rbd tests
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-10 22:01:19 -07:00
Josh Durgin
031d42ad1f workunits/rbd: disable remove_with_watcher test
This will fail until #2533 is fixed.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-10 21:59:07 -07:00
Sage Weil
720aa4663f Merge remote-tracking branch 'gh/wip-rbd-format' 2012-06-10 14:12:16 -07:00
Josh Durgin
3d22546101 librbd: remove unnecessary notify from add_snap()
The only caller, snapshot_add(), already does a notify when add_snap()
succeeds.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-10 00:14:22 -07:00
Josh Durgin
44e5f3dc9b librbd: ignore RBD_MAX_BLOCK_NAME_SIZE when generating object ids
The actual data object ids don't need to be artificially restricted in
length.  RBD_MAX_BLOCK_NAME_SIZE just limits the size of the object
prefix, since it's used in rbd_info_t.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-10 00:14:03 -07:00
Josh Durgin
3d7925b1ae workunits/rbd: allow creating images in different formats
This will allow adding more arguments for testing combinations
of features in the future.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
Josh Durgin
a5026303f4 rados: add commands to interact with object maps
The input values are stored as-is, and any values read are dumped in
hex. Rename listomap to listomapkeys to distinguish from
listomapvalues. Also add it to the man page.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
Josh Durgin
123250b49d test_librbd, test_rbd.py: optionally use the new format
Read the desired features from an environment variable, RBD_FEATURES.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
Josh Durgin
074ffc5940 rbd.py: add support for creating images in the new format
The new arguments are optional, so they are backwards compatible.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
Josh Durgin
857bbccc59 rbd: update for the new format
No features exist right now, so there are no extra options for them.
The old format is still used by default, and since the default will
change with layering, --new-format will be removed at that point and is
intentionally left undocumented.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
Josh Durgin
5b40b4b94c librbd: add create2 to create an image with the new format
This will fail if features are requested that the client or server
does not support. Currently there are no features defined, so
zero is the only valid value.

copy() preserves the format and features of the source image.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-09 17:24:50 -07:00
John Wilkins
b25f27705b doc: Segregated set up git from clone.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-09 14:45:05 -07:00
Sage Weil
83377755d1 debian: ceph depends on python
Due to the new ceph-disk-* scripts.  Newer dists are smart enough to figure
this out, but maverick is not.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 22:10:43 -07:00
Sage Weil
4551808fa0 mon: add 'auth get-or-create' variant that outputs a keyring
This is more convenient when you're creating daemons, since you want to
write out a keyring file for them.  This lets you do it in a single
command.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 17:22:10 -07:00
Josh Durgin
bfbed50886 librbd: use ImageCtx members instead of the old header in resize()
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:23 -07:00
Josh Durgin
5bc34f4a9a librbd: validate order before creating an image
The value must be passed, and it shouldn't be below 4k
(enforced by the command line tool already) or above the
range expressible in the header.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
127b425901 librbd: rename md_oid parameters to header_oid
This is more consistent with the rest of the code now,
and is a bit more clear.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
ef38394f21 librbd: make rename work with any header format
Instead of interpreting the header, just copy all the data and
omap values from the original header to the newly name one.
This will continue working with future header changes.

We can create the new header and write all data and omap values
to it atomically to avoid some races.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
f1d69639c5 librbd: use cls_client functions for calling class methods
Use the old or new methods make resize, snapshot add and snapsnhot
remove work with both old and new formats.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
8e51e06094 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.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
00f4e84153 librbd: check that the current snapid for a snap name matches
Checking that it exists doesn't prevent you from having the snapshot
change out from under you in the following situation:

You have the image open at snapshot "foo".
Someone removes snapshot "foo", writes some data to the image, and
creates a new snapshot called "foo".

This second snapshot will have a different id, but nothing prevents it
from having the name of a previously deleted snapshot.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
4eb2138e63 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.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
7376a77364 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.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:22 -07:00
Josh Durgin
dcc7c96339 cls_rbd: add methods for interacting with the new header format
Add the client side (cls_rbd_client) for testing as well.
librbd will use the functions in cls_rbd_client to interact with cls_rbd.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 16:38:19 -07:00
Josh Durgin
70686c599b librbd: remove useless ENOMEM checks
There will be an exception if memory can't be allocated.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
13aa578d63 DBObjectMap: remove extra semicolon
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
8c637f56e5 vstart: debug osd classes when debugging is on
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
49059b232b objclass: add methods to get keys without values, and set multiple values
These will be useful in the new rbd header format. This brings the
API into parity with the available OSD ops for omaps.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
23ebc093a6 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.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
715c1f1394 objclass: allow classes to log at different levels
Add a logging level parameter to CLS_LOG, and a CLS_ERR that's
analagous to derr.

For now cls_rgw is all logging at level 1, preserving existing
behavior. I'm more familiar with cls_rbd, so I changed those
logging levels.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
fe46a74954 class_debug: add indent settings header
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
5750e53e36 test_librbd: don't include a .cc file
Add it as a source like the rest of the gtests.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
ba56d81273 cls_rgw: add indent settings header
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
e0fda59d7b objclass: pass strings as const references
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
60c684a4d3 objclass: add indent settings header
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:49 -07:00
Josh Durgin
fefedc1bb1 cls_rbd: add indent settings header
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:48 -07:00
Josh Durgin
92325d0f84 cls_rbd: remove unused test_exec and snap_revert methods
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-06-08 14:31:48 -07:00
Sage Weil
b2793c426e mon: require force argument for 'mds newfs ...'
This is dangerous, make sure they know what they're doing.  I bet <someone>
$1 that Greg asked me to do this originally.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 12:48:02 -07:00
Sage Weil
3876dbfdd7 Merge branch 'wip-crush-tunables'
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-06-08 11:18:59 -07:00
Sage Weil
c0a02a4a49 crushtool: refine tunables warning message
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 11:17:14 -07:00
Sage Weil
978d5419a1 re-include assert after boost::pool
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 11:02:44 -07:00
Sage Weil
740aa3dfbd crush: compile/decompile tunables
Lines like

 tunable <name> <value>

will adjust tunables.  Right now only three are defined.

--enable-unsafe-tunables is required.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
1a2959edd6 crushtool: add --enable-unsafe-tunables option
This is required to adjust tunables.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00