]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
13 years agoauthx -> cephx everywhere it's used
Josh Durgin [Thu, 15 Dec 2011 21:41:56 +0000 (13:41 -0800)]
authx -> cephx everywhere it's used

The term authx was in the mount.ceph man page, and got accidentally
copied into rbd help.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agoclient: fix logger deregistration
Sage Weil [Thu, 15 Dec 2011 01:43:18 +0000 (17:43 -0800)]
client: fix logger deregistration

Only unregister logger if it is non-NULL (and thus registered) to avoid
running afoul of the cct assertions.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agodoc: Make overview.rst valid reStructuredText, so I can stop seeing warnings.
Tommi Virtanen [Wed, 14 Dec 2011 19:38:08 +0000 (11:38 -0800)]
doc: Make overview.rst valid reStructuredText, so I can stop seeing warnings.

It's still wrong, but now it won't clutter the output.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agopybind: Add a description to docstring.
Tommi Virtanen [Wed, 14 Dec 2011 19:32:34 +0000 (11:32 -0800)]
pybind: Add a description to docstring.

This avoids a Sphinx warning like this:

.../src/pybind/rbd.py:docstring of rbd.RBD.version:2: WARNING: Field list ends without a blank line; unexpected unindent.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: reStructuredText syntax fix.
Tommi Virtanen [Wed, 14 Dec 2011 19:25:40 +0000 (11:25 -0800)]
doc: reStructuredText syntax fix.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agoMerge branch 'wip-messenger'
Greg Farnum [Wed, 14 Dec 2011 19:14:02 +0000 (11:14 -0800)]
Merge branch 'wip-messenger'

13 years agodoc: "ceph -w" clarification.
Tommi Virtanen [Wed, 14 Dec 2011 19:18:21 +0000 (11:18 -0800)]
doc: "ceph -w" clarification.

Stop saying "watch cluster state" so many times.

Don't say stdout, that's the assumption.

Don't call showing things on terminal "printing".

Don't show -C option here.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Fix sentence that ended too abruptly.
Tommi Virtanen [Wed, 14 Dec 2011 19:14:41 +0000 (11:14 -0800)]
doc: Fix sentence that ended too abruptly.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Split intro to talk about the DFS separately. Mention petabytes.
Tommi Virtanen [Wed, 14 Dec 2011 19:13:57 +0000 (11:13 -0800)]
doc: Split intro to talk about the DFS separately. Mention petabytes.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Add more missing commands to control.
Tommi Virtanen [Wed, 14 Dec 2011 18:48:25 +0000 (10:48 -0800)]
doc: Add more missing commands to control.

This is too unstructured, that will have to be fixed later.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Add misc explanations of Ceph internals from email.
Tommi Virtanen [Wed, 14 Dec 2011 18:47:38 +0000 (10:47 -0800)]
doc: Add misc explanations of Ceph internals from email.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Use todo directive, rescue list of missing commands from wiki.
Tommi Virtanen [Wed, 14 Dec 2011 17:38:59 +0000 (09:38 -0800)]
doc: Use todo directive, rescue list of missing commands from wiki.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Link to manpage when command is mentioned.
Tommi Virtanen [Wed, 14 Dec 2011 17:36:01 +0000 (09:36 -0800)]
doc: Link to manpage when command is mentioned.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: More consistency on formatting placeholder names.
Tommi Virtanen [Wed, 14 Dec 2011 17:33:50 +0000 (09:33 -0800)]
doc: More consistency on formatting placeholder names.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agomsgr: unset did_bind in stop().
Greg Farnum [Wed, 14 Dec 2011 19:11:37 +0000 (11:11 -0800)]
msgr: unset did_bind in stop().

We use did_bind as a flag on whether or not to stop the Accepter thread
and we should clear it when we do the stopping.
This fixes #1829.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agoobjecter: fix use-after-free
Sage Weil [Wed, 14 Dec 2011 18:59:51 +0000 (10:59 -0800)]
objecter: fix use-after-free

