Commit Graph

22396 Commits

Author SHA1 Message Date
John Wilkins
0a2a0c075c doc: config-cluser move to new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-14 14:57:51 -08:00
John Wilkins
5c302ebbd7 doc: Move of cluster ops for new IA.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-11-14 14:55:29 -08:00
Joao Eduardo Luis
8430210cc9 doc: add-or-rm-mons.rst: fix typo
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2012-11-14 10:06:31 +00:00
Gary Lowell
7926ef5393 Merge branch 'next'
Conflicts:
	configure.ac
	src/rgw/rgw_common.cc
2012-11-13 17:29:47 -08:00
Samuel Just
d395131c7f osd/: add config helper for min_size and update build_simple*
min_size should never be set to 0 on a pool.  config.h
now has a helper to determine the correct default value.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2012-11-13 17:09:26 -08:00
Sage Weil
d5bc66ac49 doc/release-notes: fix heading
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 17:11:34 -08:00
Sage Weil
74f7607afa doc: release-notes for v0.54
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 16:29:54 -08:00
Sage Weil
0d42e9762b doc: update crush weight ramping process
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 16:00:00 -08:00
Yehuda Sadeh
131d15a772 rgw: fix warning
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 15:43:48 -08:00
Sage Weil
97f65f6e42 Merge branch 'wip-min-size'
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-11-13 15:39:42 -08:00
Sage Weil
a0eb8919ef osd: default pool min_size to 0 (which gives us size-size/2)
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 15:16:56 -08:00
Sage Weil
1d00f3aa67 mon: default min_size to size-size/2 if min_size default is 0
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 15:12:33 -08:00
Sage Weil
9d979d767d osd: default min_size to size - size/2
size -> min_size:
 5 -> 3
 4 -> 2
 3 -> 2
 2 -> 1

Basically, default to tolerating minority down.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 15:12:33 -08:00
Sage Weil
735df024ad mon: helpful warning in 'health detail' output about incomplete pgs
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 15:12:33 -08:00
Sage Weil
1679a55662 osd: start_boot() after init()
The previous trigger for start_boot() was racy, depending on whether we
got our rotating keys quickly.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 15:12:20 -08:00
Dan Mick
65961ca23b vstart.sh: support -X by adding 'auth required = none' entries
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-11-13 15:12:16 -08:00
Sage Weil
6a8a59c5d0 Merge remote-tracking branch 'gh/wip-rgw-integration'
Conflicts:
	src/common/config_opts.h
2012-11-13 14:50:42 -08:00
Gary Lowell
60b84b095b v0.54 2012-11-13 13:18:07 -08:00
Yehuda Sadeh
5d27f3da65 rgw: compile with -Woverloaded-virtual
This will trigger a warning if RGWRados api changes while
RGWCache doesn't.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 13:06:22 -08:00
Yehuda Sadeh
1be99237d0 rgw: fix RGWCache api
RGWCache api diverted form RGWRados, crippling the cache.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 12:39:42 -08:00
Yehuda Sadeh
e0e33d2c99 rgw: fix RGWCache api
RGWCache api diverted form RGWRados, crippling the cache.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 12:39:15 -08:00
Sage Weil
9a38059afa osd: remove dead rotating key code from init
Ancient, dead.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 12:29:09 -08:00
Sage Weil
eee0982223 osd: defer boot until we have rotating keys
Make sure we have our rotating keys before we start booting.  This
ensures we can open connections with peers *before* we add ourselves to
the osdmap.  This behaviors marks instances of #3292, although it is
not clear whether it is responsible for the actual crash.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-11-13 12:28:56 -08:00
Samuel Just
b151597efa Merge branches 'wip_persist_missing' and 'wip_recovery_qos'
Reviewed-by: Sage Weil <sage@inktank.com>
2012-11-13 10:56:41 -08:00
Samuel Just
193e2ea532 PG: persist divergent_priors in ondisklog
Consider the following logs:

a) 10'10(5'7) foo
   12'11(4'3) bar

b) 10'10(5'7) foo
   13'11(4'4) baz

When the osd with a merges primary log b, bar is deleted and
added to the missing set with need=4'3 and have=0'0.  If
the osd then dies after deleting bar, but before recovering
bar, PG::read_state() on start up will fail to re-add bar
to the missing set, and bar will be incorrect on that osd.

Now, (4'3, bar) will be added to the divergent_priors mapping
to be scanned during read_state along with the log.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:56:10 -08:00
Samuel Just
fcbbebc3d8 PG::merge_old_entry: fix case for divergent prior_version
Previously, we asserted that a log entry with a divergent
prior_version must be a clone.  Consider the following
case:

6'11(6'2)  m foo
7'12(6'3) m bar
7'13(7'12) m bar

