]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoCrushWrapper.cc: remove some std::string::c_str() calls 145/head
Danny Al-Gaaf [Tue, 26 Mar 2013 11:46:46 +0000 (12:46 +0100)]
CrushWrapper.cc: remove some std::string::c_str() calls

Passing the result of c_str() to a function that takes
std::string as argument is slow and redundant.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge remote-tracking branch 'gh/wip-crush'
Sage Weil [Mon, 25 Mar 2013 23:29:56 +0000 (16:29 -0700)]
Merge remote-tracking branch 'gh/wip-crush'

The non-crush bits
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agodoc/release-notes: extra note for v0.56.4
Sage Weil [Mon, 25 Mar 2013 23:24:48 +0000 (16:24 -0700)]
doc/release-notes: extra note for v0.56.4

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/release-notes: v0.56.4
Sage Weil [Mon, 25 Mar 2013 23:09:24 +0000 (16:09 -0700)]
doc/release-notes: v0.56.4

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoImprove test by getting cloneid from my_snaps vector
David Zafman [Sat, 23 Mar 2013 01:14:10 +0000 (18:14 -0700)]
Improve test by getting cloneid from my_snaps vector

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Sun, 24 Mar 2013 00:31:29 +0000 (17:31 -0700)]
Merge branch 'next'

12 years agoclient: don't set other if lookup fails in rename
Sam Lang [Sat, 23 Mar 2013 19:07:59 +0000 (14:07 -0500)]
client: don't set other if lookup fails in rename

On rename, only set the other inode if the
lookup for the destination succeeds, otherwise we hit
a segv in set_other_inode().

Fixes #4517.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Tested-by: Noah Watkins <jayhawk@cs.ucsc.edu>
12 years agoMerge branch 'next'
Sage Weil [Sat, 23 Mar 2013 18:03:58 +0000 (11:03 -0700)]
Merge branch 'next'

12 years agotest/libcephfs: Test rename error cases
Sam Lang [Fri, 22 Mar 2013 20:23:21 +0000 (15:23 -0500)]
test/libcephfs: Test rename error cases

Make sure that rename fails with the ENOENT
if the source path doesn't exist.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
12 years agoclient: Fix rename returning ENOENT for dest
Sam Lang [Fri, 22 Mar 2013 20:02:58 +0000 (15:02 -0500)]
client: Fix rename returning ENOENT for dest

Introduced by fc80c1dc6ee315ae5e039986602ffadba46cb43b,
the client should _not_ fail if the lookup for the
destination path on rename returns ENOENT.

The previous code also did not check that the lookup
returned ENOENT or success.  We add the check and fail
if we get any other errors.

Fixes #4517.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
12 years agopreserve /var/lib/ceph on deb/rpm purge
Sage Weil [Fri, 22 Mar 2013 22:24:39 +0000 (15:24 -0700)]
preserve /var/lib/ceph on deb/rpm purge

We should clobber configuration and log data, but *not* user data.  Leave
/var/lib/ceph alone.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
12 years agomon: factor out _get_pending_crush() helper 129/head
Sage Weil [Fri, 22 Mar 2013 21:27:21 +0000 (14:27 -0700)]
mon: factor out _get_pending_crush() helper

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon, crush: add some tests to build a DAG via the cli
Sage Weil [Fri, 22 Mar 2013 19:32:47 +0000 (12:32 -0700)]
mon, crush: add some tests to build a DAG via the cli

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush, mon: unlink vs remove
Sage Weil [Fri, 22 Mar 2013 19:32:15 +0000 (12:32 -0700)]
crush, mon: unlink vs remove

Make an 'unlink' mode of remove that will remove a link to a bucket but
not remove the bucket itself.  This refactors remove_item[_under] and moves
some of the checks into common helpers where they are not duplicated.  Fix
callers to pass the extra arg.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: fix remove_item on bucket removal
Sage Weil [Thu, 21 Mar 2013 18:15:30 +0000 (11:15 -0700)]
crush: fix remove_item on bucket removal

Remove the bucket if there are no references left.

Remove the name from the map even if it is a bucket (not sure why that
condition was there in the first place!).

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: add 'osd crush add-bucket <name> <type>'
Sage Weil [Thu, 21 Mar 2013 18:04:59 +0000 (11:04 -0700)]
mon: add 'osd crush add-bucket <name> <type>'

