]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
13 years agodoc: Typo.
Tommi Virtanen [Wed, 20 Jun 2012 19:55:29 +0000 (12:55 -0700)]
doc: Typo.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
13 years agoMerge branch 'wip-clsrbd'
Sage Weil [Tue, 19 Jun 2012 22:19:21 +0000 (15:19 -0700)]
Merge branch 'wip-clsrbd'

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agodoc: document usage log
Yehuda Sadeh [Tue, 19 Jun 2012 22:17:53 +0000 (15:17 -0700)]
doc: document usage log

Modify radosgw, radosgw-admin man page

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agocls_rbd: note overlap units
Sage Weil [Tue, 19 Jun 2012 21:31:21 +0000 (14:31 -0700)]
cls_rbd: note overlap units

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: fix uninitialized var in cls_rbd_parent
Sage Weil [Sat, 16 Jun 2012 20:08:06 +0000 (13:08 -0700)]
cls_rbd: fix uninitialized var in cls_rbd_parent

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: clean up doxygen, whitespace a bit
Sage Weil [Sat, 16 Jun 2012 14:50:46 +0000 (07:50 -0700)]
cls_rbd: clean up doxygen, whitespace a bit

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: include dumpers, test instances for our types
Sage Weil [Sat, 16 Jun 2012 00:41:04 +0000 (17:41 -0700)]
cls_rbd: include dumpers, test instances for our types

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: rename parent size -> overlap
Sage Weil [Sat, 16 Jun 2012 00:29:35 +0000 (17:29 -0700)]
cls_rbd: rename parent size -> overlap

The use of 'size' to describe the amount that we overlap with the parent
was confusing; overlap is more intuitive (to me, at least!).

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: handle parent overlap
Sage Weil [Sat, 16 Jun 2012 00:27:25 +0000 (17:27 -0700)]
cls_rbd: handle parent overlap

Two things:

 * when we set a parent, the overlap is the min of our size and the
   parent's size.
 * when we resize, our overlap may shrink.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: make snapshots inherit the head's parent
Sage Weil [Sat, 16 Jun 2012 00:03:47 +0000 (17:03 -0700)]
cls_rbd: make snapshots inherit the head's parent

When you take a snapshot, the snap gets the current parent of the head, if
any.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: check for LAYERING feature for parent methods
Sage Weil [Fri, 15 Jun 2012 17:42:49 +0000 (10:42 -0700)]
cls_rbd: check for LAYERING feature for parent methods

You need to set the feature on the image before you can use these methods.
We *could* allow get_parent, but that just means they'll get ENOENT instead
of ENOEXEC, and the latter is more informative.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: implement get_parent, set_parent, remove_parent
Sage Weil [Mon, 18 Jun 2012 21:22:53 +0000 (14:22 -0700)]
cls_rbd: implement get_parent, set_parent, remove_parent

Implement methods to get/set/remove the parent pointer on child images.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd_client: use snapid_t type
Sage Weil [Fri, 15 Jun 2012 22:38:27 +0000 (15:38 -0700)]
cls_rbd_client: use snapid_t type

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 19 Jun 2012 21:29:43 +0000 (14:29 -0700)]
Merge remote-tracking branch 'gh/next'

Conflicts:
src/osd/PG.cc

13 years agorgw: set s->header_ended before flushing formatter
Yehuda Sadeh [Mon, 18 Jun 2012 21:44:38 +0000 (14:44 -0700)]
rgw: set s->header_ended before flushing formatter

otherwise we don't account the formatter in s->bytes_sent.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agorgw: log user and not bucket owner for service operations
Yehuda Sadeh [Mon, 18 Jun 2012 21:28:25 +0000 (14:28 -0700)]
rgw: log user and not bucket owner for service operations

For operations that are done on the service (e.g., list buckets)
we need to log the user that did the operation, and not the bucket
owner.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agorgw: initalize s->enable_usage_log
Yehuda Sadeh [Mon, 18 Jun 2012 21:27:51 +0000 (14:27 -0700)]
rgw: initalize s->enable_usage_log

Missing initialization, we ended up not logging every operation.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agoosd: use derr (instead of cerr) for convertfs
Sage Weil [Tue, 19 Jun 2012 17:12:40 +0000 (10:12 -0700)]
osd: use derr (instead of cerr) for convertfs