messenger consumes the m reference.  Yay valgrind.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoclient: move PerfCounter into Client
Sage Weil [Wed, 14 Dec 2011 18:49:10 +0000 (10:49 -0800)]
client: move PerfCounter into Client

globals are evil.

Fixes: #1826
Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoswift: auth response returns X-Auth-Token instead of X-Storage-Token
Yehuda Sadeh [Wed, 14 Dec 2011 18:49:42 +0000 (10:49 -0800)]
swift: auth response returns X-Auth-Token instead of X-Storage-Token

13 years agoosd: fix build_incremental_map_msg
Sage Weil [Wed, 14 Dec 2011 17:31:17 +0000 (09:31 -0800)]
osd: fix build_incremental_map_msg

We keep both the inc and the full for our oldest osdmap.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoqa: trivial_libceph test
Sage Weil [Wed, 14 Dec 2011 00:31:02 +0000 (16:31 -0800)]
qa: trivial_libceph test

This currently fails... see #1827

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agolibceph: add missing #includes
Sage Weil [Wed, 14 Dec 2011 00:28:50 +0000 (16:28 -0800)]
libceph: add missing #includes

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agolibceph: catch errors from Client::init()
Sage Weil [Wed, 14 Dec 2011 00:28:38 +0000 (16:28 -0800)]
libceph: catch errors from Client::init()

And clean up error paths.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoclient: return errors from init
Sage Weil [Wed, 14 Dec 2011 00:28:18 +0000 (16:28 -0800)]
client: return errors from init

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agofilestore: dump transaction to log if we hit an error
Sage Weil [Tue, 13 Dec 2011 17:07:36 +0000 (09:07 -0800)]
filestore: dump transaction to log if we hit an error

This will let us see which operation in the transaction failed.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoobjectstore: implement Transaction::dump()
Sage Weil [Tue, 13 Dec 2011 17:05:37 +0000 (09:05 -0800)]
objectstore: implement Transaction::dump()

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoobjectstore: create Transaction::iterator class
Sage Weil [Tue, 13 Dec 2011 17:05:10 +0000 (09:05 -0800)]
objectstore: create Transaction::iterator class

Remove iterator state from Transaction itself.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoqa: rados load-gen workunits
Sage Weil [Tue, 13 Dec 2011 16:19:37 +0000 (08:19 -0800)]
qa: rados load-gen workunits

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agopybind/rados: add asynchronous write,append,read,write_full operations
Samuel Just [Sat, 10 Dec 2011 01:55:57 +0000 (17:55 -0800)]
pybind/rados: add asynchronous write,append,read,write_full operations

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agodoc: Clarify documentation of reweight command.
Andre Noll [Fri, 9 Dec 2011 17:57:45 +0000 (18:57 +0100)]
doc: Clarify documentation of reweight command.

This caused some discussions on the mailing list, so let's try to be clear
about the meaning of an OSD weight.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agodoc: Add missing documentation for osd pool get.
Andre Noll [Fri, 9 Dec 2011 17:57:44 +0000 (18:57 +0100)]
doc: Add missing documentation for osd pool get.

"osd pool set" was already documented, but the corresponding "get"
command was not. This patch adds the list of valid fields for this
command, together with short descriptions.

Thanks to Gregory Farnum for pointing out a flaw in the description
of lpl_num and lpgp_num in an earlier version of the patch.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agodoc: Update the list of fields for the pool set command.
Andre Noll [Fri, 9 Dec 2011 17:57:43 +0000 (18:57 +0100)]
doc: Update the list of fields for the pool set command.

This list was lacking a few fields: crash_replay_interval, pg_num,
pgp_num and crush_ruleset. Include these fields and add add short
descriptions.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agodoc: Document pause and unpause osd commands.
Andre Noll [Fri, 9 Dec 2011 17:57:42 +0000 (18:57 +0100)]
doc: Document pause and unpause osd commands.

