]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Fri, 4 May 2012 01:50:42 +0000 (18:50 -0700)]
global_init: do not count threads before daemonize()
We were verifying that there was only 1 thread (the presumably main()) when
we call daemonize. However, with the new logging code, we stop a thread
right before the check, and /proc apparently updates asynchronously such
that our attempt to count running threads gives us a bad answer.
Just remove this kludgey check; we'll have to catch this class of bugs
the hard way.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Joao Eduardo Luis [Tue, 1 May 2012 18:55:30 +0000 (19:55 +0100)]
OpRequest: only show a small set of the oldest messages, instead of all.
Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
Yehuda Sadeh [Thu, 3 May 2012 19:50:23 +0000 (12:50 -0700)]
rgw: update cache interface for put_obj_meta
This fixes issue #2381.
The method interface was different than the one needed in order
to override the one in RGWRados.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Thu, 3 May 2012 19:26:17 +0000 (12:26 -0700)]
doc: fix some underscores
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 3 May 2012 19:16:55 +0000 (12:16 -0700)]
Merge branch 'wip-doc-rebase-2'
John Wilkins [Thu, 3 May 2012 19:14:26 +0000 (12:14 -0700)]
Fixed link to blog.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
John Wilkins [Thu, 3 May 2012 18:49:22 +0000 (11:49 -0700)]
Fixed another link to the blog.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
John Wilkins [Thu, 3 May 2012 18:42:50 +0000 (11:42 -0700)]
Fixed link.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
John Wilkins [Thu, 3 May 2012 18:31:37 +0000 (11:31 -0700)]
Clean up. Changed ceph.newdream.net to ceph.com.
Removed {ARCH} references.
Added link to Source.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Sage Weil [Thu, 3 May 2012 18:25:12 +0000 (11:25 -0700)]
doc: more fonts
Signed-off-by: Sage Weil <sage@newdream.net>
Ross Turk [Thu, 3 May 2012 18:02:51 +0000 (11:02 -0700)]
doc: new theme
Signed-off-by: Ross Turk <ross.turk@inktank.com>
Sage Weil [Thu, 3 May 2012 17:51:02 +0000 (10:51 -0700)]
doc/install/debian: simplify more
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 3 May 2012 17:45:08 +0000 (10:45 -0700)]
doc/install: reorg, simplify
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 3 May 2012 16:51:28 +0000 (09:51 -0700)]
doc: clarify path names for mkcephfs
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 3 May 2012 16:44:55 +0000 (09:44 -0700)]
doc: simplify quick start
Remove dup items
Signed-off-by: Sage Weil <sage@newdream.net>
Tommi Virtanen [Thu, 3 May 2012 17:15:21 +0000 (10:15 -0700)]
doc: Whitespace cleanup.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Tommi Virtanen [Thu, 3 May 2012 17:10:29 +0000 (10:10 -0700)]
doc: Rename to use dashes not underscores in URLs.
This makes the-separate-words in the url match as separate words in
searches, where this_way only matches an explicit "this_way" search.
http://www.mattcutts.com/blog/dashes-vs-underscores/
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Tommi Virtanen [Thu, 3 May 2012 17:02:29 +0000 (10:02 -0700)]
doc: Remove leading whitespace, that syntax means it's a definition list.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Thu, 3 May 2012 16:42:56 +0000 (09:42 -0700)]
Updated URLs for the new ceph.com site.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Yehuda Sadeh [Thu, 3 May 2012 00:33:43 +0000 (17:33 -0700)]
objecter: ping connections with lingering ops every tick()
Also, make sure that we initialize linger_op.session once
we have it.
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
John Wilkins [Thu, 3 May 2012 03:31:35 +0000 (20:31 -0700)]
Removed "Ceph Development Status" per Bryan
Modified title syntax per Tommi
Modified paragraph width to 80-chars per Dan
Moved "Build from Source" out of Install
Renamed create_cluster to config-cluster
Added config-ref with configuration reference tables
Added a toc ref for man/1/obsync per Dan
Removed redundant sections from Ops
Deleted "Why use Ceph" and "Introduction to Storage Clusters"
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Sage Weil [Wed, 2 May 2012 23:50:14 +0000 (16:50 -0700)]
Merge branch 'stable'
Conflicts:
src/common/config_opts.h
Sage Weil [Wed, 2 May 2012 23:49:06 +0000 (16:49 -0700)]
config: $cluster-whatever for admin_socket, log files
This is more consistent with /var/lib/ceph/$type/$cluster-$id.
Signed-off-by: Sage Weil <sage@newdream.net>
Tommi Virtanen [Wed, 2 May 2012 22:50:36 +0000 (15:50 -0700)]
config: Admin socket path had literal "name" in it instead of $name.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Tommi Virtanen [Wed, 2 May 2012 22:50:36 +0000 (15:50 -0700)]
config: Admin socket path had literal "name" in it instead of $name.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Sage Weil [Wed, 2 May 2012 22:32:17 +0000 (15:32 -0700)]
mon: make 'osd map <poolname> <objectname>' return pg and osd mapping
This keeps coming up and is annoying to do manually.
Fixes: #2141
Signed-off-by: Sage Weil <sage@newdream.net>
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
Josh Durgin [Wed, 2 May 2012 15:03:37 +0000 (08:03 -0700)]
rbd.py: add new error for deleting an image with snapshots
Forgot to update the python bindings in
88dda3be5aed38c8f587af9b27cb54a0fcca7530
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Sage Weil [Wed, 2 May 2012 20:32:05 +0000 (13:32 -0700)]
config: no -C shorthand for --cluster
ceph-authtool uses it!
Fixes: #2376
Signed-off-by: Sage Weil <sage@newdream.net>
John Wilkins [Wed, 2 May 2012 02:36:34 +0000 (19:36 -0700)]
Edits.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 2 May 2012 02:20:34 +0000 (19:20 -0700)]
Corrections.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Tue, 1 May 2012 02:03:53 +0000 (19:03 -0700)]
Significant updates to introduction, getting packages, building from source, installing packages, and creating a cluster.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Sage Weil [Thu, 26 Apr 2012 19:07:11 +0000 (12:07 -0700)]
doc: document NOIN, NOOUT, NOUP, NODOWN flags and flapping
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 25 Apr 2012 21:52:34 +0000 (14:52 -0700)]
Removed this. As part of restructuring of install to include admin host.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 25 Apr 2012 21:50:15 +0000 (14:50 -0700)]
Minor edits. Still WIP.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 25 Apr 2012 21:46:51 +0000 (14:46 -0700)]
The new files contain S3 APIs and a build from source doc.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Thu, 12 Apr 2012 18:35:45 +0000 (11:35 -0700)]
Minor cleanup.
Signed off by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Thu, 12 Apr 2012 00:13:21 +0000 (17:13 -0700)]
Added a new landing page graphic, and made some minor edits on the landing page.
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 11 Apr 2012 18:26:36 +0000 (11:26 -0700)]
Removed some files for reorg.
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 11 Apr 2012 18:22:59 +0000 (11:22 -0700)]
Added a plug for commercial support. ;)
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 11 Apr 2012 18:21:43 +0000 (11:21 -0700)]
Building out information architecture. Modified getting involved, why use ceph, etc.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Tue, 10 Apr 2012 19:53:15 +0000 (12:53 -0700)]
Remove reference to Introduction to RADOS OSDs
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Tue, 10 Apr 2012 19:46:07 +0000 (12:46 -0700)]
Added introduction to clustered storage and deleted older files that have been moved.
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Tue, 10 Apr 2012 17:32:22 +0000 (10:32 -0700)]
Restructuring documentation.
Submitted by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
John Wilkins [Wed, 14 Mar 2012 18:58:27 +0000 (11:58 -0700)]
Initial cut of introduction, getting started, and installing. More to do on installation. RADOS gateway to follow.
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Dan Mick [Wed, 2 May 2012 18:46:32 +0000 (11:46 -0700)]
Put change to rbd manpage in .rst instead, update man/ from output
John Wilkins [Tue, 13 Mar 2012 23:48:45 +0000 (16:48 -0700)]
doc: move documentation build instructions to doc/dev section
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Dan Mick [Tue, 1 May 2012 22:33:19 +0000 (15:33 -0700)]
Treat rename across pools as an error
Fixes: #2370
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
Greg Farnum [Tue, 1 May 2012 23:40:46 +0000 (16:40 -0700)]
doc: add warning about multiple monitors on one machine.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Yehuda Sadeh [Tue, 1 May 2012 23:47:32 +0000 (16:47 -0700)]
rgw: normalize bucket/obj before updating cache
Fixes bug #2369. The problem was that sometimes we send the
notification with the un-normalized bucket/obj pair. We
should make sure that we use the caonical name before doing
any cache update.
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Samuel Just [Tue, 1 May 2012 00:31:09 +0000 (17:31 -0700)]
PG: Add probe set to HB peers during GetInfo
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Mon, 30 Apr 2012 22:09:23 +0000 (15:09 -0700)]
PG: check_new_interval now handles adding new maps to past intervals
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Tue, 1 May 2012 19:37:20 +0000 (12:37 -0700)]
filestore: allow flusher+sync_flush enable/disable via injectargs
This only affects the decision to queue or do things inline, so it is safe
to change while the filestore is up and running.
Also adjust the #ifdef so that there we share a single path through the
code when sync_file_range() is missing.
Fixes: #2368
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 1 May 2012 18:30:53 +0000 (11:30 -0700)]
filestore: fix op_queue_{len,bytes} instrumentation
(re)set these in logger when they actually change.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 1 May 2012 17:49:36 +0000 (10:49 -0700)]
Merge branch 'wip-throttle'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
Sage Weil [Tue, 1 May 2012 17:47:05 +0000 (10:47 -0700)]
throttle: count get_or_fail success/failure explicitly
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 1 May 2012 17:39:09 +0000 (10:39 -0700)]
osd: pg creation calc_priors_during() should count primary as up
If only want to include down osds if *all* of the prior acting osds are
down. If osd->whoami is one of them, then we're okay.
For example, if osd.13 is down, then the below should be satisfied that
osd.14 (osd->whoami) is alive:
2012-04-27 10:46:38.746681
7f5258a63700 15 osd.14 27 calc_priors_during 6.5 [9,25)
2012-04-27 10:46:38.746688
7f5258a63700 20 osd.14 27 6.5 in epoch 9 was [13,14]
2012-04-27 10:46:38.746695
7f5258a63700 20 osd.14 27 6.5 in epoch 10 was [13,14]
2012-04-27 10:46:38.746701
7f5258a63700 20 osd.14 27 6.5 in epoch 11 was [13,14]
2012-04-27 10:46:38.746709
7f5258a63700 20 osd.14 27 6.5 in epoch 12 was [13,14]
2012-04-27 10:46:38.746715
7f5258a63700 20 osd.14 27 6.5 in epoch 13 was [13,14]
2012-04-27 10:46:38.746722
7f5258a63700 20 osd.14 27 6.5 in epoch 14 was [13,14]
2012-04-27 10:46:38.746729
7f5258a63700 20 osd.14 27 6.5 in epoch 15 was [14]
2012-04-27 10:46:38.746735
7f5258a63700 20 osd.14 27 6.5 in epoch 16 was [14]
2012-04-27 10:46:38.746742
7f5258a63700 20 osd.14 27 6.5 in epoch 17 was [14]
2012-04-27 10:46:38.746748
7f5258a63700 20 osd.14 27 6.5 in epoch 18 was [13,14]
2012-04-27 10:46:38.746755
7f5258a63700 20 osd.14 27 6.5 in epoch 19 was [13,14]
2012-04-27 10:46:38.746762
7f5258a63700 20 osd.14 27 6.5 in epoch 20 was [13,14]
2012-04-27 10:46:38.746768
7f5258a63700 20 osd.14 27 6.5 in epoch 21 was [13,14]
2012-04-27 10:46:38.746775
7f5258a63700 20 osd.14 27 6.5 in epoch 22 was [14]
2012-04-27 10:46:38.746781
7f5258a63700 20 osd.14 27 6.5 in epoch 23 was [14]
2012-04-27 10:46:38.746788
7f5258a63700 20 osd.14 27 6.5 in epoch 24 was [14]
2012-04-27 10:46:38.746790
7f5258a63700 10 osd.14 27 calc_priors_during 6.5 [9,25) = 13
In that case, it wasn't, and the pg creation was blocked.
Fixes: #2355
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 1 May 2012 16:10:52 +0000 (09:10 -0700)]
throttle: note current value and max in perfcounters
This exposes a snapshot of the current Throttle value and limit.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 1 May 2012 02:16:28 +0000 (19:16 -0700)]
.gitignore: ceph-kdump-copy
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Tue, 1 May 2012 00:27:47 +0000 (17:27 -0700)]
Merge remote-tracking branch 'gh/wip-ceph-kdump-copy'
Greg Farnum [Wed, 25 Apr 2012 20:07:42 +0000 (13:07 -0700)]
osd: add is_unmanaged_snaps_mode() to pg_pool_t; use more consistently
Create an is_unmanaged_snaps_mode() function to parallel
is_pool_snaps_mode(), and replace all the checks directly referencing
removed_snaps or snaps with calls to these functions.
Fixes #2345.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Greg Farnum [Thu, 26 Apr 2012 01:17:53 +0000 (18:17 -0700)]
pick_address: don't bother checking struct ifaddrs which have a null ifa_addr
I assume that's the localhost interface or similar.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Sage Weil [Tue, 1 May 2012 00:22:52 +0000 (17:22 -0700)]
Merge remote-tracking branch 'gh/wip-2352'
Reviewed-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 30 Apr 2012 23:33:08 +0000 (16:33 -0700)]
msgr: include msgr name in dispatch_throttler name
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 30 Apr 2012 23:31:21 +0000 (16:31 -0700)]
msgr: name messengers
Give each Messenger a logical name describing its role. For instance, the
OSD will have client, cluster, and heartbeat messengers.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 30 Apr 2012 23:25:46 +0000 (16:25 -0700)]
throttle: report stats via perfcounter
Fixes: #2358
Signed-off-by: Sage Weil <sage@newdream.net>
Greg Farnum [Mon, 30 Apr 2012 22:06:17 +0000 (15:06 -0700)]
global_init: don't fail out if there is no default config.
There are plenty of scenarios where the user doesn't need a config file.
Instead, just print a warning and let things move on.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Greg Farnum [Mon, 30 Apr 2012 21:10:35 +0000 (14:10 -0700)]
global: fix incorrect CINIT flag.
There is nobody responding to CLOSE_STDERR, but this block sure looks
like it should be doing so. Fix that!
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Sage Weil [Mon, 30 Apr 2012 17:42:39 +0000 (10:42 -0700)]
throttle: feed cct, name, and add logging
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
Sage Weil [Mon, 30 Apr 2012 20:54:29 +0000 (13:54 -0700)]
Merge tag 'v0.46'
v0.46
Sage Weil [Mon, 30 Apr 2012 20:36:37 +0000 (13:36 -0700)]
osdmap: do no dereference NULL entity_addr_t pointer in addr accessors
These may be NULL if we expand the addr vectors but haven't ever stored an
address yet. Check for NULL and return a reference to a blank
entity_addr_t as needed.
Signed-off-by: Sage Weil <sage@newdream.net>
Samuel Just [Mon, 30 Apr 2012 17:58:32 +0000 (10:58 -0700)]
OSD: add different config options for map bl caches
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Mon, 30 Apr 2012 18:10:58 +0000 (11:10 -0700)]
mon: fix nion -> noin typo
Thanks Greg!
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 30 Apr 2012 18:12:26 +0000 (11:12 -0700)]
Merge branch 'wip-pi'
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Mon, 30 Apr 2012 04:21:11 +0000 (21:21 -0700)]
v0.46
Josh Durgin [Fri, 27 Apr 2012 18:20:59 +0000 (11:20 -0700)]
librbd: use unique error code for image removal failures
This allows the rbd tool to provide a useful error message, instead of
compounding more possible causes into one error code.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Sage Weil [Mon, 30 Apr 2012 16:48:27 +0000 (09:48 -0700)]
run_xfstests.sh: drop #62
Until #2359 is resolved.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Sun, 29 Apr 2012 17:10:41 +0000 (10:10 -0700)]
osdmap: fix identify_osd() and find_osd_on_ip()
In
313c1566d3b649ef81fcdc722678d77dccfa888f we switched to using the
get_addr() accessor methods, which assert that the osd exists. Check that
before calling.
Fixes: #2361
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Sun, 29 Apr 2012 15:17:06 +0000 (08:17 -0700)]
osd: keep pgs locked during handle_osd_map dance
Currently we drop and retake locks during handle_osd_map calls to
advance_map and activate_map. Instead, take them all once, and hold them.
This avoids leaving dirty in-core state in the PG without the lock held.
This will clearly go away as soon as the map threading stuff is redone.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 16:00:09 +0000 (09:00 -0700)]
mon: drop obsolete osd/PG.h #includes
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 15:11:06 +0000 (08:11 -0700)]
osd: set dirty flags on rewind_divergent_log
Make sure we record any rewind_divergent_log. In the activate case, this
will happen anyway, but mark it dirty here for correctness/completeness.
The merge_log case might be a bug.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 15:03:12 +0000 (08:03 -0700)]
osd: use dirty flags in activate(), merge_log()
These are all called from within the state machine, so we can simply set
the dirty flags.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 14:59:44 +0000 (07:59 -0700)]
osd: fix nested transaction in all_activated_and_committed()
all_activated_and_committed() is called from _activate_committed(), called
from a objectstore completion, and also from the state machine, which is
part of a larger transaction.
Instead, set dirty_info, and build/apply a transaction in the caller
(the completion) as needed. Fixes part of #2360.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 14:57:10 +0000 (07:57 -0700)]
osd: use PG::write_if_dirty() helper
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 05:32:08 +0000 (22:32 -0700)]
osd: do not merge history on query
We shouldn't modify the local notion of the history without recording it to
disk. And we (probably) also don't need to do that at all on query.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 05:31:23 +0000 (22:31 -0700)]
osd: dirty_info if history.merge updated anything
In proc_replica_info and proc_primary_info, we may or may not update
the pg_info_t. If we do, set dirty_info, so that it will be recorded.
Same goes for when the primary pushes out updated stats to us.
Also, do not write a purged_snaps() update directory; rely on the caller
to write out dirty info.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 05:17:06 +0000 (22:17 -0700)]
osd: write dirty info on handle info, notify, log
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 03:58:29 +0000 (20:58 -0700)]
osd: skip scrub scheduling if we aren't up
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 03:57:02 +0000 (20:57 -0700)]
osd: fix dirty_info check for advance/activate paths
Previously we would check and write dirty_info *without the pg lock* after
doing the advance and activate map calls. This was unlikely to race with
anything because the queues were drained, but definitely not right.
Instead, do the write in activate_map, or explicitly if activate_map is
not called (so that we record our progress after handling maps when we are
not up).
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 29 Apr 2012 01:18:41 +0000 (18:18 -0700)]
Merge branch 'next'
Sage Weil [Sun, 29 Apr 2012 01:12:20 +0000 (18:12 -0700)]
run_seed_to.sh: clean out merge cruft
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sun, 22 Apr 2012 21:35:39 +0000 (14:35 -0700)]
log: do not set on_exit() callback for libraries
Set this up in either global_init() or common_init_finish(), both opportune
times that occur after config parsing has happened and the user has the
option to modify this behavior. The exception would be libraries like
librados, which can't use rados_conf_* to enable this. Arguably flush
functionality should be exposed through the librados API directly, instead
of futzing with on_exit().
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 23:25:31 +0000 (16:25 -0700)]
Merge remote branch 'gh/wip-filestore-misc'
Conflicts:
src/test/filestore/run_seed_to.sh
Sage Weil [Sat, 28 Apr 2012 22:53:35 +0000 (15:53 -0700)]
Merge remote branch 'gh/wip-2353'
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 22:49:40 +0000 (15:49 -0700)]
osd: always share past_intervals
Share past intervals when starting up new replicas. This can happen via
an MOSDPGInfo or an MOSDPGLog message.
Fix up get_or_create_pg() so the past_intervals arg is required (and a ref,
like the other args). Fix doxygen comment.
Now the only time generate_past_intervals() should do any work is when
upgrading old clusters, during pg creation, and (possibly) during pg
split (when that is fully implemented).
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 22:25:20 +0000 (15:25 -0700)]
Merge branch 'wip-osdmap'
Conflicts:
src/mon/PGMonitor.cc
src/osd/OSDMap.h
Sage Weil [Sat, 28 Apr 2012 21:52:56 +0000 (14:52 -0700)]
fix file_layout.sh layouts test
preferred_osd is not gone.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 21:48:51 +0000 (14:48 -0700)]
Merge branch 'wip-mon'
Reviewed-by: Gregory Farnum <gregory.farnum@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 21:48:26 +0000 (14:48 -0700)]
mon: 'osd [un]set noin'
Missed this one.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 28 Apr 2012 21:47:53 +0000 (14:47 -0700)]
Merge branch 'next'
Sage Weil [Sat, 28 Apr 2012 14:37:49 +0000 (07:37 -0700)]
osd: set dirty_info in generate_past_intervals
This ensures that we save our work.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>