Commit Graph

21297 Commits

Author SHA1 Message Date
Sage Weil
9636991376 crush: add const string& versions of accessors
Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 12:05:01 -07:00
Sage Weil
babef41a06 doc/control.rst: add 'osd crush create-or-move ...'
Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 12:05:01 -07:00
Sage Weil
dd9819e376 doc: make note of crush usage change
Even tho it is compatible.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 12:05:01 -07:00
Sage Weil
0817b941d5 mon: make redundant osd.NNN argument optional
Instead of 'osd crush set NNN osd.NNN weight loc...', make the second
osd.NNN option optional, and allow either NNN or osd.NNN to specify the
osd id.  This makes the usage much more sane, but maintains backward
compatibility.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 12:05:01 -07:00
Sage Weil
01a8146983 ceph tool: add 'osd crush create-or-move ...' to help
Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 11:35:45 -07:00
John Wilkins
44fa233b77 :doc: Deleting this. Wrote a new one, but will be revised a bit soon.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:26:19 -07:00
John Wilkins
32f30f9aff :doc: Removed old ops pool section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:19:47 -07:00
John Wilkins
0313365ddf :doc: Removed old authentication section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:19:22 -07:00
John Wilkins
d1053d9d75 :doc: Removed old resize OSD section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:18:55 -07:00
John Wilkins
ad909f3f45 :doc: Removed old mon resize section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:15:17 -07:00
John Wilkins
7d881dc809 :doc: Removed from old ops doc. Still needs to be composed though.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:14:40 -07:00
John Wilkins
bf342d1474 :doc: New cluster ops section addresses the todo.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:13:53 -07:00
John Wilkins
e844989576 :doc: Removed old OSD troubleshooting. New version to be updated shortly.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:13:17 -07:00
John Wilkins
72f802c52e :doc: Removed old monitor troubleshooting. New version to be revised shortly.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:12:37 -07:00
John Wilkins
fe609b7a10 :doc: Removed old mds troubleshooting. Still needs to be composed.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:12:01 -07:00
John Wilkins
a4733b864e :doc: Removed old cephfs disucssion.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:11:16 -07:00
John Wilkins
d4e00bce76 :doc: Trimmed toctree to last bits of legacy data.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:10:44 -07:00
John Wilkins
922c59ff10 :doc: Updated FAQ with a friendlier message.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-11 11:09:01 -07:00
Sage Weil
f1b605c0cb mon: parse '<id>' or 'osd.<id>' for 'osd crush create-or-move ...'
Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:02 -07:00
Sage Weil
1da73e5df4 mon: fail on trailing characters after parsing numbers
parse '8' but not '8asdf'.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:02 -07:00
Sage Weil
b2409a2c80 mon: 'osd crush create-or-move <id> <initial-weight> <loc ...>'
Create an item in the tree with the given weight, or move it (without
touching the weight) if it is already present.

Closes: #3101
Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:02 -07:00
Sage Weil
adedd6b600 crush: create_or_move_item()
Create an item if it doesn't exist, with the specified weight.  If it is
already in the tree, move it, but do not adjust the weight.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:01 -07:00
Sage Weil
588b263dd7 crush: get_item_weight[f]()
Get the weight for an item, or at least the first instance of an item in
the tree.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:01 -07:00
Sage Weil
f8d9f86ecd osdmap: 4 decimal places for osd tree
This makes it print out more nicely for reasonable weights.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-11 10:48:01 -07:00
Yehuda Sadeh
d51d7b3416 rgw: fix rgw_dir_suggest_changes() to set header_changed
Apparently we weren't setting header_changed to true in the
case where we handled the CEPH_RGW_UPDATE case and cur_disk.exists
was false. In practice what this created is that in case where
object was created but the index complete call failed (or timed
out), calling rgw_dir_suggest_changes() fixed the entry, however,
we didn't account the new entry. This would lead to negative
stats on the bucket index.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-10 17:28:47 -07:00
Yehuda Sadeh
63c0909399 Merge branch 'wip-swift-manifest'
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-10 12:42:55 -07:00
Yehuda Sadeh
f8c365e690 rgw: add missing ret code check
Also, for some reason we used cerr instead of dout so fix
that too.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-10 12:41:33 -07:00
Yehuda Sadeh
a4bc7953a7 Merge branch 'wip-3060'
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-10 11:28:09 -07:00
Josh Durgin
0cfac6da0d librbd: bump version
This marks the availability of the cloning and locking functions.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-09-10 10:50:48 -07:00
Greg Farnum
d77205d8f9 objecter: remove the now-unused "registering" flag on LingerOps
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2012-09-07 21:03:39 -07:00
Josh Durgin
33def83dc2 cls_rbd: remove locking methods
These are unnecessary now that librbd is using the generic cls_lock.

