]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoMerge remote-tracking branch 'gh/testing' into next
Sage Weil [Tue, 18 Dec 2012 00:51:20 +0000 (16:51 -0800)]
Merge remote-tracking branch 'gh/testing' into next

12 years agoRevert "objecter: don't use new tid when retrying notifies"
Sage Weil [Tue, 18 Dec 2012 00:29:19 +0000 (16:29 -0800)]
Revert "objecter: don't use new tid when retrying notifies"

This reverts commit c3107009f66bc06b5e14c465142e14120f9a4412.

This appears to be causing problems in the objecter by corrupting
the stack.  Until that is resolved, let's revert.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: OSDMonitor: add option 'mon_max_pool_pg_num' and limit 'pg_num' accordingly
Joao Eduardo Luis [Mon, 17 Dec 2012 18:58:16 +0000 (18:58 +0000)]
mon: OSDMonitor: add option 'mon_max_pool_pg_num' and limit 'pg_num' accordingly

Instead of having a hardcoded default, use a configurable one. It is
limited to 65536 until future testing guarantees there is no side-effects
of increasing it past this value, but by being adjustable the user still
has the freedom to specify whatever maximum value he wants.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoosdc/Objecter: prevent pool dne check from invalidating scan_requests iterator
Sage Weil [Sun, 16 Dec 2012 01:45:25 +0000 (17:45 -0800)]
osdc/Objecter: prevent pool dne check from invalidating scan_requests iterator

We iterate over ops and, if the pool dne and other conditions are true,
we will immediately return ENOENT and cancel an op.  Increment the
iterator at the top of the loop to avoid invalidating it.

We also need to switch to a map<>, because hash_map<> mutations may
invalidate any/all iterators.

Fixes: #3613
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoqa: add a workunit for fsync-tester
Greg Farnum [Fri, 14 Dec 2012 22:34:35 +0000 (14:34 -0800)]
qa: add a workunit for fsync-tester

It turns out that our suites don't exercise fsync, at least not very much
(I couldn't find it in all the places I looked for it). This tester
was written by Ted T'so and updated by Chris Mason; I just made it
work on a smaller dataset (256MB) because 8GB against a small cluster takes
more time than we want to wait.

Signed-off-by: Greg Farnum <greg@inktank.com>
12 years agotest: remove underscores from cephfs test names
Noah Watkins [Wed, 28 Nov 2012 19:49:53 +0000 (11:49 -0800)]
test: remove underscores from cephfs test names

Google Test documentation strongly suggests avoiding underscores from
unit test names to avoid accidental conflicts with their macro naming
scheme.

http://code.google.com/p/googletest/wiki/FAQ#Why_should_not_test_case_names_and_test_names_contain_underscore

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
12 years agoMerge branch 'wip_watch' into next
Sage Weil [Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)]
Merge branch 'wip_watch' into next

12 years agolockdep: Decrease lockdep backtrace skip by 1
Sam Lang [Fri, 14 Dec 2012 03:22:37 +0000 (17:22 -1000)]
lockdep:  Decrease lockdep backtrace skip by 1

Skipping the top 4 (it starts at 0) calls in the
backtrace actually skips the call that does the lock.
Skip 3 instead.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
12 years agomkcephfs: fix == -> =
Sage Weil [Fri, 14 Dec 2012 22:16:31 +0000 (14:16 -0800)]
mkcephfs: fix == -> =

Another bashism.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomap-unmap.sh: use udevadm settle for synchronization
Alex Elder [Fri, 14 Dec 2012 21:58:39 +0000 (15:58 -0600)]
map-unmap.sh: use udevadm settle for synchronization

This script was heuristically using short sleep commands in order to
give udev activity time to complete.

There's a command "udevadm settle" which actually looks at the udev
queue and waits until its processing is done.  Much, much better.

This rearranges the get_id function a bit too, breaking it into one
function that gets the id and another that loops back and tries
again after a short delay in the event the get_id fails.