These two commands were undocumented so far. This patch adds a short
description.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agodoc: Add documentation of missing osd commands.
Andre Noll [Fri, 9 Dec 2011 17:57:41 +0000 (18:57 +0100)]
doc: Add documentation of missing osd commands.

The set of OSD commands which added by the previous commit is
incomplete. This patch adds documentation for the following
OSD commands which were previously missing: dump, tree, crush,
cluster_snap, lost, create, rm.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agodoc: Import the list of ceph subcommands from wiki.
Andre Noll [Fri, 9 Dec 2011 17:57:40 +0000 (18:57 +0100)]
doc: Import the list of ceph subcommands from wiki.

This adds the content of the wiki page at

http://ceph.newdream.net/wiki/Monitor_commands

to doc/control.rst in order to make it available at the new official
location for the ceph documentation. This first patch is just the
result of a cut-and-paste operation. There are no changes in content,
but the text was converted to rst format.

Signed-Off-By: Andre Noll <maan@systemlinux.org>
13 years agomessenger: fix up fault()'s "onconnect" parameter.
Greg Farnum [Thu, 8 Dec 2011 00:44:28 +0000 (16:44 -0800)]
messenger: fix up fault()'s "onconnect" parameter.

We should be setting this true when calling fault() from connect().
And rename it in the header -- it does produce less output when set,
but it's actually useful because it changes the shutdown logic
slightly.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agomds: mark_disposable when closing a Client connection.
Greg Farnum [Wed, 7 Dec 2011 22:19:23 +0000 (14:19 -0800)]
mds: mark_disposable when closing a Client connection.

This is causing issues since the Client's ack of the MClientSession
is somehow not getting back to the MDS. We should make the
Client/SimpleMessenger be better-behaved about shutdown, but for
now this solution matches how we're working elsewhere in our codebase.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agoSimpleMessenger: remove void send_keepalive.
Greg Farnum [Wed, 7 Dec 2011 18:56:01 +0000 (10:56 -0800)]
SimpleMessenger: remove void send_keepalive.

Nobody uses this; they all call the version that returns an int.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agoMerge branch 'wip-mon-stats'
Sage Weil [Mon, 12 Dec 2011 17:29:36 +0000 (09:29 -0800)]
Merge branch 'wip-mon-stats'

13 years agomon: add mds, mon info to cluster_logger
Sage Weil [Thu, 8 Dec 2011 21:13:29 +0000 (13:13 -0800)]
mon: add mds, mon info to cluster_logger

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agomdsmap: rename get_num_*_mds() methods
Sage Weil [Thu, 8 Dec 2011 21:02:12 +0000 (13:02 -0800)]
mdsmap: rename get_num_*_mds() methods

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agomon: report basic cluster stats via perfcounters
Sage Weil [Thu, 8 Dec 2011 20:53:14 +0000 (12:53 -0800)]
mon: report basic cluster stats via perfcounters

These are basic point-in-time cluster stats.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agocrush: drop unused label
Sage Weil [Mon, 12 Dec 2011 17:22:49 +0000 (09:22 -0800)]
crush: drop unused label

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoMerge remote branch 'gh/stable'
Sage Weil [Mon, 12 Dec 2011 17:20:26 +0000 (09:20 -0800)]
Merge remote branch 'gh/stable'

13 years agocrush: fix force to behave with non-root TAKE
Sage Weil [Wed, 7 Dec 2011 17:07:38 +0000 (09:07 -0800)]
crush: fix force to behave with non-root TAKE

If the (first) TAKE in the crush rule is not the root, see if they picked
a point somewhere beneath the appropriate part of the hierachy.  If not,
continue with a normal mapping.