Fixes: #2951
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-09-07 18:45:22 -07:00
Josh Durgin
eeaa92c471 rbd: add locking commands
The locker (entity_name_t) will be different each time the rbd
command line tool is run, so 'lock remove' is always breaking a lock.

Fixes: #2556
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-09-07 18:38:27 -07:00
Josh Durgin
fd1c634b13 qa: update rbd tests and runner
* no longer need to wait for watch timeout since #2948 was fixed
* use --format 2 instead of --new-format
* add test_cls_rbd to run-rbd-tests script

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-09-07 18:38:27 -07:00
Josh Durgin
18427ecc0f librbd: use generic cls_lock instead of cls_rbd's locking
Update the librbd locking api to make more sense:
 * Add an optional tag to shared locking
 * only make shared vs exclusive different functions in the user-visible api
 * return a list of structs instead of a set of pairs
 * fix incorrect range checking in the C api
 * rename locks to lockers to be consistent with the generic locking class
 * rename other_locker parameter to client, to match the list_lockers usage

Fixes: #2952
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-09-07 18:38:14 -07:00
Yehuda Sadeh
c4c4b20fea rgw: encode total usage for backwards compatibility
Adding the encoding of the total usage allows us to
make the format change backwards compatible.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-07 16:44:28 -07:00
Yehuda Sadeh
06290f6dff rgw: configurable swift auth entry point
Fixes: #1776
Swift auth entry point is not hard coded anymore.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-07 16:22:48 -07:00
Sage Weil
03136d057f osd: fill in user log entry last after snapdir tran
Reorder the snapdir logic and ctx->at_version adjustments prior to filling
in the object_info_t and user_versions and all that stuff.  Adjust
at_version after appending the log entry (so that it points to the next
position/version we will write at.. culminating in the actual user
event).

The user log entry contains the request id, which will be used
by replay ops to put themselves in the correct place in the
waiting_for_commit/ack maps.  Thus, the repop needs to be tagged
with the same version as the log entry with the request id.
Thus, the request id bearing log entry should be the last in
the log entry vector.

This should fix #3072, wherein a replay which should wait on
the repop tagged as version '36 will instead wait on '35.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2012-09-07 15:34:51 -07:00
John Wilkins
e2129ab472 :doc: Fixed broken hyperlinks.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-06 21:00:29 -07:00
John Wilkins
9bbe73cc1d :doc: Addresses Documentation #3096. Also added new information.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-06 20:31:46 -07:00
Yehuda Sadeh
793bebb82e rgw: rgw-admin filter usage by categories
rgw can now filter usage output by specific op
categories.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-06 16:46:26 -07:00
Tommi Virtanen
9d878bfb4d gitignore: Remove "nbproject", no idea what that even is.
Looks like this line was accidentally introduced in commit
af4d8db55f.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-09-06 16:12:35 -07:00
Yehuda Sadeh
ddaac56c84 rgw: usage now account categories
Instead of just keeping a flat usage info per bucket, we
now maintain a list of categories for which requests
usage is aggregated in. Ops are put in categories based
on their names.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-06 13:17:09 -07:00
Yehuda Sadeh
a5b9ba7773 rgw: fix usage
Fixes: #3085
usage was showing 'bucket info' command that never
existed.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-09-06 10:15:54 -07:00
John Wilkins
3fed44acd1 :doc: Minor tweak to heading text.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:33:45 -07:00
John Wilkins
53d982926b Merge branch 'master' of github.com:ceph/ceph 2012-09-05 17:26:39 -07:00
John Wilkins
6957ae78e1 :doc: Modified the index page to point to the new cluster-ops section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:25:34 -07:00
John Wilkins
4ff60c7a0e :doc: Made minor changes to restructuredText headers.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:24:54 -07:00
John Wilkins
8fa81ab54c :doc: Added comment redirecting editors to new page location.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:23:03 -07:00
John Wilkins
c22ca7230f :doc: Added index/toctree page for cluster ops.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:22:32 -07:00
John Wilkins
b8dfe8227d :doc: Added new auth settings to reference doc.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-09-05 17:22:02 -07:00