This will appear in the log *and* stderr (if we're running in the
foreground).

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: close stderr on daemonize
Sage Weil [Tue, 19 Jun 2012 17:11:01 +0000 (10:11 -0700)]
osd: close stderr on daemonize

This spams stderr in an ugly way.  Users should look at the logs.

In particular, filestore upgrades spam the console, which is unpleasant.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoPG: improve find_best_info
Samuel Just [Tue, 19 Jun 2012 16:11:57 +0000 (09:11 -0700)]
PG: improve find_best_info

07f853db3982e68b952a337cf91cbf7ec0709de9 is actually too conservative,
it suffices to find any info with a last_update of at least the least
last_update from the last period to go active.  An info from a previous
interval is acceptable if the last interval never reported a commited
operation and thus still has the same last_update.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: make grammar build on spirit 2.2/boost 1.42
Sage Weil [Tue, 19 Jun 2012 16:39:01 +0000 (09:39 -0700)]
osdcap: make grammar build on spirit 2.2/boost 1.42

This is a stupid workaround, but it makes the compilation error go away.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc: Added a snapshot page with outline. Needs additional info.
John Wilkins [Tue, 19 Jun 2012 17:15:35 +0000 (10:15 -0700)]
doc: Added a snapshot page with outline. Needs additional info.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: Added prerequisite of running Ceph cluster.
John Wilkins [Tue, 19 Jun 2012 17:10:51 +0000 (10:10 -0700)]
doc: Added prerequisite of running Ceph cluster.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoPG: reg_last_pg_scrub on pg resurrection
Samuel Just [Mon, 18 Jun 2012 16:26:12 +0000 (09:26 -0700)]
PG: reg_last_pg_scrub on pg resurrection

This may solve the unreg_last_pg_scrub assert.

see #2453.

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agoceph_osd: move auto-upgrade to after fork
Samuel Just [Mon, 18 Jun 2012 21:02:28 +0000 (14:02 -0700)]
ceph_osd: move auto-upgrade to after fork

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agoMerge branch 'master' of github.com:ceph/ceph
John Wilkins [Mon, 18 Jun 2012 21:29:27 +0000 (14:29 -0700)]
Merge branch 'master' of github.com:ceph/ceph

13 years agolibrbd: simplify refresh sequence checks
Sage Weil [Mon, 18 Jun 2012 21:11:37 +0000 (14:11 -0700)]
librbd: simplify refresh sequence checks

- incremental seq each request
- set last to the last completed seq
- drop the now-redundant bool

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
13 years agodoc: first cut of OpenStack/RBD w/out cephx. Authentication coming soon.
John Wilkins [Mon, 18 Jun 2012 21:29:04 +0000 (14:29 -0700)]
doc: first cut of OpenStack/RBD w/out cephx. Authentication coming soon.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agofilestore: make disk format upgrade warning less scary, more informative
Sage Weil [Mon, 18 Jun 2012 21:07:20 +0000 (14:07 -0700)]
filestore: make disk format upgrade warning less scary, more informative

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
13 years agomon: include quorum in ceph status
Sage Weil [Mon, 18 Jun 2012 21:02:29 +0000 (14:02 -0700)]
mon: include quorum in ceph status

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: gracefully handle slow 'ceph -w' clients
Sage Weil [Mon, 18 Jun 2012 21:00:06 +0000 (14:00 -0700)]
mon: gracefully handle slow 'ceph -w' clients

If we are sending log updates to a client (ceph -w), and they are far
enough behind to drop behind first_committed, include a friendly message
in their stream but continue.

Drop useless return value from _create_sub_incremental().  Assert that we
can read the state file.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc: Added libvirt installation.
John Wilkins [Mon, 18 Jun 2012 20:22:18 +0000 (13:22 -0700)]
doc: Added libvirt installation.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoPG: best_info must have a last_epoch_started as high as any other info
Samuel Just [Sat, 16 Jun 2012 00:09:42 +0000 (17:09 -0700)]
PG: best_info must have a last_epoch_started as high as any other info

We disregard incomplete infos during find_best_info, but we can't an
info with a last_epoch_started less that of the incomplete info.