Previously we would simply error out in this case and map nothing.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agocrush: simplify force argument check
Sage Weil [Wed, 7 Dec 2011 17:09:32 +0000 (09:09 -0800)]
crush: simplify force argument check

force isn't used past this point, only force_pos.  Collapse the if
conditions.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoworkunits: print tests pjd runs
Josh Durgin [Sat, 10 Dec 2011 00:31:07 +0000 (16:31 -0800)]
workunits: print tests pjd runs

This will tell us which ones actually failed within a test suite.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agoMerge branch 'wip_pgls'
Samuel Just [Fri, 9 Dec 2011 23:23:32 +0000 (15:23 -0800)]
Merge branch 'wip_pgls'

13 years agopybind: add object locator support to pybind pool listing
Samuel Just [Fri, 9 Dec 2011 22:42:21 +0000 (14:42 -0800)]
pybind: add object locator support to pybind pool listing

list_objects returns Object().  Object therefore now has an optional
locator_key parameter which will set up the object locator on Object()
methods to allow objects returned from list_objects with locator keys to
be used normally.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agorados.cc: add --object-locator and object locator output to ls
Samuel Just [Thu, 8 Dec 2011 01:06:01 +0000 (17:06 -0800)]
rados.cc: add --object-locator and object locator output to ls

--object-locator locator causes io to use the specified locator.  For
objects with non-empty locators, rados pool ls will output the locator
as well.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agoReplicatedPG: collection_list_handle_t is now an hobject_t
Samuel Just [Sat, 3 Dec 2011 01:06:59 +0000 (17:06 -0800)]
ReplicatedPG: collection_list_handle_t is now an hobject_t

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agoosd: delay pg list on a snapid until missing is empty
Samuel Just [Fri, 2 Dec 2011 23:42:01 +0000 (15:42 -0800)]
osd: delay pg list on a snapid until missing is empty

We cannot determine from the missing set whether an object existed
at a given snap.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agomsgr: turn up socket debug printouts
Greg Farnum [Fri, 9 Dec 2011 01:45:47 +0000 (17:45 -0800)]
msgr: turn up socket debug printouts

These shouldn't be too common and will help in debugging
socket leaks.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agoudev: drop device number from name
Josh Durgin [Fri, 9 Dec 2011 00:36:45 +0000 (16:36 -0800)]
udev: drop device number from name

The device number depends on how many rbd images have been
mapped. Removing it makes the name determined solely by the name,
image, and snapshot that are mapped, for ease of scripting or persistence
across reboots.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agopybind: trivial fix of missing argument
Henry C Chang [Thu, 8 Dec 2011 14:35:07 +0000 (22:35 +0800)]
pybind: trivial fix of missing argument

Signed-off-by: Henry C Chang <henry.cy.chang@gmail.com>
13 years agocrush: whitespace
Sage Weil [Thu, 8 Dec 2011 16:42:59 +0000 (08:42 -0800)]
crush: whitespace

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoosdmap: initialize cluster_snapshot_epoch
Sage Weil [Thu, 8 Dec 2011 16:41:54 +0000 (08:41 -0800)]
osdmap: initialize cluster_snapshot_epoch

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agocrush: set max_devices=0 for map with empty buckets
Sage Weil [Thu, 8 Dec 2011 16:41:39 +0000 (08:41 -0800)]
crush: set max_devices=0 for map with empty buckets

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agocrush: fix stepping on unallocated memory
Sage Weil [Thu, 8 Dec 2011 16:01:12 +0000 (08:01 -0800)]
crush: fix stepping on unallocated memory

If size is 0 we can't write here.

Reported-by: pankaj singh <psingh.ait@gmail.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoclient: trim lru after flushing dirty data
Sage Weil [Thu, 8 Dec 2011 05:16:18 +0000 (21:16 -0800)]
client: trim lru after flushing dirty data