Signed-off-by: Alex Elder <elder@inktank.com>
12 years agoMerge branch 'wip-upstart' into next
Sage Weil [Fri, 14 Dec 2012 21:51:19 +0000 (13:51 -0800)]
Merge branch 'wip-upstart' into next

Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoceph-disk-activate: mark dir as upstart-managed
Sage Weil [Fri, 14 Dec 2012 21:49:14 +0000 (13:49 -0800)]
ceph-disk-activate: mark dir as upstart-managed

Mark the directory so that upstart will manage the daemon.  Eventually,
this should be generalized to allow ceph-disk-* usage with other init
systems.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoupstart: make starter jobs consistent
Sage Weil [Fri, 14 Dec 2012 21:40:58 +0000 (13:40 -0800)]
upstart: make starter jobs consistent

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoupstart: only start when 'upstart' file exists in daemon dir
Sage Weil [Fri, 14 Dec 2012 21:40:25 +0000 (13:40 -0800)]
upstart: only start when 'upstart' file exists in daemon dir

We need to distinguish between daemons managed by upstart and sysvinit
(and, eventually, systemd).  Only start daemons when 'upstart' is present.

Note that sysvinit will only start daemons when the 'host = ...' line is
in ceph.conf, so there is a similar "opt-in".

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoReplicatedPG: use default priority for Backfill messages
Samuel Just [Fri, 14 Dec 2012 20:46:43 +0000 (12:46 -0800)]
ReplicatedPG: use default priority for Backfill messages

Backfill messages modify the stats on the replica and therefore
must be sent with the same priority as sub_op_modify to ensure
ordering.  Using recovery_op_priority caused the following
sequence:

1) Primary(1) sends MOSDPGBackfill FINISH with updated stats (v1)
2) Primary(1) sends SubOp modify for new client op with stats (v2)
3) Replica(2) receives SubOp with stats (v2)
4) Replica(2) receives MOSDPGBackfill FINISH with stats (v1)
5) Replica(2) responds and Primary(1) resets pgtemp making
    Replica(2) Primary(2)
6) PG stats on Primary(2) several ops old.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoReplicatedPG: do not use priority from client op
Samuel Just [Fri, 14 Dec 2012 20:43:08 +0000 (12:43 -0800)]
ReplicatedPG: do not use priority from client op

There are internal ordering requirements which may be sensitive
to assigned priority.  We don't want a mix of priorities from
old clients with priorities from new clients causing trouble.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'wip-3610' into next
Sam Lang [Fri, 14 Dec 2012 19:00:24 +0000 (09:00 -1000)]
Merge branch 'wip-3610' into next

12 years agoFix comment in sample.ceph.conf
Greg Farnum [Fri, 14 Dec 2012 17:53:30 +0000 (09:53 -0800)]
Fix comment in sample.ceph.conf

Signed-off-by: Greg Farnum <greg@inktank.com>
12 years agoclient: Add config option to inject sleep for tick
Sam Lang [Fri, 14 Dec 2012 03:23:27 +0000 (17:23 -1000)]
client: Add config option to inject sleep for tick

Testing the tick delay with a fork/suspend is causing
corruption in the lockdep code.  This approach uses
a config option to sleep the tick thread for a number
of seconds, avoiding the entire fork/suspend mess.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
12 years agorbd.py: check for new librbd methods before use
Josh Durgin [Tue, 11 Dec 2012 06:34:05 +0000 (22:34 -0800)]
rbd.py: check for new librbd methods before use

This way attempting to use format 2 images works when you upgrade the
python bindings before librbd, and attempting to use functions
that librbd does not have results in more understandable errors.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoosd: up != acting okay on mkpg
Sage Weil [Fri, 14 Dec 2012 00:26:43 +0000 (16:26 -0800)]
osd: up != acting okay on mkpg

This can happen when:

 - mon sends create pg
 - it gets created
 - osd remaps the pg to a different osd
     but osd does not update pg status to the mon
 - mkpg resent to the new osd

or something along those lines.  It seems unusual, but in the end who
really cares why the mon doesn't know about the pg creation yet.