This should avoid cases like #2462.  In that case, it appears that
a peer with empty info/log was chosen as authoritative even though
there was a non-empty incomplete peer.

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agodoc: btrfs and parted chef recipes are not needed.
Tommi Virtanen [Mon, 18 Jun 2012 17:36:37 +0000 (10:36 -0700)]
doc: btrfs and parted chef recipes are not needed.

They were removed in ceph-cookbooks.git commit
a77b418b95df8f2b6f56d9a90e47dc62100cdf4d.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
13 years agoMerge branch 'next'
Sage Weil [Sun, 17 Jun 2012 21:00:02 +0000 (14:00 -0700)]
Merge branch 'next'

13 years agodebian: fix python-ceph depends
Laszlo Boszormenyi (GCS) [Sat, 16 Jun 2012 20:49:41 +0000 (13:49 -0700)]
debian: fix python-ceph depends

Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
13 years agodebian: update homepage url
Laszlo Boszormenyi (GCS) [Sat, 16 Jun 2012 20:39:20 +0000 (13:39 -0700)]
debian: update homepage url

Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
13 years agofilestore: fix 'omap' collection skipping
Sage Weil [Sun, 17 Jun 2012 20:20:59 +0000 (13:20 -0700)]
filestore: fix 'omap' collection skipping

The if/else if/... structure was skipping this test if the file system
didn't support d_type.

Fixes: #2598
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorun-cli-test: use new pip incantation
Sage Weil [Fri, 15 Jun 2012 21:48:22 +0000 (14:48 -0700)]
run-cli-test: use new pip incantation

http://www.pip-installer.org/en/latest/news.html#id1

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorun-cli-test: use new pip incantation
Sage Weil [Fri, 15 Jun 2012 21:48:22 +0000 (14:48 -0700)]
run-cli-test: use new pip incantation

http://www.pip-installer.org/en/latest/news.html#id1

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: do not pass snapid_t to vargs
Sage Weil [Sun, 17 Jun 2012 16:07:41 +0000 (09:07 -0700)]
cls_rbd: do not pass snapid_t to vargs

On squeeze,

warning: cls_rbd.cc:534: cannot pass objects of non-POD type ‘struct snapid_t’ through ‘...’; call will abort at runtime

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomsg: fix buffer overflow in ipv6 addr parsing
Sage Weil [Sun, 17 Jun 2012 03:09:04 +0000 (20:09 -0700)]
msg: fix buffer overflow in ipv6 addr parsing

Noticed because of failing i386 unit tests for long addrs; x86_64 passed
fine.  Sigh.  FTR, the failing address was

2001:0db8:85a3:0000:0000:8a2e:0370:7334

Sadly the full length addrs don't turn it up on x86_64, still, nor does
valgrind notice.  But, this fixes it on i386.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoceph.newdream.net -> ceph.com
Sage Weil [Sat, 16 Jun 2012 21:50:29 +0000 (14:50 -0700)]
ceph.newdream.net -> ceph.com
wiki url -> docs url

13 years agoMerge branch 'next'
Sage Weil [Sat, 16 Jun 2012 14:42:17 +0000 (07:42 -0700)]
Merge branch 'next'

Conflicts:
src/cls_rbd.cc

13 years agocls_rbd: drop useless snapshot metadata helpers
Sage Weil [Sat, 16 Jun 2012 14:33:19 +0000 (07:33 -0700)]
cls_rbd: drop useless snapshot metadata helpers

Now that cls_rbd_snap is encodable, we don't need these helpers; get_key()
will suffice.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agocls_rbd: use encode macros for on-disk snap metadata
Sage Weil [Thu, 14 Jun 2012 23:12:49 +0000 (16:12 -0700)]
cls_rbd: use encode macros for on-disk snap metadata

This will let us version this encoding later when we add new information
and features, like a per-snap parent.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge branch 'wip-rbd-locking'
Greg Farnum [Sat, 16 Jun 2012 00:39:48 +0000 (17:39 -0700)]
Merge branch 'wip-rbd-locking'

Conflicts:
src/cls_rbd.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agoPG: best_info must have a last_epoch_started as high as any other info
Samuel Just [Sat, 16 Jun 2012 00:09:42 +0000 (17:09 -0700)]
PG: best_info must have a last_epoch_started as high as any other info