This is (I think) the last missing piece to let you construct an entire
map via the CLI.  The add/set commands will construct intervening ancestor
nodes provide there is an existing ancestor to stick them under, but this
is needed to create the initial root node.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: allow removal of buckets via 'osd crush rm ...'
Sage Weil [Thu, 21 Mar 2013 18:03:55 +0000 (11:03 -0700)]
mon: allow removal of buckets via 'osd crush rm ...'

No reason to limit this to leaves.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: change find_roots(); add find_takes()
Sage Weil [Fri, 22 Mar 2013 21:23:37 +0000 (14:23 -0700)]
crush: change find_roots(); add find_takes()

The find_roots() was looking for nodes referenced by 'take', but those
aren't necessarily roots, which is what the callers actually want.

Rename to find_takes() and add a real find_roots().  Not very efficient,
but we don't care.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: add optional ancestor arg to 'ceph osd crush rm <item> [ancestor]'
Sage Weil [Wed, 20 Mar 2013 15:40:37 +0000 (08:40 -0700)]
mon: add optional ancestor arg to 'ceph osd crush rm <item> [ancestor]'

Remove only instances of the item underneath a particular ancestor.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: add remove_item_under()
Sage Weil [Wed, 20 Mar 2013 15:40:09 +0000 (08:40 -0700)]
crush: add remove_item_under()

Remove only instances of item nested beneath a particular ancestor.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: 'ceph osd crush link ...' to add a link to an existing bucket
Sage Weil [Wed, 20 Mar 2013 15:00:12 +0000 (08:00 -0700)]
mon: 'ceph osd crush link ...' to add a link to an existing bucket

Allow a second reference to an existing bucket to be added.  This lets
you create a DAG instead of a tree using the CLI.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: prevent formation of a loop
Sage Weil [Wed, 20 Mar 2013 14:59:26 +0000 (07:59 -0700)]
crush: prevent formation of a loop

If we are adding an item, ensure it cannot form a loop in the tree/map/
DAG.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: add link_bucket()
Sage Weil [Wed, 20 Mar 2013 14:59:03 +0000 (07:59 -0700)]
crush: add link_bucket()

Allow an existing bucket to get linked from a new position in the tree.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: 'ceph osd crush add ...' to add a second link to an item
Sage Weil [Wed, 20 Mar 2013 14:02:20 +0000 (07:02 -0700)]
mon: 'ceph osd crush add ...' to add a second link to an item

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'upstream/wip_4435'
Samuel Just [Fri, 22 Mar 2013 21:15:31 +0000 (14:15 -0700)]
Merge remote-tracking branch 'upstream/wip_4435'

Fixes: #4435
Reviewed-by: David Zafman <david.zafman@inktank.com>
12 years agoPG::GetMissing: need to check need_up_thru in MLogRec handler
Samuel Just [Fri, 22 Mar 2013 20:51:14 +0000 (13:51 -0700)]
PG::GetMissing: need to check need_up_thru in MLogRec handler

Backport: bobtail
Fixes: #4534
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPG,osd_types: improve check_new_interval debugging
Samuel Just [Fri, 22 Mar 2013 20:48:49 +0000 (13:48 -0700)]
PG,osd_types: improve check_new_interval debugging

Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agocommon/MemoryModel: remove logging to /tmp/memlog
Sage Weil [Fri, 22 Mar 2013 20:25:49 +0000 (13:25 -0700)]
common/MemoryModel: remove logging to /tmp/memlog

This was a hack for dev purposes ages ago; remove it.  The predictable
filename is a security issue.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agoinit-ceph: clean up temp ceph.conf filename on exit
Sage Weil [Fri, 22 Mar 2013 20:25:43 +0000 (13:25 -0700)]
init-ceph: clean up temp ceph.conf filename on exit

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agoinit-ceph: push temp conf file to a unique location on remote host
Sage Weil [Fri, 22 Mar 2013 20:25:33 +0000 (13:25 -0700)]
init-ceph: push temp conf file to a unique location on remote host

The predictable file name is a security problem.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agomkcephfs: make remote temp directory name unique
Sage Weil [Fri, 22 Mar 2013 20:25:23 +0000 (13:25 -0700)]
mkcephfs: make remote temp directory name unique

The predictable file name is a security problem.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agoMerge pull request #130 from ceph/wip-fs-rename
Sage Weil [Fri, 22 Mar 2013 20:07:41 +0000 (13:07 -0700)]
Merge pull request #130 from ceph/wip-fs-rename