If this is merged with:

6'11(6'2)  m foo
8'12(6'4) m baz

we will hit the assert.

Merging a divergent entry with prior_version after current
tail, but not in the log implies that prior_version was a
divergent entry which we have already merged.  The missing
set and filestore collection must therefore have already
been adjusted.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:56:10 -08:00
Sage Weil
f299be00f7 PrioritizedQueue: use iterator to streamlink SubQueue::remove_by_class()
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 10:45:00 -08:00
Sage Weil
95cb6cf443 PrioritizedQueue: avoid double-lookup on create_queue()
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
57a62554d6 osd/: de-prioritize recovery ops relative to client ops
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
bd4707ad9a msg/: use PrioritizedQueue to handle DispatchQueue queueing
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
5d47db2d16 OSD: queue ops based on message priority
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
a62d778e06 OSD: use PrioritizedQueue for OpWQ
The OpWQ PriorityQueue replaces OSD::op_queue, PG::op_queue,
and PG::qlock.  The syncronization is now done as part of the
usual WorkQueue syncronization pattern.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
f02c75e743 WorkQueue: Add WorkQueueVal for passing params by val
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
25eb1fb9ac common: Add PriorititizedQueue
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
bbdae98115 Pipe: we don't queue DispatchQueue codes on an actual pipe
The dispatch queue event codes are now queued directly and
won't end up in a real Pipe.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
Samuel Just
d12911252b common: add RefCountedObj.cc with intrusive_ptr hooks
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-11-13 10:45:00 -08:00
caleb miles
1c20ea984d rgw_cache: change call signature to overwrite rgw_rados put_obj_meta()
Signed-off-by: caleb miles <caleb.miles@inktank.com>
2012-11-13 10:32:28 -08:00
Yehuda Sadeh
da0ea9f9fe rgw: unquote etag for if-match
Fixes: #3453
Passed ETag for copy/get request may be quoted.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 10:32:28 -08:00
Sylvain Munaut
096c8ac953 rgw: use thread safe version of gmtime
Use gmtime_r instead of gmtime.

Signed-off-by: Sylvain Munaut <s.munaut@whatever-company.com>
2012-11-13 10:32:27 -08:00
Yehuda Sadeh
cc06090f0b rgw: don't convert object mtime to UTC
Fixes: #3452
When we read object info, don't try to convert mtime to
UTC, it's already in UTC.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-13 10:32:27 -08:00
Noah Watkins
c4981b8128 java: remove redundant src.dir
Previous wip-fix-javadocs had an oversight, redefining src.dir.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-13 09:39:20 -08:00
Josh Durgin
efdb209b0b doc: reorder some openstack/rbd instructions
Move client creation to the section on setting up client auth, so you
don't skip it if you already have pools created.

Move CEPH_ARGS setting to the section on configuring OpenStack, since
it's a change for the OpenStack services, not purely ceph client
configuration.

A couple people were confused by the placement of these parts, and
they make more sense in these sections.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-11-13 08:14:18 -08:00
Sage Weil
32fb8eaf7f Merge branch 'wip-client-asok' 2012-11-12 17:01:30 -08:00
Noah Watkins
0b85e43c76 java: fix build.xml formatting
set noet ts=2 sw=2 sws=2

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-12 15:50:41 -08:00
Noah Watkins
8970e81afb java: fix javadoc builds
Don't build JavaDoc for tests, and fix the missing src.dir variable.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-11-12 15:50:35 -08:00
Sage Weil
a11940f56a osdc/ObjectCacher: only return ENOENT if ObjectSet is flagged
The fs client can't handle ENOENT from the cache, but librbd wants it.
Also, the fs client will send down multiple ObjectExtents per io, but that
is incompatible with the ENOENT behavior.

Indicate which behavior we want via the ObjectSet, and update librbd to
explicitly ask for it.  This fixes the fs client, which is currently
broken (it returns ENOENT on read).

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-12 15:44:54 -08:00
Sage Weil
16db00d5d1 client: unregister commands on shutdown
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-12 15:06:10 -08:00
Sage Weil
7d1974c540 client: fix null dentry crash on dump_cache
Dentries can be NULL!

Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-12 15:06:10 -08:00
Sage Weil
ad3063a4f8 client: dump mds session info
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-12 15:06:10 -08:00
Sage Weil
fc6b82f01d client: add dump_cache asok command
Signed-off-by: Sage Weil <sage@inktank.com>
2012-11-12 15:05:52 -08:00