We disregard incomplete infos during find_best_info, but we can't an
info with a last_epoch_started less that of the incomplete info.

This should avoid cases like #2462.  In that case, it appears that
a peer with empty info/log was chosen as authoritative even though
there was a non-empty incomplete peer.

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agolibrbd: remove the set-r-and-return idiom from some functions.
Greg Farnum [Sat, 16 Jun 2012 00:26:04 +0000 (17:26 -0700)]
librbd: remove the set-r-and-return idiom from some functions.

Josh hates this, and I have to admit it seems silly.

Signed-off-by: Greg Farnum <greg@inktank.com>
13 years agolibrbd: add cooperative image locking to the C and C++ interfaces
Greg Farnum [Thu, 14 Jun 2012 21:18:25 +0000 (14:18 -0700)]
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>
13 years agolibrbd: include the image lockers in the ImageCtx mutable metadata
Greg Farnum [Thu, 14 Jun 2012 20:43:29 +0000 (13:43 -0700)]
librbd: include the image lockers in the ImageCtx mutable metadata

Signed-off-by: Greg Farnum <greg@inktank.com>
13 years agotest: add rbd image locking tests to test_cls_rbd
Greg Farnum [Tue, 12 Jun 2012 22:12:49 +0000 (15:12 -0700)]
test: add rbd image locking tests to test_cls_rbd

Signed-off-by: Greg Farnum <greg@inktank.com>
13 years agocls_rbd_client: expose locking operations
Greg Farnum [Tue, 12 Jun 2012 22:12:19 +0000 (15:12 -0700)]
cls_rbd_client: expose locking operations

Signed-off-by: Greg Farnum <greg@inktank.com>
13 years agocls_rbd: add failure logging to all callers of read_key.
Greg Farnum [Sat, 16 Jun 2012 00:11:02 +0000 (17:11 -0700)]
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>
13 years agocls_rbd: add locking functions.
Greg Farnum [Tue, 12 Jun 2012 20:03:36 +0000 (13:03 -0700)]
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>
13 years agofilejournal: make less noise about open failures
Sage Weil [Fri, 15 Jun 2012 21:48:22 +0000 (14:48 -0700)]
filejournal: make less noise about open failures

The callers report errors and pass up errors, so do not spam stderr with
this.  Fixes the confusion that sparked #2595.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorgw: obj copy respects -metadata-directive
Yehuda Sadeh [Tue, 12 Jun 2012 21:42:03 +0000 (14:42 -0700)]
rgw: obj copy respects -metadata-directive

Fixes #2542. The old behavior just merged src object attrs
and provided attributes. The new (and correct) behavior looks
at the x-[amz|rgw|...]-metadata-directive and either copies
the source attrs, or replaces them with the provided attrs.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agolibrbd: only clear the needs_refresh flag on successful updates.
Greg Farnum [Mon, 11 Jun 2012 17:19:54 +0000 (10:19 -0700)]
librbd: only clear the needs_refresh flag on successful updates.

To support this, add a refresh_seq counter which is incremented every
time we get a notify. This way we can handle the concern from
7add136f907876a20aa2a68297c66b8259afd9a7, in which we get a notify
in the middle of doing a refresh.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agoosd: optional verify that sparse_read holes are zero-filled
Sage Weil [Thu, 14 Jun 2012 19:51:07 +0000 (12:51 -0700)]
osd: optional verify that sparse_read holes are zero-filled

This should help us track down/verify #2535.  It seems to happen on several
different systems, but we haven't figured out which ones yet.

This detects the bug, but does not attempt to correct it.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agobuffer: add list and ptr is_zero() method
Sage Weil [Thu, 14 Jun 2012 19:34:46 +0000 (12:34 -0700)]
buffer: add list and ptr is_zero() method

Simple helper to check if a buffer is all zeros.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge remote-tracking branch 'gh/wip-osdcap'
Sage Weil [Fri, 15 Jun 2012 18:10:02 +0000 (11:10 -0700)]
Merge remote-tracking branch 'gh/wip-osdcap'