test: add ceph_rename test

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Added {id} argument to OSD lost.
John Wilkins [Fri, 22 Mar 2013 18:52:12 +0000 (11:52 -0700)]
doc: Added {id} argument to OSD lost.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoceph-disk: re-add python 2.7 dependency comment
Sage Weil [Fri, 22 Mar 2013 17:09:55 +0000 (10:09 -0700)]
ceph-disk: re-add python 2.7 dependency comment

FIXME!

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #117 from ceph/wip-ceph-disk
Sage Weil [Fri, 22 Mar 2013 17:06:13 +0000 (10:06 -0700)]
Merge pull request #117 from ceph/wip-ceph-disk

ceph-disk-* refactor

12 years agoMerge branch 'next'
Sage Weil [Fri, 22 Mar 2013 16:15:52 +0000 (09:15 -0700)]
Merge branch 'next'

12 years agoosd: reenable 'journal aio = true'
Sage Weil [Tue, 19 Mar 2013 21:01:08 +0000 (14:01 -0700)]
osd: reenable 'journal aio = true'

Now that #4079 is resolved.  Reverts 1cfc3ae0.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoos/FileJournal: fix aio self-throttling deadlock
Sage Weil [Tue, 19 Mar 2013 21:26:16 +0000 (14:26 -0700)]
os/FileJournal: fix aio self-throttling deadlock

This block of code tries to limit the number of aios in flight by waiting
for the amount of data to be written to grow relative to a function of the
number of aios.  Strictly speaking, the condition we are waiting for is a
function of both aio_num and the write queue, but we are only woken by
changes in aio_num, and were (in rare cases) waiting when aio_num == 0 and
there was no possibility of being woken.

Fix this by verifying that aio_num > 0, and restructuring the loop to
recheck that condition on each wakeup.

Fixes: #4079
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge pull request #137 from dalgaaf/wip-da-cleanup-includes
Sage Weil [Fri, 22 Mar 2013 15:46:31 +0000 (08:46 -0700)]
Merge pull request #137 from dalgaaf/wip-da-cleanup-includes

Cleanup some twice included header

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agotest/test_snap_mapper.cc: remove twice included <tr1/memory> 137/head
Danny Al-Gaaf [Fri, 22 Mar 2013 15:03:22 +0000 (16:03 +0100)]
test/test_snap_mapper.cc: remove twice included <tr1/memory>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/MDSMonitor.cc: remove twice included MonitorDBStore.h
Danny Al-Gaaf [Fri, 22 Mar 2013 15:02:55 +0000 (16:02 +0100)]
mon/MDSMonitor.cc: remove twice included MonitorDBStore.h

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/LogMonitor.cc: remove twice included <sstream>
Danny Al-Gaaf [Fri, 22 Mar 2013 15:02:23 +0000 (16:02 +0100)]
mon/LogMonitor.cc: remove twice included <sstream>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/AuthMonitor.cc: remove twice included <sstream>
Danny Al-Gaaf [Fri, 22 Mar 2013 15:01:53 +0000 (16:01 +0100)]
mon/AuthMonitor.cc: remove twice included <sstream>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocommon/Formatter.h: remove twice included <list>
Danny Al-Gaaf [Fri, 22 Mar 2013 15:01:15 +0000 (16:01 +0100)]
common/Formatter.h: remove twice included <list>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoReplicatedPG: add debug flag to skip full check at reservation 136/head
Samuel Just [Fri, 22 Mar 2013 01:06:59 +0000 (18:06 -0700)]
ReplicatedPG: add debug flag to skip full check at reservation

This will make it easier to test the check in do_scan.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG: replica should post BackfillTooFull in do_scan if full
Samuel Just [Thu, 21 Mar 2013 20:43:03 +0000 (13:43 -0700)]
ReplicatedPG: replica should post BackfillTooFull in do_scan if full

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: halt backfill on RemoteReservationRejected in Backilling
Samuel Just [Thu, 21 Mar 2013 20:37:58 +0000 (13:37 -0700)]
PG: halt backfill on RemoteReservationRejected in Backilling

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: add helper for adding a timer event to retry backfill
Samuel Just [Thu, 21 Mar 2013 20:37:13 +0000 (13:37 -0700)]
PG: add helper for adding a timer event to retry backfill

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: add BackfillTooFull event for RepRecovering
Samuel Just [Thu, 21 Mar 2013 20:19:51 +0000 (13:19 -0700)]
PG: add BackfillTooFull event for RepRecovering