Shouldn't matter, but it would be interesting to see if this affects
#1737.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoclient: unmount cleanup
Sage Weil [Thu, 8 Dec 2011 05:05:40 +0000 (21:05 -0800)]
client: unmount cleanup

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoclient: wait for sync writes even with cache enabled
Sage Weil [Thu, 8 Dec 2011 05:01:48 +0000 (21:01 -0800)]
client: wait for sync writes even with cache enabled

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoclient: send umount warnings to log, not stderr
Sage Weil [Thu, 8 Dec 2011 04:59:25 +0000 (20:59 -0800)]
client: send umount warnings to log, not stderr

stderr isn't usually open anyway.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoObjectStore,ReplicatedPG: remove old collection_list_partial
Samuel Just [Fri, 2 Dec 2011 21:27:43 +0000 (13:27 -0800)]
ObjectStore,ReplicatedPG: remove old collection_list_partial

No need for the old collection_list_partial instance: it's cleaner to
just use an hobject_t as the collection list handle.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agolibrados,Objecter,PG: list objects now includes the locator key
Samuel Just [Thu, 1 Sep 2011 21:56:01 +0000 (14:56 -0700)]
librados,Objecter,PG: list objects now includes the locator key

Previously, there was no way to recover the locator key used to create
and object.  Now, rados_objects_list_next and ObjectIterator will return
the key as well as the object name.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agohobject_t: encode max properly
Sage Weil [Mon, 5 Dec 2011 19:25:09 +0000 (11:25 -0800)]
hobject_t: encode max properly

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agohobject_t: make filestore_hobject_key_t 64 bits
Sage Weil [Thu, 1 Dec 2011 21:12:43 +0000 (13:12 -0800)]
hobject_t: make filestore_hobject_key_t 64 bits

So we can return 0x100000000 when max=true.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoos/HashIndex: some minimal debug output
Sage Weil [Thu, 1 Dec 2011 19:30:50 +0000 (11:30 -0800)]
os/HashIndex: some minimal debug output

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoObjectStore: Add collection_list_partial for hash order
Sage Weil [Fri, 2 Dec 2011 04:57:23 +0000 (20:57 -0800)]
ObjectStore: Add collection_list_partial for hash order

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agohobject_t: define explicit hash, operator<<; drop implicit sobject_t()
Sage Weil [Thu, 1 Dec 2011 18:58:37 +0000 (10:58 -0800)]
hobject_t: define explicit hash, operator<<; drop implicit sobject_t()

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agoobject.h: Sort hobject_t by nibble reversed hash
Samuel Just [Wed, 30 Nov 2011 18:38:09 +0000 (10:38 -0800)]
object.h: Sort hobject_t by nibble reversed hash

To match the HashIndex ordering, we need to sort hobject_t by the nibble
reversed hash.  We store objects in the filestore in a directory tree
with the least significant nibble at the top and the most at the bottom
to facilitate pg splitting in the future.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agohobject_t: sort by (max, hash, oid, snap)
Sage Weil [Fri, 2 Dec 2011 04:57:09 +0000 (20:57 -0800)]
hobject_t: sort by (max, hash, oid, snap)

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agohobject_t: define max value
Sage Weil [Fri, 2 Dec 2011 04:56:50 +0000 (20:56 -0800)]
hobject_t: define max value

Create a max value that is greater than all other values.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agogitignore: Ignore src/keyring, as created by vstart.sh
Tommi Virtanen [Tue, 6 Dec 2011 23:22:16 +0000 (15:22 -0800)]
gitignore: Ignore src/keyring, as created by vstart.sh

Commit 86c34ba9ee8c883b71a8449c3c261154365c35ae changed
the filename but not .gitignore.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agoReplicatedPG: don't crash on empty data_subset in sub_op_push
Samuel Just [Tue, 6 Dec 2011 21:23:03 +0000 (13:23 -0800)]
ReplicatedPG: don't crash on empty data_subset in sub_op_push