Reviewed-by: Greg Farnum <greg@inktank.com>
13 years agoLFNIndex.cc: escape null in append_[un]escaped
Samuel Just [Fri, 15 Jun 2012 17:10:47 +0000 (10:10 -0700)]
LFNIndex.cc: escape null in append_[un]escaped

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agofilestore: disable 'filestore fiemap' by default
Sage Weil [Fri, 15 Jun 2012 17:00:54 +0000 (10:00 -0700)]
filestore: disable 'filestore fiemap' by default

We've seen this failing on both btrfs (Guido) and XFS (Oliver).  This works
around #2535.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: 'allow rwx pool foo' or 'allow pool foo rwx'
Sage Weil [Thu, 14 Jun 2012 23:47:22 +0000 (16:47 -0700)]
osdcap: 'allow rwx pool foo' or 'allow pool foo rwx'

Make the match vs spec order not matter.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoceph-authtool: update docs to reflect no more osdcap deny
Sage Weil [Thu, 14 Jun 2012 23:36:10 +0000 (16:36 -0700)]
ceph-authtool: update docs to reflect no more osdcap deny

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: make caps additive
Sage Weil [Thu, 14 Jun 2012 23:35:02 +0000 (16:35 -0700)]
osdcap: make caps additive

Make 'allow pool foo r, allow pool foo w, allow x' sufficient when you
require rwx for pool foo.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge branch 'wip-radosgw-upstart'
Sage Weil [Thu, 14 Jun 2012 22:17:03 +0000 (15:17 -0700)]
Merge branch 'wip-radosgw-upstart'

13 years agoradosgw: stop startup timer on failed start
Sage Weil [Thu, 14 Jun 2012 22:09:16 +0000 (15:09 -0700)]
radosgw: stop startup timer on failed start

This fixes crashes like

    -1> 2012-06-14 15:04:31.733009 7f544e18c780 -1 Couldn't init storage provider (RADOS)
     0> 2012-06-14 15:04:31.734110 7f544e18c780 -1 common/Timer.cc: In function 'SafeTimer::~SafeTimer()' thread 7f544e18c780 time 2012-06-14 15:04:31.733020
common/Timer.cc: 57: FAILED assert(thread == __null)

 ceph version 0.47.2-481-g6f30f1f (commit:6f30f1fcdecd6c9390d4678c754dadd305165e3e)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x80) [0x5399a0]
 2: (SafeTimer::~SafeTimer()+0x39) [0x533e77]
 3: (main()+0x6f5) [0x51bc9d]
 4: (__libc_start_main()+0xfd) [0x7f544b38eead]
 5: /home/sage/src/ceph/src/.libs/lt-radosgw() [0x4f9e09]
 NOTE: a copy of the executable, or `objdump -rdS <executable>` is needed to interpret this.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoupstart: make id charset include - _ and .
Sage Weil [Thu, 14 Jun 2012 22:04:07 +0000 (15:04 -0700)]
upstart: make id charset include - _ and .

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoradosgw: takes --id, but not -i
Sage Weil [Thu, 14 Jun 2012 22:03:46 +0000 (15:03 -0700)]
radosgw: takes --id, but not -i

The -i short versio doesn't work on 'client' code that tend to use it for
input files.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoobjclass: allow class methods to retrieve their triggering entity_inst
Greg Farnum [Mon, 11 Jun 2012 22:36:06 +0000 (15:36 -0700)]
objclass: allow class methods to retrieve their triggering entity_inst

Signed-off-by: Greg Farnum <greg@inktank.com>
13 years agodoc: added qemu-img documentation for rbd.
John Wilkins [Thu, 14 Jun 2012 21:18:53 +0000 (14:18 -0700)]
doc: added qemu-img documentation for rbd.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agorgw: limit number of buckets per user
Yehuda Sadeh [Tue, 12 Jun 2012 06:31:09 +0000 (23:31 -0700)]
rgw: limit number of buckets per user

Adding a configurable max_buckets per user. Bucket creation
verifies that max_buckets has not reached.