Replica will use this to notify Primary to stop backfilling.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: add helper for rejecting backfill reservation
Samuel Just [Thu, 21 Mar 2013 20:18:41 +0000 (13:18 -0700)]
PG: add helper for rejecting backfill reservation

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: use OSDService::too_full_for_backfill in RepWaitBackfillReserved
Samuel Just [Thu, 21 Mar 2013 19:08:50 +0000 (12:08 -0700)]
PG: use OSDService::too_full_for_backfill in RepWaitBackfillReserved

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSDService: add too_full_for_backfill
Samuel Just [Thu, 21 Mar 2013 18:37:24 +0000 (11:37 -0700)]
OSDService: add too_full_for_backfill

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge remote-tracking branch 'upstream/wip_osd_shutdown_notification'
Samuel Just [Fri, 22 Mar 2013 01:46:50 +0000 (18:46 -0700)]
Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'

Fixes: #1857
Fixes: #4267
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMakefile: add MOSDMarkMeDown 131/head
Samuel Just [Thu, 21 Mar 2013 19:16:43 +0000 (12:16 -0700)]
Makefile: add MOSDMarkMeDown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: notify mon prior to shutdown
Samuel Just [Thu, 21 Mar 2013 18:19:45 +0000 (11:19 -0700)]
OSD: notify mon prior to shutdown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMonitor: add MOSDMarkMeDown support
Samuel Just [Wed, 20 Mar 2013 21:30:49 +0000 (14:30 -0700)]
Monitor: add MOSDMarkMeDown support

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSDMonitor: factor out check_source helper
Samuel Just [Wed, 20 Mar 2013 21:30:29 +0000 (14:30 -0700)]
OSDMonitor: factor out check_source helper

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agomessages: add MOSDMarkMeDown
Samuel Just [Wed, 20 Mar 2013 20:43:31 +0000 (13:43 -0700)]
messages: add MOSDMarkMeDown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: clear OpHistory on shutdown
Samuel Just [Wed, 20 Mar 2013 18:49:29 +0000 (11:49 -0700)]
OSD: clear OpHistory on shutdown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOpRequest: use OpRequestRef for OpHistory
Samuel Just [Wed, 20 Mar 2013 18:49:03 +0000 (11:49 -0700)]
OpRequest: use OpRequestRef for OpHistory

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoFileStore::stat: valgrind: don't read *st on error
Samuel Just [Wed, 20 Mar 2013 18:06:59 +0000 (11:06 -0700)]
FileStore::stat: valgrind: don't read *st on error

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoshared_cache: clear lru in destructor
Samuel Just [Tue, 19 Mar 2013 21:46:20 +0000 (14:46 -0700)]
shared_cache: clear lru in destructor

Otherwise, the live references will attempt to extricate
themselves from a disolving SharedLRU instance as the
member destructors run.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoceph_osd: clear client_throttler prior to putting g_ceph_context
Samuel Just [Tue, 19 Mar 2013 21:44:59 +0000 (14:44 -0700)]
ceph_osd: clear client_throttler prior to putting g_ceph_context

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: reorder OSD::shutdown
Samuel Just [Thu, 21 Mar 2013 18:19:33 +0000 (11:19 -0700)]
OSD: reorder OSD::shutdown

Reorder teardown:
- pgs
- queues/threadpools
- persist superblock
- filestore
- timers
- messengers

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: check for is_stopping after locking osd_lock or heartbeat_lock
Samuel Just [Tue, 19 Mar 2013 16:55:19 +0000 (09:55 -0700)]
OSD: check for is_stopping after locking osd_lock or heartbeat_lock

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: lookup_lock_raw_pg is dead
Samuel Just [Mon, 18 Mar 2013 23:42:57 +0000 (16:42 -0700)]
OSD: lookup_lock_raw_pg is dead

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: rename timer to tick_timer
Samuel Just [Mon, 18 Mar 2013 23:17:29 +0000 (16:17 -0700)]
OSD: rename timer to tick_timer

