]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years ago:doc: Changed rados.gateway to radosgw.gateway. Start with /etc/init.d.
John Wilkins [Tue, 18 Sep 2012 21:16:44 +0000 (14:16 -0700)]
:doc: Changed rados.gateway to radosgw.gateway. Start with /etc/init.d.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Trimmed up the stack diagram and fixed a few hyperlink refs.
John Wilkins [Tue, 18 Sep 2012 20:55:18 +0000 (13:55 -0700)]
:doc: Trimmed up the stack diagram and fixed a few hyperlink refs.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Modified hostname to hostname -s.
John Wilkins [Tue, 18 Sep 2012 20:44:16 +0000 (13:44 -0700)]
:doc: Modified hostname to hostname -s.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Modified hostname to hostname -s.
John Wilkins [Tue, 18 Sep 2012 20:43:47 +0000 (13:43 -0700)]
:doc: Modified hostname to hostname -s.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Modified hostname to hostname -s.
John Wilkins [Tue, 18 Sep 2012 20:43:25 +0000 (13:43 -0700)]
:doc: Modified hostname to hostname -s.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'wip-3127'
Yehuda Sadeh [Tue, 18 Sep 2012 20:24:52 +0000 (13:24 -0700)]
Merge branch 'wip-3127'

Conflicts:
src/rgw/rgw_rados.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: fix unused warning message
Yehuda Sadeh [Tue, 18 Sep 2012 20:20:06 +0000 (13:20 -0700)]
rgw: fix unused warning message

Remove unused variable.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: fix uninitialized var in error message
Yehuda Sadeh [Tue, 18 Sep 2012 20:12:06 +0000 (13:12 -0700)]
rgw: fix uninitialized var in error message

Used the wrong variable in error message.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw, cls_rgw: a tool to rebuild bucket stats
Yehuda Sadeh [Thu, 13 Sep 2012 23:20:15 +0000 (16:20 -0700)]
rgw, cls_rgw: a tool to rebuild bucket stats

radosgw-admin bucket check [--fix] --bucket=<bucket>

The command will dump the existing bucket header stats,
and the calculated bucket header stats. If --fix is provided
the bucket stats will be overwritten by the recalculated
stats.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years ago:doc: Changed title to RBD from RADOS. Clearer.
John Wilkins [Tue, 18 Sep 2012 20:02:17 +0000 (13:02 -0700)]
:doc: Changed title to RBD from RADOS. Clearer.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Made notice to stop i/o a warning. Initial format clean up.
John Wilkins [Tue, 18 Sep 2012 20:01:50 +0000 (13:01 -0700)]
:doc: Made notice to stop i/o a warning. Initial format clean up.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Added discussion and stack diagram. Initial format cleanup.
John Wilkins [Tue, 18 Sep 2012 20:00:58 +0000 (13:00 -0700)]
:doc: Added discussion and stack diagram. Initial format cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Remove legacy usage. Initial format cleanup.
John Wilkins [Tue, 18 Sep 2012 20:00:07 +0000 (13:00 -0700)]
:doc: Remove legacy usage. Initial format cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agorgw: obj_stat() returns object version (epoch), use it
Yehuda Sadeh [Thu, 13 Sep 2012 21:47:16 +0000 (14:47 -0700)]
rgw: obj_stat() returns object version (epoch), use it

We now pass the object version returned by obj_stat. We use that
epoch for setting the object version through the index suggestion
mechanism. This was broken by a recent change that switched from
reading the obj stats by (wrongly) calling directly to ioctx->stat()
to calling get_obj_state().

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocls_rgw: complete_op() only skip update if epoch is non zero
Yehuda Sadeh [Thu, 13 Sep 2012 21:42:06 +0000 (14:42 -0700)]
cls_rgw: complete_op() only skip update if epoch is non zero

An update shouldn't be skipped if epoch is zero. We'd see a zero
epoch if we tried to read an object and it didn't exist. That
could happen e.g., when a delete object operation failed to
call the complete earlier, and now we're recalling delete on
the (now non-existent object).
However, note that the zero epoch is racy. We may end up racing
with an object creation. This will be taken care of by a new
rados change that will set the returned object version even if
it didn't exist.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocls_rgw: update index stats based on correct category
Yehuda Sadeh [Thu, 13 Sep 2012 21:01:43 +0000 (14:01 -0700)]
cls_rgw: update index stats based on correct category