Backport: dho
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
13 years agodoc: Added steps for OpenStack install with DevStack
John Wilkins [Thu, 14 Jun 2012 16:46:32 +0000 (09:46 -0700)]
doc: Added steps for OpenStack install with DevStack

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: fixed bash syntax error.
John Wilkins [Thu, 14 Jun 2012 16:35:17 +0000 (09:35 -0700)]
doc: fixed bash syntax error.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoqa: disable xfstest 68 for now
Sage Weil [Thu, 14 Jun 2012 16:07:26 +0000 (09:07 -0700)]
qa: disable xfstest 68 for now

Stop the qa noise we fix #2410.  Looks like a freeze/thaw thing.

Maybe Jan's new freeze/thaw code will address this?  That's probably
wishful thinking.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoqa: disable xfstest 219 for now
Sage Weil [Thu, 14 Jun 2012 16:01:42 +0000 (09:01 -0700)]
qa: disable xfstest 219 for now

The cause of 219 failing is non-obvious.  Disable it for now.  :(

Avoids #2522.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: move semantics of cap check into OSDCap class
Sage Weil [Thu, 14 Jun 2012 00:15:33 +0000 (17:15 -0700)]
osdcap: move semantics of cap check into OSDCap class

The class needs to understand the semantics of possible actions in enough
detail to apply the capabilities it describes, so it makes sense to pass
all of that information into a check method here.  That is preferable to
exposing the internal structure of the capability itself to an external
function to apply the same logic.

Specifically, this fixes the problem where we return the first matching
OSDCapSpec, not a union of all matching specs, and thus fixes a problem
where applying a cap like 'allow r, allow pool foo rwx' to a write
operation in pool foo.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMakefile: fix leveldb dep for system library case
Sage Weil [Wed, 13 Jun 2012 04:17:11 +0000 (21:17 -0700)]
Makefile: fix leveldb dep for system library case

We conditionally add this below only if using the bundled version.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMakefile: fix leveldb includes for system library case
Sage Weil [Wed, 13 Jun 2012 04:16:45 +0000 (21:16 -0700)]
Makefile: fix leveldb includes for system library case

Use the installed headers, not ours.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc: Multi-monitor support means ceph::single_mon was renamed.
Tommi Virtanen [Wed, 13 Jun 2012 23:23:14 +0000 (16:23 -0700)]
doc: Multi-monitor support means ceph::single_mon was renamed.

This changed in ceph-cookbooks.git commit
8e56551b11fe28cc4f29f4fcdcf6c38516bdc833.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
13 years agoosdcap: whitespace to make grammar more readable
Sage Weil [Wed, 13 Jun 2012 20:55:38 +0000 (13:55 -0700)]
osdcap: whitespace to make grammar more readable

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: use static const instead of #define
Sage Weil [Wed, 13 Jun 2012 20:42:36 +0000 (13:42 -0700)]
osdcap: use static const instead of #define

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosdcap: drop unused 'auid' arg from get_cap(), is_match()
Sage Weil [Wed, 13 Jun 2012 20:42:24 +0000 (13:42 -0700)]
osdcap: drop unused 'auid' arg from get_cap(), is_match()

The intent was to do a cap like 'allow pools-that-i-own ...', but in
practice you just do 'allow pool <myuid> ...'.. the actual auid you
authenticate as is redundant, since the cap itself is authenticated.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorbd: fix usage test
Sage Weil [Wed, 13 Jun 2012 18:24:19 +0000 (11:24 -0700)]
rbd: fix usage test

Fixes: #2347
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMakefile: link gtest statically
Sage Weil [Wed, 13 Jun 2012 18:05:43 +0000 (11:05 -0700)]
Makefile: link gtest statically

The problem:

 - the unittests link against gtest, and gtest is not installed.  that's
   normally fine, but...
 - rbd and rados api unit tests link against gtest, and are installed
   by 'make install'.  they are needed for teuthology runs, etc.
 - if we build gtest as an .la library, we can only control whether *all*
   or *no* .la libraries are linked statically.
 - we want librados to be linked dynamically.

The solution:

 - build gtest as .a instead of a libtool library
 - link it statically, always.

Unit test binaries are bigger now.  Oh well...

Fixes: #2331
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodebian: install radosgw upstart configs, daemon dir
Sage Weil [Tue, 12 Jun 2012 20:40:43 +0000 (13:40 -0700)]
debian: install radosgw upstart configs, daemon dir

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoradosgw: upstart support
Sage Weil [Tue, 12 Jun 2012 20:39:57 +0000 (13:39 -0700)]
radosgw: upstart support

Like the other upstart configs, these assume the default value for
'rgw data'.  Same pattern as ceph-mon and ceph-mds.

Fixes: #2415
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoCrushTester.cc: eliminated old compiler warning of uninitialized pointer.
caleb miles [Wed, 13 Jun 2012 14:46:02 +0000 (07:46 -0700)]
CrushTester.cc: eliminated old compiler warning of uninitialized pointer.

Signed-off-by: caleb miles <caselim@gmail.com>
13 years agoosd: reimplement OSDCap struct
Sage Weil [Wed, 13 Jun 2012 02:16:28 +0000 (19:16 -0700)]
osd: reimplement OSDCap struct

The old OSDCaps had a few undesireable features:

 - deny
 - weird 'default permissions' semantics when auid matches and no other
   cap is specified
 - difficult to understand, maintain parser

This version is renamed and has a few nice features:

 - spirit grammar for parsing
 - simple internal grant structure with simple semantics
 - support for object prefix maches
 - partial support for per-class (not yet implmeented by the OSD)

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoinit-ceph: make 'status' report running version
Sage Weil [Tue, 12 Jun 2012 20:58:22 +0000 (13:58 -0700)]
init-ceph: make 'status' report running version

Try to report the running version with 'status'.

Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoPG: track purged pgs during active
Samuel Just [Tue, 12 Jun 2012 19:53:02 +0000 (12:53 -0700)]
PG: track purged pgs during active

See bug #2462.

The following sequence could cause a log assuming a non-empty pg
to an empty replica:

1. primary sends query to stray
2. stray sends notify to primary
3. primary sends purge to stray removing stray from peer_info
4. stray recieves query and sends a notify
5. stray recieves purge and purges its pg
6. primary recieves notify from stray and adds it to peer_info
note: peer_info[stray] is now wrong
7. acting set changes, primary is still primary, stray is replica
8. primary sends log to replica based on incorrect info from 6.

This patch adds a purged_peer set which is populated during purge_strays
and cleared during start_peering_interval.  The primary will ignore
notifies from the peer once the peer is in this set.

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agoMerge branch 'wip-keyrings'
Sage Weil [Tue, 12 Jun 2012 19:48:37 +0000 (12:48 -0700)]
Merge branch 'wip-keyrings'

Reviewed-by: Greg Farnum <greg@inktank.com>
13 years agoceph_argparse: make entityname parsing error more helpful
Sage Weil [Fri, 8 Jun 2012 19:45:42 +0000 (12:45 -0700)]
ceph_argparse: make entityname parsing error more helpful

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorgw: default keyring to $rgw_data/keyring
Sage Weil [Thu, 7 Jun 2012 02:42:51 +0000 (19:42 -0700)]
rgw: default keyring to $rgw_data/keyring

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agovstart.sh: set data dirs instead of keyring locations
Sage Weil [Thu, 7 Jun 2012 02:50:50 +0000 (19:50 -0700)]
vstart.sh: set data dirs instead of keyring locations

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agonew default keyring location for daemons
Sage Weil [Fri, 1 Jun 2012 18:02:09 +0000 (11:02 -0700)]
new default keyring location for daemons

$osd_data/keyring
$mds_data/keyring

Fixes: #2498
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomds: add mds_data config
Sage Weil [Fri, 1 Jun 2012 17:58:23 +0000 (10:58 -0700)]
mds: add mds_data config

This is where the keyring will live.  Eventually more may move in too.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoconfig: improve variable substitution
Sage Weil [Sun, 10 Jun 2012 02:40:52 +0000 (19:40 -0700)]
config: improve variable substitution

- allow ${foo_bar}
- prevent $foogarbage from substitution variable 'foo'
- use std::string throughout
- improve tests

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoconfig: expand any config variable in config
Sage Weil [Fri, 8 Jun 2012 19:45:30 +0000 (12:45 -0700)]
config: expand any config variable in config

This is currently broken wrt 'foo' vs 'foo_bar', but otherwise works.

Signed-off-by: Sage Weil <sage@inktank.com>