Only used for scheduling ticks - we should keep it
that way.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: move backfill_request_timer cleanup to OSDService::shutdown
Samuel Just [Mon, 18 Mar 2013 23:14:35 +0000 (16:14 -0700)]
OSD: move backfill_request_timer cleanup to OSDService::shutdown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG,OSD: move dequeueing into on_shutdown
Samuel Just [Mon, 18 Mar 2013 20:45:40 +0000 (13:45 -0700)]
ReplicatedPG,OSD: move dequeueing into on_shutdown

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: clarify PG::deleting comment
Samuel Just [Mon, 18 Mar 2013 20:32:05 +0000 (13:32 -0700)]
PG: clarify PG::deleting comment

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge pull request #135 from ceph/wip-4519
Sage Weil [Fri, 22 Mar 2013 01:25:01 +0000 (18:25 -0700)]
Merge pull request #135 from ceph/wip-4519

mon: AuthMonitor: delete auth_handler while increasing max_global_id

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomon: AuthMonitor: delete auth_handler while increasing max_global_id 135/head
Joao Eduardo Luis [Fri, 22 Mar 2013 00:49:28 +0000 (00:49 +0000)]
mon: AuthMonitor: delete auth_handler while increasing max_global_id

By not deleting and setting NULL the session's auth_handler, we could
hit a scenario in which we'd end up dispatching a previously-wait-listed
auth message and we wouldn't start its auth session.

This only happened when increasing max_global_id via Paxos (in which case
we would wait-list the message) and would only be noticeable when running
with cephx disabled.

Fixes: #4519
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoFileJournal: quieter debugging on journal scanning
Samuel Just [Tue, 19 Mar 2013 21:45:41 +0000 (14:45 -0700)]
FileJournal: quieter debugging on journal scanning

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
(cherry picked from commit 6740d512ac12263f7bee370bc14b1179f83af5be)

12 years agoFileJournal: quieter debugging on journal scanning
Samuel Just [Tue, 19 Mar 2013 21:45:41 +0000 (14:45 -0700)]
FileJournal: quieter debugging on journal scanning

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
12 years agodoc: Fixed some typos.
John Wilkins [Fri, 22 Mar 2013 00:04:54 +0000 (17:04 -0700)]
doc: Fixed some typos.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge pull request #128 from dalgaaf/wip-da-pylint
Josh Durgin [Thu, 21 Mar 2013 23:41:34 +0000 (16:41 -0700)]
Merge pull request #128 from dalgaaf/wip-da-pylint

Fix some python issues

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge pull request #132 from ceph/wip-libcephfs-fix
Sage Weil [Thu, 21 Mar 2013 23:16:31 +0000 (16:16 -0700)]
Merge pull request #132 from ceph/wip-libcephfs-fix

libcephfs: fix ceph_get_osd_crush_location

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agolibcephfs: fix ceph_get_osd_crush_location 132/head
Noah Watkins [Thu, 21 Mar 2013 22:30:41 +0000 (15:30 -0700)]
libcephfs: fix ceph_get_osd_crush_location

(a) Allow NULL buffer when length is zero to get the target buffer
length. (b) fix edge case where buffer length is the exact size
required.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
12 years agotest: add ceph_rename test 130/head
Noah Watkins [Thu, 21 Mar 2013 19:45:12 +0000 (12:45 -0700)]
test: add ceph_rename test

Triggers bug in ticket #4517

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
12 years agoMerge pull request #127 from alram/master
John Wilkins [Thu, 21 Mar 2013 18:21:05 +0000 (11:21 -0700)]
Merge pull request #127 from alram/master

[doc] undisplayed notes, tips, and important sections

Reviewed-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge pull request #120 from ceph/wip-msgr-acks
Sage Weil [Thu, 21 Mar 2013 18:14:29 +0000 (11:14 -0700)]
Merge pull request #120 from ceph/wip-msgr-acks

msg/Pipe: fix seq handshake on reconnect

Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agorados.py: remove unnecessary semicolon 128/head
Danny Al-Gaaf [Thu, 21 Mar 2013 17:47:46 +0000 (18:47 +0100)]
rados.py: remove unnecessary semicolon

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorados.py: fix bad indention
Danny Al-Gaaf [Thu, 21 Mar 2013 17:46:16 +0000 (18:46 +0100)]
rados.py: fix bad indention

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorados.py: remove lenght modifier 'l' on format string
Danny Al-Gaaf [Thu, 21 Mar 2013 17:43:48 +0000 (18:43 +0100)]
rados.py: remove lenght modifier 'l' on format string