If data_subset is empty (i.e., the data we pulled is no longer useful),
we should mark complete false and continue rather than fail the
assert in range_end().

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
13 years agoworkunits: fix secret file and temp file removal for kernel rbd
Josh Durgin [Tue, 6 Dec 2011 22:19:19 +0000 (14:19 -0800)]
workunits: fix secret file and temp file removal for kernel rbd

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agoReplicatedPG: do not ->put() scrub messages when adding to a WorkQueue.
Greg Farnum [Tue, 6 Dec 2011 22:24:08 +0000 (14:24 -0800)]
ReplicatedPG: do not ->put() scrub messages when adding to a WorkQueue.

This function is passing a reference from PG::active_rep_scrub to
the req_scrub_wq, not eliminating the reference (and the WorkQueue
doesn't grab a new reference itself, either).
The other alternative is to convert the WorkQueue to grab a
reference, but since they can cycle through the WorkQueue more than
once, and need to be ->put() outside the WorkQueue, I don't like
that option.
This should fix #1758.

Also add an assert to PG::_request_scrub_map to check on the other
possible cause of this bug (and fix the indentation).

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
13 years agoworkunits: make rbd kernel workunit executable
Josh Durgin [Tue, 6 Dec 2011 21:36:51 +0000 (13:36 -0800)]
workunits: make rbd kernel workunit executable

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agodoc: Reorganize pip calls to use a requirements file.
Tommi Virtanen [Tue, 6 Dec 2011 20:13:03 +0000 (12:13 -0800)]
doc: Reorganize pip calls to use a requirements file.

The conditional before running pip install was unnecessary,
"pip install" on already installed packages is fast (as long
as it's not --upgrade), and --quiet makes it not spam the
console.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agodoc: Switch diagram tools from dia to ditaa.
Tommi Virtanen [Tue, 6 Dec 2011 20:04:03 +0000 (12:04 -0800)]
doc: Switch diagram tools from dia to ditaa.

Now you can create diagrams easily with the ".. ditaa::"
directive in the Sphinx documents.

admin/build-doc now checks for debs required for building
the documentation, or just lists commands missing for hosts
not using dpkg.

For more on Ditaa, see http://ditaa.sourceforge.net/

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
13 years agofilestore: send back op error to log, not stderr
Sage Weil [Tue, 6 Dec 2011 18:46:27 +0000 (10:46 -0800)]
filestore: send back op error to log, not stderr

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agodoc: fix typo
Sage Weil [Tue, 6 Dec 2011 18:39:49 +0000 (10:39 -0800)]
doc: fix typo

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoworkunits: add some tests for kernel rbd
Josh Durgin [Tue, 6 Dec 2011 18:31:17 +0000 (10:31 -0800)]
workunits: add some tests for kernel rbd

This covers some snapshot and resize functions that aren't tested by fs benchmarks.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agorbd: the showmapped command shouldn't connect to the cluster
Josh Durgin [Wed, 30 Nov 2011 18:26:22 +0000 (10:26 -0800)]
rbd: the showmapped command shouldn't connect to the cluster

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agoceph-rbdnamer: include snapshot name if present
Josh Durgin [Tue, 29 Nov 2011 01:24:25 +0000 (17:24 -0800)]
ceph-rbdnamer: include snapshot name if present

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agorbd, mount.ceph: use pre-stored secret if available
Josh Durgin [Tue, 29 Nov 2011 01:02:15 +0000 (17:02 -0800)]
rbd, mount.ceph: use pre-stored secret if available

If a secret is specified, store and use it, but otherwise
check for a pre-existing secret to use.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agosecret: add is_kernel_secret function
Josh Durgin [Tue, 29 Nov 2011 00:54:27 +0000 (16:54 -0800)]
secret: add is_kernel_secret function

This will let us know whether we can add a key mount option
if no secret is specified.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agosecret: fix error check
Josh Durgin [Tue, 29 Nov 2011 00:52:19 +0000 (16:52 -0800)]
secret: fix error check

add_key will return -1 when an error occurs, which should be handled at a higher level and not printed here.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agorbd: allow snapshots to be mapped
Josh Durgin [Wed, 23 Nov 2011 21:54:08 +0000 (13:54 -0800)]
rbd: allow snapshots to be mapped

unmap and showmapped already support snapshots. map should too.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agotest_rados.py: clean up after EEXIST test
Josh Durgin [Tue, 6 Dec 2011 16:34:19 +0000 (08:34 -0800)]
test_rados.py: clean up after EEXIST test

This extra pool caused subsequent pool tests to fail.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
13 years agoMerge remote branch 'gh/stable'
Sage Weil [Tue, 6 Dec 2011 01:33:57 +0000 (17:33 -0800)]
Merge remote branch 'gh/stable'

13 years agodoc: fix rst syntax
Sage Weil [Tue, 6 Dec 2011 00:16:35 +0000 (16:16 -0800)]
doc: fix rst syntax

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agodoc: document monitor cluster expansion/contraction
Sage Weil [Mon, 5 Dec 2011 22:07:44 +0000 (14:07 -0800)]
doc: document monitor cluster expansion/contraction

Pretty sure my rst syntax is wrong.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agocephtool: fix shutdown
Sage Weil [Mon, 5 Dec 2011 21:38:02 +0000 (13:38 -0800)]
cephtool: fix shutdown

Fix 'ceph -w' brokenness from commit ad13d0b7.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
13 years agofilejournal: make FileJournal::open() arg slightly less weird
Sage Weil [Mon, 5 Dec 2011 17:36:54 +0000 (09:36 -0800)]
filejournal: make FileJournal::open() arg slightly less weird

Pass in fs_op_seq (last_committed_seq), not the next expected seq, so we
can avoid subtracting and adding 1 in odd places.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoMerge branch 'stable'
Sage Weil [Mon, 5 Dec 2011 19:21:08 +0000 (11:21 -0800)]
Merge branch 'stable'

13 years agovstart.sh: .ceph_keyring -> keyring
Sage Weil [Mon, 5 Dec 2011 17:23:56 +0000 (09:23 -0800)]
vstart.sh: .ceph_keyring -> keyring

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agofilejournal: remove bogus check in read_entry
Sage Weil [Mon, 5 Dec 2011 18:52:24 +0000 (10:52 -0800)]
filejournal: remove bogus check in read_entry

It is perfectly fine to read events that are older than the fs's seq from
the journal; open() will skip them when positioning the read pointer on
open.

Also, this code is nonsensical; it always failed the assertion.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agofilejournal: set last_committed_seq based on fs, not journal
Sage Weil [Mon, 5 Dec 2011 17:34:44 +0000 (09:34 -0800)]
filejournal: set last_committed_seq based on fs, not journal

last_committed_seq is the last seq committed to the fs, not the journal.
Set it when we begin replay with the fs provided value, not from the newest
entry in the journal.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agomon: stub perfcounters for monitor, cluster
Sage Weil [Fri, 2 Dec 2011 23:35:38 +0000 (15:35 -0800)]
mon: stub perfcounters for monitor, cluster

The 'mon' perfcounter is for the local daemon and is always registered.

The 'cluster' perfcounter is for cluster state, and is only registered
(and thus only shows up via the admin socket) when the current daemon is
part of the cluster quorum.

No actual counters yet.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoosd: safely requeue waiting_for_ondisk waiters on_role_change
Sage Weil [Fri, 2 Dec 2011 23:25:37 +0000 (15:25 -0800)]
osd: safely requeue waiting_for_ondisk waiters on_role_change

This could conceivably cause the reply ordering mismatch seen in bug
#1490.  Not sure why we didn't also fix this caller when we fixed that
bug last time :).

Signed-off-by: Sage Weil <sage@newdream.net>