Note that this check was added in the initial commit where acting/up was
added; there is no specific condition of concern we are protecting against.

Instead, ignore the message.  We'll get a query soon anwyay.

This 'fixes' #3614.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agomon: OSDMonitor: don't allow creation of pools with > 65535 pgs
Joao Eduardo Luis [Thu, 13 Dec 2012 23:34:23 +0000 (23:34 +0000)]
mon: OSDMonitor: don't allow creation of pools with > 65535 pgs

There are some limitations to the number of possible pg's per pool, and
by allowing the 'osd pool create' command to succeed, we were making room
to some anomalous behavior.

Fixes: #3617
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agorbd: handle images disappearing while in ls -l
Dan Mick [Thu, 13 Dec 2012 22:06:17 +0000 (14:06 -0800)]
rbd: handle images disappearing while in ls -l

rbd.list() returns a list of names, but nothing stops them from
going away before rbd.open(); check for ENOENT and ignore if that
happens; warn on other errors

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoOSD: put connection in disconnect_session_watches as well as the session
Samuel Just [Thu, 13 Dec 2012 18:52:28 +0000 (10:52 -0800)]
OSD: put connection in disconnect_session_watches as well as the session

obc->watchers now has a ref to the connection as well.  This piece of
disconnect_session_watchers essentially parallels remove_watcher and
should generally do the same thing.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: disconnect_session_watches obc might not be valid after we relock
Samuel Just [Thu, 13 Dec 2012 18:50:52 +0000 (10:50 -0800)]
OSD: disconnect_session_watches obc might not be valid after we relock

If disconnect_session_watches races with watch removal, the session
might no longer have a valid obc ref.  In that case, move on to
the next obc.

Note, there is no danger of any obcs being *added* to the session
since the session/connection at this point is dead.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoclarify/correct some of sample.ceph.conf
Greg Farnum [Tue, 11 Dec 2012 23:13:44 +0000 (15:13 -0800)]
clarify/correct some of sample.ceph.conf

Signed-off-by: Greg Farnum <greg@inktank.com>
12 years agoMerge remote branch 'origin/next'
Josh Durgin [Thu, 13 Dec 2012 16:30:22 +0000 (08:30 -0800)]
Merge remote branch 'origin/next'

12 years agoqa: echo commands run by rbd map-unmap workunit
Josh Durgin [Thu, 13 Dec 2012 16:29:10 +0000 (08:29 -0800)]
qa: echo commands run by rbd map-unmap workunit

It's hard to figure out what failed without this.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoauth: guard decode_decrypt with try block
Sage Weil [Thu, 13 Dec 2012 06:01:03 +0000 (22:01 -0800)]
auth: guard decode_decrypt with try block

This will catch buffer decoding errors (maybe the block is empty) and
return an error string.

May fix (or possibly paper over) #3459.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agomount.fuse.ceph: strip out noauto option
Sage Weil [Thu, 13 Dec 2012 05:14:13 +0000 (21:14 -0800)]
mount.fuse.ceph: strip out noauto option

mount -a uses this, but also passes it to mount.fuse.ceph, and libceph
complains:

fuse: unknown option `noauto'

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomount.fuse.ceph: add ceph-fuse mount helper
Sage Weil [Wed, 12 Dec 2012 16:01:49 +0000 (08:01 -0800)]
mount.fuse.ceph: add ceph-fuse mount helper

Signed-off-by: Sage Weil <sage@inktank.com>
12 years ago/etc/init.d/ceph: fs_type assignment syntax error
Dan Mick [Thu, 13 Dec 2012 03:38:35 +0000 (19:38 -0800)]
/etc/init.d/ceph: fs_type assignment syntax error

This handles the remainder of 3581; it's a lot like the problem in
mkcephfs, but it isn't mkcephfs.

Fixes: #3581
Signed-off-by: Dan Mick <dan.mick@inktank.com>
12 years agofilestore: Don't keep checking for syncfs if found
Sam Lang [Thu, 13 Dec 2012 00:28:12 +0000 (14:28 -1000)]
filestore: Don't keep checking for syncfs if found

Valgrind outputs a warning for unrecognized system calls,
and does so for the syscall(__SYS_syncfs,...) and
syscall(__NR_syncfs, ...) calls.  This patch avoids making
those calls (and the warning, when run in valgrind) if the
syncfs libc call is available.

INFO:teuthology.task.ceph.osd.1.err:--10568-- WARNING: unhandled syscall: 306
INFO:teuthology.task.ceph.osd.1.err:--10568-- You may be able to write your own handler.
INFO:teuthology.task.ceph.osd.1.err:--10568-- Read the file README_MISSING_SYSCALL_OR_IOCTL.
INFO:teuthology.task.ceph.osd.1.err:--10568-- Nevertheless we consider this a bug.  Please report
INFO:teuthology.task.ceph.osd.1.err:--10568-- it at http://valgrind.org/support/bug_reports.html.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
12 years agov0.55.1 v0.55.1
Gary Lowell [Thu, 13 Dec 2012 00:24:34 +0000 (16:24 -0800)]
v0.55.1

12 years agoOSD: pg might be removed during disconnect_session_watches
Samuel Just [Wed, 12 Dec 2012 23:09:25 +0000 (15:09 -0800)]
OSD: pg might be removed during disconnect_session_watches

We don't hold the osd_lock between the session->watches traversal
and the obc checks.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG,ReplicatedPG: handle_watch_timeout must not write during scrub/degraded
Samuel Just [Wed, 12 Dec 2012 06:22:31 +0000 (22:22 -0800)]
PG,ReplicatedPG: handle_watch_timeout must not write during scrub/degraded

Currently, handle_watch_timeout will gladly write to an object while
that object is degraded or is being scrubbed.  Now, we queue a
callback to be called on scrub completion or finish_degraded_object
to recall handle_watch_timeout.  The callback mechanism assumes that
the registered callbacks assume they will be called with the pg
lock -- and no other locks -- already held.

The callback will release the obc and pg refs unconditionally.  Thus,
we need to replace the unconnected_watchers pointer with NULL to
ensure that unregister_unconnected_watcher fails to cancel the
event and does not release the resources a second time.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG:, remove_notify, put session after con
Samuel Just [Wed, 12 Dec 2012 22:51:24 +0000 (14:51 -0800)]
ReplicatedPG:, remove_notify, put session after con

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG: only put if we cancel evt in unregister_unconnected_watcher
Samuel Just [Wed, 12 Dec 2012 22:26:59 +0000 (14:26 -0800)]
ReplicatedPG: only put if we cancel evt in unregister_unconnected_watcher

If we fail to cancel the callback, the callback will fire and
release those resources.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG: watchers must grab Connection ref as well
Samuel Just [Wed, 12 Dec 2012 22:06:51 +0000 (14:06 -0800)]
ReplicatedPG: watchers must grab Connection ref as well

Session refs are not really valid on their own, the
corresponding Connection must remain live for at least
as long as the Session.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agodoc: Updated per comments in the mailing list.
John Wilkins [Wed, 12 Dec 2012 22:38:22 +0000 (14:38 -0800)]
doc: Updated per comments in the mailing list.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodocs: better documentation of new rgw feature
Yehuda Sadeh [Wed, 12 Dec 2012 21:49:55 +0000 (13:49 -0800)]
docs: better documentation of new rgw feature

Document rgw_extended_http_attrs config option.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: configurable list of object attributes
Yehuda Sadeh [Fri, 30 Nov 2012 07:07:26 +0000 (23:07 -0800)]
rgw: configurable list of object attributes

Fixes: #3535
New object attributes are now configurable. A list
can be specified via the 'rgw extended http attrs'
config param.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: option to provide alternative s3 put obj success code
Yehuda Sadeh [Fri, 30 Nov 2012 00:48:46 +0000 (16:48 -0800)]
rgw: option to provide alternative s3 put obj success code

Fixes: #3529
Added a new option: rgw_s3_success_create_obj_status.
Expected values are 0, 200, 201, 204. A value of 0
will skip the special handling altogether. Any value
other than the specified will default to 200.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agodoc: document swift compatibility
Yehuda Sadeh [Wed, 12 Dec 2012 00:44:46 +0000 (16:44 -0800)]
doc: document swift compatibility

Add a table that specifies swift features compatibility

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agodocs: add rgw POST object as supported feature
Yehuda Sadeh [Wed, 12 Dec 2012 00:09:42 +0000 (16:09 -0800)]
docs: add rgw POST object as supported feature

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoPG,ReplicatedPG: move write_blocked_by_scrub logic into a helper
Samuel Just [Wed, 12 Dec 2012 06:19:09 +0000 (22:19 -0800)]
PG,ReplicatedPG: move write_blocked_by_scrub logic into a helper

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agodocs: fix spacing in radosgw config-ref
Yehuda Sadeh [Wed, 12 Dec 2012 01:48:25 +0000 (17:48 -0800)]
docs: fix spacing in radosgw config-ref

Needed to add an extra empty line between header and properties.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoqa: exclude some more xfstests
Josh Durgin [Wed, 12 Dec 2012 01:18:14 +0000 (17:18 -0800)]
qa: exclude some more xfstests

These worked on a newer kernel, but I forgot I had not updated it for the final image.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge branch 'next'
Josh Durgin [Wed, 12 Dec 2012 00:47:41 +0000 (16:47 -0800)]
Merge branch 'next'

12 years agoMerge branch 'next'
Sage Weil [Wed, 12 Dec 2012 01:16:19 +0000 (17:16 -0800)]
Merge branch 'next'

12 years agoos/JournalingObjectStore: un-break op quiescing during journal replay
Sage Weil [Wed, 12 Dec 2012 01:15:56 +0000 (17:15 -0800)]
os/JournalingObjectStore: un-break op quiescing during journal replay

Commit d9dce4e9273adb4279519d65a0d8bfdfecb5c516 broke journal replay
because the commit thread may try to do a commit, and the ops are not
being applied via the normal work queue.  Add back in a simpler form of the
old op quiescing (simpler because there is a single thread doing the
replay).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agodoc: document swift compatibility
Yehuda Sadeh [Wed, 12 Dec 2012 00:44:46 +0000 (16:44 -0800)]
doc: document swift compatibility

Add a table that specifies swift features compatibility

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agodocs: add rgw POST object as supported feature
Yehuda Sadeh [Wed, 12 Dec 2012 00:09:42 +0000 (16:09 -0800)]
docs: add rgw POST object as supported feature

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge remote branch 'origin/wip-double-notify' into next
Josh Durgin [Wed, 12 Dec 2012 00:39:43 +0000 (16:39 -0800)]
Merge remote branch 'origin/wip-double-notify' into next

Reviewed-by: Sage Weil <sage.weil@inktank.com>
12 years agost_rados_watch: tolerate extra notifies
Josh Durgin [Tue, 11 Dec 2012 20:26:21 +0000 (12:26 -0800)]
st_rados_watch: tolerate extra notifies

With retries, it's possible for notifies to be received more than once
when they are resent to different OSDs, since the OSDs only track them
in memory.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agomds: shutdown cleanly if can't authenticate
Yehuda Sadeh [Tue, 11 Dec 2012 21:41:50 +0000 (13:41 -0800)]
mds: shutdown cleanly if can't authenticate

Fixes: #3590
This was triggered when tried to run mds with cephx enabled
against a mon without cephx support. We didn't handle the
returned error at all, so this one fixes it. It also makes
sure that we don't continue initialization until rotating
keys are in place (as the osd does).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-conf' into next
Sage Weil [Tue, 11 Dec 2012 23:07:38 +0000 (15:07 -0800)]
Merge remote-tracking branch 'gh/wip-conf' into next

Reviewed-by: Greg Farnu <greg@inktank.com>
12 years agoobjecter: don't use new tid when retrying notifies
Josh Durgin [Tue, 11 Dec 2012 17:54:44 +0000 (09:54 -0800)]
objecter: don't use new tid when retrying notifies

Watches update the on-disk state in the OSD, and aren't idempotent,
so refreshing them must be treated as a separate transaction by the OSD.
Notifies are just in-memory state, and resending them will result in
acceptable behavior:

- if it's the same osd, the resent op will be recognized as a duplicate
- if it's a different osd, a new notify will be triggered since the new osd
  can't tell whether the original notify was received by any watchers

Using a new tid for each resend can cause some unecessary extra work,
as the first case turns into the second.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agomds: fix journaling issue regarding rstat accounting
Yan, Zheng [Fri, 30 Nov 2012 01:13:43 +0000 (09:13 +0800)]
mds: fix journaling issue regarding rstat accounting

Rename operation can call predirty_journal_parents() several times.
So a directory fragment's rstat can also be modified several times.
But only the first modification is journaled because EMetaBlob::add_dir()
does not update existing dirlump.

For example: when hanlding 'mv a/b/c a/c', Server::_rename_prepare may
first decrease directory a and b's nested files count by one, then
increases directory a's nested files count by one.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
12 years agofix build of unittest_formatter
Danny Al-Gaaf [Wed, 28 Nov 2012 15:05:48 +0000 (16:05 +0100)]
fix build of unittest_formatter

Add CRYPTO_CXXFLAGS to unittest_formatter_CXXFLAGS to find pk11pub.h to
be included in src/common/ceph_crypto.h.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoinclude/atomic.h: add stdlib.h for size_t
Danny Al-Gaaf [Tue, 11 Dec 2012 13:05:08 +0000 (14:05 +0100)]
include/atomic.h: add stdlib.h for size_t

Include missing stdlib.h needed for size_t.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge remote-tracking branch 'upstream/wip_split2' into next
Samuel Just [Tue, 11 Dec 2012 06:00:30 +0000 (22:00 -0800)]
Merge remote-tracking branch 'upstream/wip_split2' into next

Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoOSD: get_or_create_pg doesn't need an op passed in
Samuel Just [Tue, 11 Dec 2012 03:03:55 +0000 (19:03 -0800)]
OSD: get_or_create_pg doesn't need an op passed in

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoLFNIndex: fix move_subdir comments
Samuel Just [Tue, 11 Dec 2012 01:45:02 +0000 (17:45 -0800)]
LFNIndex: fix move_subdir comments

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoHashIndex: fix typo in reset_attr documentation
Samuel Just [Tue, 11 Dec 2012 01:40:10 +0000 (17:40 -0800)]
HashIndex: fix typo in reset_attr documentation

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoHashIndex: init exists in col_split_level and reset_attr
Samuel Just [Tue, 11 Dec 2012 01:39:13 +0000 (17:39 -0800)]
HashIndex: init exists in col_split_level and reset_attr

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPrioritizedQueue: increment ret when removing items from list
Samuel Just [Tue, 11 Dec 2012 01:31:44 +0000 (17:31 -0800)]
PrioritizedQueue: increment ret when removing items from list

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPrioritizedQueue: move if check out of loop in filter_list_pairs
Samuel Just [Tue, 11 Dec 2012 01:30:59 +0000 (17:30 -0800)]
PrioritizedQueue: move if check out of loop in filter_list_pairs

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 11 Dec 2012 01:08:26 +0000 (17:08 -0800)]
Merge remote-tracking branch 'gh/next'

12 years agoconfig: do not always print config file missing errors
Sage Weil [Tue, 11 Dec 2012 00:41:19 +0000 (16:41 -0800)]
config: do not always print config file missing errors

Do not generate errors each time we fail to open a config file; only
generate one at the end if a search path was specified and none were
usable, right before we (already) exit.  This avoids spamming stderr
about each path we tried in the search list before we found a good one.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoconfig: always complain about config parse errors
Sage Weil [Mon, 10 Dec 2012 21:29:21 +0000 (13:29 -0800)]
config: always complain about config parse errors

Complain about config parsing errors even when it is the default
config file.

We may also want to fail instead of continuing, but that is a separate
issue.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-filestore2' into next
Sage Weil [Mon, 10 Dec 2012 22:34:07 +0000 (14:34 -0800)]
Merge remote-tracking branch 'gh/wip-filestore2' into next

Reviewed-by: Sam Just <sam.just@inktank.com>
12 years agodoc: fixed indent in python example.
John Wilkins [Mon, 10 Dec 2012 22:14:09 +0000 (14:14 -0800)]
doc: fixed indent in python example.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoconfig_opts.h: adjust recovery defaults
Samuel Just [Mon, 10 Dec 2012 21:38:24 +0000 (13:38 -0800)]
config_opts.h: adjust recovery defaults

osd max backfills: 5 was too low for a default, 10
 seems to work better in testing.  The message
 priority system should minimize disruption of
 push and pull operations anyway.

osd recovery max chunk: 1MB was too small for a
 default.  8MB is reasonable for a single push
 and will allow us to recover an rbd block in
 one push rather then 4 reducing client io
 latency during log-based recovery.

osd recovery op priority: 10 rather than 30 will
 further reduce the client io latency impact of
 push and pull operations.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-3559' into next
Sage Weil [Mon, 10 Dec 2012 20:55:14 +0000 (12:55 -0800)]
Merge remote-tracking branch 'gh/wip-3559' into next

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Added sudo to ceph -k command.
John Wilkins [Mon, 10 Dec 2012 18:51:24 +0000 (10:51 -0800)]
doc: Added sudo to ceph -k command.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed typo.
John Wilkins [Mon, 10 Dec 2012 18:24:32 +0000 (10:24 -0800)]
doc: Fixed typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMakefile.am: add missing flags to some tests targets
Yehuda Sadeh [Mon, 10 Dec 2012 18:16:02 +0000 (10:16 -0800)]
Makefile.am: add missing flags to some tests targets

adding CRYPTO_CXXFLAGS to some targets. This is required when
building --with-nss.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agomon: fix leak of pool op reply data
Sage Weil [Sun, 9 Dec 2012 05:44:54 +0000 (21:44 -0800)]
mon: fix leak of pool op reply data

We pass a pointer because it is an optional argument, but we shouldn't
put the bufferlist on the heap or else we have to manage it's life
cycle, and that's fragile (and previously broken).

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoos/JournalingObjectStore: simplify op_submitting sanity check
Sage Weil [Fri, 7 Dec 2012 00:27:07 +0000 (16:27 -0800)]
os/JournalingObjectStore: simplify op_submitting sanity check

A list is overkill; just use a seq and make sure it increments to ensure
the op_submit_finish calls are in order.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoos/JournalingObjectStore: remove unused ops_submitting
Sage Weil [Fri, 7 Dec 2012 00:22:50 +0000 (16:22 -0800)]
os/JournalingObjectStore: remove unused ops_submitting

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoos/JourningObjectStore: drop now-useless max_applying_seq
Sage Weil [Fri, 7 Dec 2012 00:20:00 +0000 (16:20 -0800)]
os/JourningObjectStore: drop now-useless max_applying_seq

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agofilestore: simplify op quescing
Sage Weil [Fri, 7 Dec 2012 00:18:07 +0000 (16:18 -0800)]
filestore: simplify op quescing

The delicate balancing with op_apply_start() and that fact that it can
block was making it very hard to determine how long commit_start() should
wait, since requests in the workqueue threads could op_apply_start() in
any order.  For example,

 threadA: gets osr1 from wq
 threadA: gets osr2 from wq
 threadA: dequeue seq 11 from osr1, op_apply_start
 threadC: commit_start on 11
 threadA: op_apply_finish on seq 11
 threadC: commit_started, commit_finish
 threadB: dequeue seq 10 from osr2
   <failed assert, badness>

Instead, rip out all this code, and use the ThreadPool pause() method to
quiesce operations.  Keep some of the (now unnecessary) fields around
for sanity checks (blocked, open_ops, max_applying_seq, etc.).

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agorgw: document admin api web interface.
caleb miles [Mon, 22 Oct 2012 15:26:07 +0000 (11:26 -0400)]
rgw: document admin api web interface.

Signed-off-by: caleb miles <caleb.miles@inktank.com>
12 years agoosd: make pool_stat_t encoding backward compatible with v0.41 and older
Sage Weil [Fri, 7 Dec 2012 22:09:14 +0000 (14:09 -0800)]
osd: make pool_stat_t encoding backward compatible with v0.41 and older

In particular, this is the encoding that is used in precise.

Fixes: #3212
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-ceph-test' into next
Sage Weil [Sat, 8 Dec 2012 17:18:21 +0000 (09:18 -0800)]
Merge remote-tracking branch 'gh/wip-ceph-test' into next

12 years agocrush/CrushWrapper: do not crash if you move an item with no current home
Sage Weil [Sat, 17 Nov 2012 00:55:00 +0000 (16:55 -0800)]
crush/CrushWrapper: do not crash if you move an item with no current home

This will let us take an existing orphan and place it somewhere.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: Elector: init elector before each election
Joao Eduardo Luis [Fri, 7 Dec 2012 16:13:06 +0000 (16:13 +0000)]
mon: Elector: init elector before each election

Fixes: #3587
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoMerge branch 'testing' into next
Sage Weil [Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)]
Merge branch 'testing' into next

12 years agoinit-ceph: =, not ==
Sage Weil [Sat, 8 Dec 2012 17:10:31 +0000 (09:10 -0800)]
init-ceph: =, not ==

Reported-by: v@alan.lt
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodebian: add ceph.postinst to remove /etc/init/ceph.conf on update
Dan Mick [Sat, 8 Dec 2012 00:54:27 +0000 (16:54 -0800)]
debian: add ceph.postinst to remove /etc/init/ceph.conf on update

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPG: remove last_epoch_started asserts in proc_primary_info
Samuel Just [Tue, 4 Dec 2012 19:36:58 +0000 (11:36 -0800)]
PG: remove last_epoch_started asserts in proc_primary_info

These asserts are valid for a uniform cluster, but they won't hold
for a replica running a version without the info.last_epoch_started
patch.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 0756052cff542ab02d653b40c37a645b395f31b3)

12 years agoauth: set default auth_client_required
Yehuda Sadeh [Fri, 7 Dec 2012 01:47:02 +0000 (17:47 -0800)]
auth: set default auth_client_required

Fixes: #3578
Set auth_client_required to default to "cephx, none".

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoauth: changed order of test for legacy and new authentication
Peter Reiher [Sat, 8 Dec 2012 00:32:31 +0000 (16:32 -0800)]
auth: changed order of test for legacy and new authentication

Changed order of test for legacy and new configuration options
in several places.

Signed-off-by: Peter Reiher <reiher@inktank.com>
12 years agoauth: improve logging
Yehuda Sadeh [Fri, 7 Dec 2012 02:12:51 +0000 (18:12 -0800)]
auth: improve logging

Add some logging around failure cases.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agoMerge branch 'next'
Dan Mick [Sat, 8 Dec 2012 00:43:24 +0000 (16:43 -0800)]
Merge branch 'next'

Merge of wip-rbd-export-progress
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agorbd: use ExportContext for progress, not cerr
Dan Mick [Sat, 8 Dec 2012 00:00:30 +0000 (16:00 -0800)]
rbd: use ExportContext for progress, not cerr

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge branch 'master' of https://github.com/ceph/ceph
John Wilkins [Fri, 7 Dec 2012 23:49:00 +0000 (15:49 -0800)]
Merge branch 'master' of https://github.com/ceph/ceph

12 years agodoc: Added sudo to the service start command.
John Wilkins [Fri, 7 Dec 2012 23:48:29 +0000 (15:48 -0800)]
doc: Added sudo to the service start command.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Moved sudo to before ssh instead of before tee.
John Wilkins [Fri, 7 Dec 2012 22:49:27 +0000 (14:49 -0800)]
doc: Moved sudo to before ssh instead of before tee.

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