Remove length modifier 'l' since it's ignored for python.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorados.py: fix 'Rados' has no member 'name'
Danny Al-Gaaf [Thu, 21 Mar 2013 17:23:25 +0000 (18:23 +0100)]
rados.py: fix 'Rados' has no member 'name'

Lets store rados_id from __init__ and use this instead of 'name'.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocrush: allow an item to be inserted twice
Sage Weil [Wed, 20 Mar 2013 13:51:25 +0000 (06:51 -0700)]
crush: allow an item to be inserted twice

Modify insert_item() to let you add an existing item to a new position
in the map.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: use const string& args
Sage Weil [Wed, 20 Mar 2013 13:24:57 +0000 (06:24 -0700)]
crush: use const string& args

Compiler will convert const char * to a std::string implicitly.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agorados.py: add missing space after ','
Danny Al-Gaaf [Thu, 21 Mar 2013 16:14:02 +0000 (17:14 +0100)]
rados.py: add missing space after ','

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph-create-keys: rename log to LOG since it's a constants
Danny Al-Gaaf [Thu, 21 Mar 2013 16:02:11 +0000 (17:02 +0100)]
ceph-create-keys: rename log to LOG since it's a constants

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge branch 'next'
Gary Lowell [Thu, 21 Mar 2013 07:40:16 +0000 (00:40 -0700)]
Merge branch 'next'

12 years agodoc/release-notes: v0.59
Sage Weil [Thu, 21 Mar 2013 05:11:15 +0000 (22:11 -0700)]
doc/release-notes: v0.59

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomsg/Pipe: fix seq handshake on reconnect 120/head
Sage Weil [Thu, 21 Mar 2013 04:52:21 +0000 (21:52 -0700)]
msg/Pipe: fix seq handshake on reconnect

We go to the trouble to exchange our seq numbers during the handshake, but
the bit that then avoids resending old messages was broken because we
already requeue_sent() before we get to this point.  Fix it by discarding
queued items (in the high prio slot) that we don't need to resend, and
adjust out_seq as needed.

Drop the optional arg to requeue_sent() now that it is unused.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoFix tips in documentation 127/head
Alexandre Marangone [Thu, 21 Mar 2013 04:17:53 +0000 (21:17 -0700)]
Fix tips in documentation

Use of .. tip: instead of .. tip:: resulting in content not
being displayed.

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
12 years agoFix important in documentation
Alexandre Marangone [Thu, 21 Mar 2013 04:15:08 +0000 (21:15 -0700)]
Fix important in documentation

Use of .. important: instead of .. important:: resulting in content
not being displayed.

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
12 years agoFix notes in documentation
Alexandre Marangone [Thu, 21 Mar 2013 04:10:55 +0000 (21:10 -0700)]
Fix notes in documentation

Use of .. note: instead of .. note:: resulting in content not
being displayed

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
12 years agoMerge pull request #126 from alram/master
Sage Weil [Thu, 21 Mar 2013 00:07:11 +0000 (17:07 -0700)]
Merge pull request #126 from alram/master

Update Chef deployment documentation

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoUpdate Chef deployment documentation 126/head
Alexandre Marangone [Wed, 20 Mar 2013 21:23:06 +0000 (14:23 -0700)]
Update Chef deployment documentation

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
12 years agoMerge pull request #124 from ceph/wip-4509
Sage Weil [Wed, 20 Mar 2013 23:17:51 +0000 (16:17 -0700)]
Merge pull request #124 from ceph/wip-4509

mon: DataHealthService: shutdown mon if failed to obtain disk stats

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomon: DataHealthService: log to derr instead if we're about to shutdown 124/head
Joao Eduardo Luis [Wed, 20 Mar 2013 20:51:06 +0000 (20:51 +0000)]
mon: DataHealthService: log to derr instead if we're about to shutdown

Otherwise the message would -- or could -- be lost.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: DataHealthService: shutdown mon if failed to obtain disk stats
Joao Eduardo Luis [Wed, 20 Mar 2013 20:49:20 +0000 (20:49 +0000)]
mon: DataHealthService: shutdown mon if failed to obtain disk stats

Being unable to run a ::statfs() may be a symptom of something bigger.

We want to cleanly shutdown the monitor ASAP if such thing happens.

Fixes: #4509
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>