only refer to the on-disk category if the object existed.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: fix suggested object size
Yehuda Sadeh [Thu, 13 Sep 2012 00:11:54 +0000 (17:11 -0700)]
rgw: fix suggested object size

We can't just stat the head object, we need to go through
get_obj_state() to get obj attributes.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: set exists flag when suggesting existing bucket entry
Yehuda Sadeh [Wed, 12 Sep 2012 23:49:06 +0000 (16:49 -0700)]
rgw: set exists flag when suggesting existing bucket entry

We weren't setting the 'exists' flag on the bucket entry,
so we ended up not updating the index correctly.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocls_rgw: change scoping of suggested changes vars
Yehuda Sadeh [Wed, 12 Sep 2012 23:41:17 +0000 (16:41 -0700)]
cls_rgw: change scoping of suggested changes vars

Fixes: #3127
Bad variable scoping made it so that specific variables
weren't initialized between suggested changes iterations.
This specifically affected a case where in a specific
change we had an updated followed by a remove, and the
remove was on a non-existent key (e.g., was already
removed earlier). We ended up re-substracting the
object stats, as the entry wasn't reset between
the iterations (and we didn't read it because the
key didn't exist).

backport:argonaut
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agotest/rgw: add a test for index suggest
Yehuda Sadeh [Wed, 12 Sep 2012 23:34:45 +0000 (16:34 -0700)]
test/rgw: add a test for index suggest

test the bucket index suggest api

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge branch 'master' of https://github.com/ceph/ceph
John Wilkins [Tue, 18 Sep 2012 19:55:35 +0000 (12:55 -0700)]
Merge branch 'master' of https://github.com/ceph/ceph

12 years agocls_rgw: configurable tag timeout
Yehuda Sadeh [Wed, 12 Sep 2012 22:12:23 +0000 (15:12 -0700)]
cls_rgw: configurable tag timeout

we'll be using that for bucket index unitest

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agotest/rgw: add bucket index unitest
Yehuda Sadeh [Wed, 12 Sep 2012 21:48:04 +0000 (14:48 -0700)]
test/rgw: add bucket index unitest

Tests objects creation, removal, prepare, complete

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocpeh.spec.in: Don't package boto_tool.
Gary Lowell [Tue, 18 Sep 2012 19:43:36 +0000 (12:43 -0700)]
cpeh.spec.in:  Don't package boto_tool.

12 years agocls_rgw: client api for bucket index init
Yehuda Sadeh [Wed, 12 Sep 2012 21:47:11 +0000 (14:47 -0700)]
cls_rgw: client api for bucket index init

create a client api function for bucket index init.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocls_rgw: add client api calls for index suggest
Yehuda Sadeh [Wed, 12 Sep 2012 18:10:57 +0000 (11:10 -0700)]
cls_rgw: add client api calls for index suggest

This is needed for unitest creation.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agodoc/config-cluster/*: update recently added/changed config options
Sage Weil [Tue, 18 Sep 2012 19:20:30 +0000 (12:20 -0700)]
doc/config-cluster/*: update recently added/changed config options

Signed-off-by: Sage Weil <sage@inktank.com>
12 years ago:doc: Title change for clarity. Initial formatting cleanup.
John Wilkins [Tue, 18 Sep 2012 18:41:32 +0000 (11:41 -0700)]
:doc: Title change for clarity. Initial formatting cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'master' of https://github.com/ceph/ceph
John Wilkins [Tue, 18 Sep 2012 18:23:55 +0000 (11:23 -0700)]
Merge branch 'master' of https://github.com/ceph/ceph

12 years ago:doc: Removed old rec section.
John Wilkins [Tue, 18 Sep 2012 18:23:22 +0000 (11:23 -0700)]
:doc: Removed old rec section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodocs: add radosgw internals and usage testing section
Yehuda Sadeh [Tue, 18 Sep 2012 18:14:17 +0000 (11:14 -0700)]
docs: add radosgw internals and usage testing section

Document the current tests that are being done on the
radosgw usage feature.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years ago:doc: Notes to add data directory. Notes to address key with escape char.
John Wilkins [Tue, 18 Sep 2012 18:15:37 +0000 (11:15 -0700)]
:doc: Notes to add data directory. Notes to address key with escape char.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Added note to clarify use of host=shortname.
John Wilkins [Tue, 18 Sep 2012 18:14:54 +0000 (11:14 -0700)]
:doc: Added note to clarify use of host=shortname.

Fixes: #3155
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Rewrote architecture paper. Still needs some work.
John Wilkins [Tue, 18 Sep 2012 18:08:23 +0000 (11:08 -0700)]
:doc: Rewrote architecture paper. Still needs some work.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removing old control.rst. New one is in ceph/docs/cluster-ops.rst
John Wilkins [Tue, 18 Sep 2012 18:05:30 +0000 (11:05 -0700)]
:doc: Removing old control.rst. New one is in ceph/docs/cluster-ops.rst

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removing old init section.
John Wilkins [Tue, 18 Sep 2012 18:02:41 +0000 (11:02 -0700)]
:doc: Removing old init section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agorbd: only open the destination pool for import
Josh Durgin [Tue, 18 Sep 2012 16:37:44 +0000 (09:37 -0700)]
rbd: only open the destination pool for import

Otherwise importing into another pool when the default pool, rbd,
doesn't exist results in an error trying to open the rbd pool.

Reported-by: Sébastien Han <han.sebastien@gmail.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoceph.spec.in: Add new rados libraries, libcls_kvs.so and libcls_refcount.so.
Gary Lowell [Tue, 18 Sep 2012 05:21:15 +0000 (22:21 -0700)]
ceph.spec.in:  Add new rados libraries, libcls_kvs.so and libcls_refcount.so.

12 years agoosd: default journal size to 1 GB
Sage Weil [Wed, 12 Sep 2012 00:08:51 +0000 (17:08 -0700)]
osd: default journal size to 1 GB

The default is used to create or extend the journal when it is a file.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agofilejournal: do not enforce that bdev size >= osd journal size
Sage Weil [Wed, 12 Sep 2012 00:12:06 +0000 (17:12 -0700)]
filejournal: do not enforce that bdev size >= osd journal size

If the configure osd journal size is > the block device size, warn, but
do not generate an error and abort startup.  This makes it safe to have
a default 'osd journal size' value of, say, 1 GB without fear of breaking
existing clusters with smaller jouranl block devices.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Tommi Virtanen <tv@inktank.com>
12 years agoremove obsync
Sage Weil [Wed, 12 Sep 2012 22:50:10 +0000 (15:50 -0700)]
remove obsync

This now lives at http://github.com/ceph/obsync

Signed-off-by: Sage Weil <sage@inktank.com>
12 years ago:doc: Changed from bullet list to section titles.
John Wilkins [Mon, 17 Sep 2012 23:25:54 +0000 (16:25 -0700)]
:doc: Changed from bullet list to section titles.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Usage consistent with Tyler's notes.
John Wilkins [Mon, 17 Sep 2012 23:01:36 +0000 (16:01 -0700)]
:doc: Usage consistent with Tyler's notes.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Corrected a path.
John Wilkins [Mon, 17 Sep 2012 23:00:58 +0000 (16:00 -0700)]
:doc: Corrected a path.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Addresses DOCUMENTATION #3155
John Wilkins [Mon, 17 Sep 2012 22:59:45 +0000 (15:59 -0700)]
:doc: Addresses DOCUMENTATION #3155

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'wip-rbd-import'
Josh Durgin [Mon, 17 Sep 2012 15:27:03 +0000 (08:27 -0700)]
Merge branch 'wip-rbd-import'

12 years agorgw: update cache interface
Yehuda Sadeh [Sat, 15 Sep 2012 22:21:56 +0000 (15:21 -0700)]
rgw: update cache interface

RGWRados::delete_obj() was updated in commit
93218aeab7615ced131f0f1af49f6cda41b4a661, but we
failed to update the corresponding RGWCache api.
This commit fixes it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge branch 'wip-2923'
Yehuda Sadeh [Sat, 15 Sep 2012 22:17:08 +0000 (15:17 -0700)]
Merge branch 'wip-2923'

Conflicts:
src/rgw/rgw_admin.cc
src/rgw/rgw_log.cc
src/rgw/rgw_log.h
src/rgw/rgw_main.cc
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw-admin: add cluster info command
Yehuda Sadeh [Thu, 30 Aug 2012 19:46:02 +0000 (12:46 -0700)]
rgw-admin: add cluster info command

A new radosgw-admin command to dump cluster info

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: simplify create_pool
Yehuda Sadeh [Thu, 30 Aug 2012 18:31:41 +0000 (11:31 -0700)]
rgw: simplify create_pool

create_pool should only create pool. A pool is not a bucket,
so we don't need to attach any attrs to it. Also, no reason
to make it exclusive.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: store cluster params in a special object
Yehuda Sadeh [Wed, 29 Aug 2012 22:34:17 +0000 (15:34 -0700)]
rgw: store cluster params in a special object

We now have a cluster root pool that should hold the
cluster params. The cluster params are now read from
this object on startup, if object does not exist we
set its defaults and write it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge branch 'wip-rgw-refcount'
Yehuda Sadeh [Sat, 15 Sep 2012 20:02:54 +0000 (13:02 -0700)]
Merge branch 'wip-rgw-refcount'

12 years agorgw: document how refcount objclass works
Yehuda Sadeh [Sat, 15 Sep 2012 19:43:05 +0000 (12:43 -0700)]
rgw: document how refcount objclass works

Added some explanations in the client header.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agocls_refcount: add a unitest
Yehuda Sadeh [Wed, 5 Sep 2012 21:54:51 +0000 (14:54 -0700)]
cls_refcount: add a unitest

test cls_refcount functionality.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw_rados: adjustments for refcount objclass
Yehuda Sadeh [Wed, 5 Sep 2012 19:56:43 +0000 (12:56 -0700)]
rgw_rados: adjustments for refcount objclass

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: set atomic context for copy operation src and dest
Yehuda Sadeh [Fri, 31 Aug 2012 05:21:15 +0000 (22:21 -0700)]
rgw: set atomic context for copy operation src and dest

This is required so that we handle both src and dest atomically. We
also set the prefetch flag on the src object, so that we read the
first chunk along with its attrs.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: copy of objects using refcount
Yehuda Sadeh [Fri, 31 Aug 2012 00:12:55 +0000 (17:12 -0700)]
rgw: copy of objects using refcount

For objects with manifest that have a tail, we
copy only the head, and the manifest, and increasing
the reference count on the tail objects.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: use refcount put instead of obj delete where needed
Yehuda Sadeh [Thu, 30 Aug 2012 21:36:03 +0000 (14:36 -0700)]
rgw: use refcount put instead of obj delete where needed

Tie in new refcount objclass methods.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoqa: test args for rbd import
Josh Durgin [Sat, 15 Sep 2012 00:14:47 +0000 (17:14 -0700)]
qa: test args for rbd import

Make sure that --pool/--dest-pool and --image/--dest all work
interchangeably.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agorbd: make --pool/--image args easier to understand for import
Josh Durgin [Sat, 15 Sep 2012 00:13:57 +0000 (17:13 -0700)]
rbd: make --pool/--image args easier to understand for import

There's no need to set the default pool in set_pool_image_name - this
is done later, in a way that doesn't ignore --pool if --dest-pool
is not specified.

This means --pool and --image can be used with import, just like
the rest of the commands. Without this change, --dest and --dest-pool
had to be used, and --pool would be silently ignored for rbd import.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agodoc: fix indentation
Josh Durgin [Thu, 13 Sep 2012 23:51:54 +0000 (16:51 -0700)]
doc: fix indentation

Before this the list of steps was split into two lists
after the conf example.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoAdding RBD CLI test automation script, RbdLib and cephscrub.sh
tamil [Thu, 13 Sep 2012 20:54:23 +0000 (13:54 -0700)]
Adding RBD CLI test automation script, RbdLib and cephscrub.sh

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
12 years agotest/rados-api/aio.cc: use read operation for omap cmp test
Samuel Just [Wed, 12 Sep 2012 23:34:01 +0000 (16:34 -0700)]
test/rados-api/aio.cc: use read operation for omap cmp test

The error code field is not filled in on writes.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoosd/OSD.cc: Fix typo in OSD::heartbeat_check()
Yan, Zheng [Fri, 7 Sep 2012 05:49:27 +0000 (13:49 +0800)]
osd/OSD.cc: Fix typo in OSD::heartbeat_check()

The check 'p->second.last_tx > cutoff' should always be false
since last_tx is periodically updated by OSD::heartbeat()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoosd/ReplicatedPG: set truncate_seq when handling CEPH_OSD_OP_APPEND
Yan, Zheng [Tue, 11 Sep 2012 03:15:26 +0000 (11:15 +0800)]
osd/ReplicatedPG: set truncate_seq when handling CEPH_OSD_OP_APPEND

We need set truncate_seq when redirect the newop to CEPH_OSD_OP_WRITE,
otherwise the code handles CEPH_OSD_OP_WRITE may quietly drop the data.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMakefile: rename 'core' -> 'base', add a few things
Sage Weil [Thu, 6 Sep 2012 20:57:33 +0000 (13:57 -0700)]
Makefile: rename 'core' -> 'base', add a few things

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agolibrbd, cls_rbd: close snapshot creation race with old format
Josh Durgin [Mon, 30 Jul 2012 22:19:29 +0000 (15:19 -0700)]
librbd, cls_rbd: close snapshot creation race with old format

If two clients created a snapshot at the same time, the one with the
higher snapshot id might be created first, so the lower snapshot id
would be added to the snapshot context and the snaphot seq would be
set to the lower one.

Instead of allowing this to happen, return -ESTALE if the snapshot id
is lower than the currently stored snapshot sequence number. On the
client side, get a new id and retry if this error is encountered.

Backport: argonaut
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #23 from javacruft/master
Sage Weil [Wed, 12 Sep 2012 15:07:29 +0000 (08:07 -0700)]
Merge pull request #23 from javacruft/master

Refactor the way that dh_makeshlibs is called to be slightly more elegant

12 years agoRejig the way the shared libraries are processed so that manual postinst/postrm scrip... 23/head
James Page [Wed, 12 Sep 2012 09:40:01 +0000 (10:40 +0100)]
Rejig the way the shared libraries are processed so that manual postinst/postrm scripts are not required for lib* packages, ensuring that the .so's in the ceph package are not detected

12 years agoupstart: Give everything a stop on stanza.
Tommi Virtanen [Tue, 11 Sep 2012 23:31:57 +0000 (16:31 -0700)]
upstart: Give everything a stop on stanza.

These are all tasks, and expected to exit somewhat quickly,
but e.g. ceph-create-keys has a loop where it waits for mon
to reach quorum, so it might still be in that loop when the
machine is shut down.

12 years agoupstart: Start mds,mon,radosgw after a reboot.
Tommi Virtanen [Tue, 11 Sep 2012 23:28:41 +0000 (16:28 -0700)]
upstart: Start mds,mon,radosgw after a reboot.

They had no "start on" stanzas, so they didn't get started earlier.

12 years agoupstart: Use "ceph osd crush create-or-move".
Tommi Virtanen [Tue, 11 Sep 2012 17:07:04 +0000 (10:07 -0700)]
upstart: Use "ceph osd crush create-or-move".

Now the weight is only set when adding the OSD to the CRUSH map for
the first time. Once it's there, it's only moved, and the weight is
left untouched.

Change the ceph.conf option for the initial weight from
osd_crush_weight to osd_crush_initial_weight, to reflect this.

If you don't want new OSDs to store data automatically (to minimize
balancing and keep a human in the control loop), you can now
set osd_crush_initial_weight=0.

Closes: #3101
Signed-off-by: Tommi Virtanen <tv@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-crush'
Sage Weil [Tue, 11 Sep 2012 23:04:58 +0000 (16:04 -0700)]
Merge remote-tracking branch 'gh/wip-crush'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoupstart: Add ceph-create-keys.conf to package.
Tommi Virtanen [Tue, 11 Sep 2012 22:31:06 +0000 (15:31 -0700)]
upstart: Add ceph-create-keys.conf to package.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
12 years ago:doc: Fixed typo.
John Wilkins [Tue, 11 Sep 2012 22:24:12 +0000 (15:24 -0700)]
:doc: Fixed typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoobsync: if OrdinaryCallingFormat fails, try SubdomainCallingFormat
Sage Weil [Tue, 11 Sep 2012 21:50:53 +0000 (14:50 -0700)]
obsync: if OrdinaryCallingFormat fails, try SubdomainCallingFormat

This blindly tries the Subdomain calling format if the ordinary method
fails.  In particular, this works around buckets that present a
PermanentRedirect message.

See bug #3128.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Matthew Wodrich <matthew.wodrich@dreamhost.com>
12 years agoMerge remote-tracking branch 'upstream/next'
Samuel Just [Tue, 11 Sep 2012 21:06:51 +0000 (14:06 -0700)]
Merge remote-tracking branch 'upstream/next'

Conflicts:
src/osd/ReplicatedPG.cc

12 years agoReplicatedPG: do not start_recovery_op if we are already pushing
Samuel Just [Tue, 11 Sep 2012 18:05:40 +0000 (11:05 -0700)]
ReplicatedPG: do not start_recovery_op if we are already pushing

Should fix bug #2761.

If we are already pushing soid, recovery_ops will only be decremented once for
all current pushes, so only increment recovery_ops if we are not currently
pushing it.

This bug causes us to leak a recovery op and get stuck in backfill.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoosd: fill in user log entry last after snapdir tran
Sage Weil [Tue, 4 Sep 2012 22:25:20 +0000 (15:25 -0700)]
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>
12 years ago:doc: Added tunables to cruch-map.rst.
John Wilkins [Tue, 11 Sep 2012 20:05:07 +0000 (13:05 -0700)]
:doc: Added tunables to cruch-map.rst.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old pg tuning. New section was added.
John Wilkins [Tue, 11 Sep 2012 20:00:22 +0000 (13:00 -0700)]
:doc: Removed old pg tuning. New section was added.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Trimmed the old ops tree. Will remove when all porting verified.
John Wilkins [Tue, 11 Sep 2012 19:59:35 +0000 (12:59 -0700)]
:doc: Trimmed the old ops tree. Will remove when all porting verified.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Trimmed the tree for failures/troubleshooting. RGW remains.
John Wilkins [Tue, 11 Sep 2012 19:52:12 +0000 (12:52 -0700)]
:doc: Trimmed the tree for failures/troubleshooting. RGW remains.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: removed. RBD now has its own section.
John Wilkins [Tue, 11 Sep 2012 19:51:06 +0000 (12:51 -0700)]
:doc: removed. RBD now has its own section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agomon: adjust number of req args for loc
Sage Weil [Tue, 11 Sep 2012 18:39:40 +0000 (11:39 -0700)]
mon: adjust number of req args for loc

At least one loc key/value pair is required to do anything useful with
these commands.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: move loc map parsing into a helper
Sage Weil [Tue, 11 Sep 2012 18:35:20 +0000 (11:35 -0700)]
mon: move loc map parsing into a helper

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: constify loc map arguments
Sage Weil [Tue, 11 Sep 2012 18:08:51 +0000 (11:08 -0700)]
crush: constify loc map arguments

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: add const string& versions of accessors
Sage Weil [Tue, 11 Sep 2012 18:07:57 +0000 (11:07 -0700)]
crush: add const string& versions of accessors

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/control.rst: add 'osd crush create-or-move ...'
Sage Weil [Tue, 11 Sep 2012 16:43:37 +0000 (09:43 -0700)]
doc/control.rst: add 'osd crush create-or-move ...'

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc: make note of crush usage change
Sage Weil [Tue, 11 Sep 2012 15:57:05 +0000 (08:57 -0700)]
doc: make note of crush usage change

Even tho it is compatible.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: make redundant osd.NNN argument optional
Sage Weil [Tue, 11 Sep 2012 15:48:34 +0000 (08:48 -0700)]
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>
12 years agoceph tool: add 'osd crush create-or-move ...' to help
Sage Weil [Tue, 11 Sep 2012 18:35:45 +0000 (11:35 -0700)]
ceph tool: add 'osd crush create-or-move ...' to help

Signed-off-by: Sage Weil <sage@inktank.com>
12 years ago:doc: Deleting this. Wrote a new one, but will be revised a bit soon.
John Wilkins [Tue, 11 Sep 2012 18:26:19 +0000 (11:26 -0700)]
:doc: Deleting this. Wrote a new one, but will be revised a bit soon.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old ops pool section.
John Wilkins [Tue, 11 Sep 2012 18:19:47 +0000 (11:19 -0700)]
:doc: Removed old ops pool section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old authentication section.
John Wilkins [Tue, 11 Sep 2012 18:19:22 +0000 (11:19 -0700)]
:doc: Removed old authentication section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old resize OSD section.
John Wilkins [Tue, 11 Sep 2012 18:18:55 +0000 (11:18 -0700)]
:doc: Removed old resize OSD section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old mon resize section.
John Wilkins [Tue, 11 Sep 2012 18:15:17 +0000 (11:15 -0700)]
:doc: Removed old mon resize section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed from old ops doc. Still needs to be composed though.
John Wilkins [Tue, 11 Sep 2012 18:14:40 +0000 (11:14 -0700)]
:doc: Removed from old ops doc. Still needs to be composed though.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: New cluster ops section addresses the todo.
John Wilkins [Tue, 11 Sep 2012 18:13:53 +0000 (11:13 -0700)]
:doc: New cluster ops section addresses the todo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years ago:doc: Removed old OSD troubleshooting. New version to be updated shortly.
John Wilkins [Tue, 11 Sep 2012 18:13:17 +0000 (11:13 -0700)]
:doc: Removed old OSD troubleshooting. New version to be updated shortly.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>