]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agomon: fix validatation of mds ids in mon commands 280/head
Sage Weil [Sat, 11 May 2013 05:14:05 +0000 (22:14 -0700)]
mon: fix validatation of mds ids in mon commands

Fixes: #4996
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #278 from ceph/wip-4974
Sage Weil [Mon, 13 May 2013 18:39:36 +0000 (11:39 -0700)]
Merge pull request #278 from ceph/wip-4974

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomon: Monitor: tolerate GV duplicates during conversion 278/head
Joao Eduardo Luis [Mon, 13 May 2013 14:36:59 +0000 (15:36 +0100)]
mon: Monitor: tolerate GV duplicates during conversion

Fixes: #4974
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoqa: rsync test: exclude /usr/local
Sage Weil [Sun, 12 May 2013 00:36:13 +0000 (17:36 -0700)]
qa: rsync test: exclude /usr/local

Some plana have non-world-readable crap in /usr/local/samba.  Avoid
/usr/local entirely for that and any similar landmines.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'wip_4955' into next
Samuel Just [Fri, 10 May 2013 05:37:37 +0000 (22:37 -0700)]
Merge branch 'wip_4955' into next

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPG,OSD: delay ops for map prior to queueing in the OpWQ
Samuel Just [Wed, 8 May 2013 23:19:34 +0000 (16:19 -0700)]
PG,OSD: delay ops for map prior to queueing in the OpWQ

Previously, we simply queued ops in the OpWQ without checking.  The PG
would then check in do_request whether the message should wait for a new
map.  Unfortunately, this has the side effect that any op requeued for
any reason must also requeue the waiting_for_map queue.

Now, we will check before queueing the op whether it must wait on a map.
To avoid contention, there is now a map_lock which must be held along
with the PG lock in order to update the osdmap_ref.  The map_lock also
protects the waiting_for_map list and queueing PG ops at the back of
the OpWQ.  A few details:
1) It is no longer necessary to requeue waiting_for_map in on_change()
since the other ops are queued at the front.
2) Once waiting_for_map is non-empty, all ops are delayed to simplify
ordering.
3) waiting_for_map may now be non-empty during split, so we must split
waiting_for_map along with waiting_for_active.  This must be done
under the map_lock.

The bug which uncovered this involved an out of order op as follows:

client.4208.0:2378 (e252) arrives, object is degraded
client.4208.0:2379 (e253) arrives, waits for map
client.4208.0:2378 (e252) is requeued after recovery
client.4208.0:2379 (e253) is requeued on map arrival
client.4208.0:2379 is processed
client.4208.0:2378 is processed

Fixes: #4955
Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG: rename must_delay_request to op_must_wait_for_map, make static
Samuel Just [Wed, 8 May 2013 23:02:24 +0000 (16:02 -0700)]
PG: rename must_delay_request to op_must_wait_for_map, make static

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agomon: dump MonitorDBStore transactions to file
Samuel Just [Thu, 2 May 2013 21:13:07 +0000 (14:13 -0700)]
mon: dump MonitorDBStore transactions to file

Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 797089ef082b99910eebfd9454c03d1f027c93bb)

12 years agoosd: optionally enable leveldb logging
Sage Weil [Mon, 6 May 2013 21:21:28 +0000 (14:21 -0700)]
osd: optionally enable leveldb logging

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 0b4c5c1a3349670d11cc3c4fb3c4b3c1a80b2502)

12 years agomon: allow leveldb logging
Sage Weil [Mon, 6 May 2013 21:13:50 +0000 (14:13 -0700)]
mon: allow leveldb logging

'mon leveldb log = filename'

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit c1d5f815546b731e10bfcb81cbcd48b7d432e9c4)

12 years agocommon/Preforker: fix warnings
Sage Weil [Wed, 8 May 2013 23:42:24 +0000 (16:42 -0700)]
common/Preforker: fix warnings

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodebian/control: squeeze requres cryptsetup package
Gary Lowell [Wed, 8 May 2013 23:33:05 +0000 (16:33 -0700)]
debian/control:  squeeze requres cryptsetup package

Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions.  Allow either package to
satisfy the dependency.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
(cherry picked from commit 83bbae415de16f708ca1cb24861ddbb0bd514a7f)

12 years agoPG: reassert_lock_with_map_lock_held() is dead
Samuel Just [Wed, 8 May 2013 22:47:03 +0000 (15:47 -0700)]
PG: reassert_lock_with_map_lock_held() is dead

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD,PG: lock_with_map_lock_held() is the same as lock()
Samuel Just [Wed, 8 May 2013 22:46:41 +0000 (15:46 -0700)]
OSD,PG: lock_with_map_lock_held() is the same as lock()

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoceph-create-keys: gracefully handle no data from admin socket
Sage Weil [Wed, 8 May 2013 21:54:33 +0000 (14:54 -0700)]
ceph-create-keys: gracefully handle no data from admin socket

Old ceph-mon (prior to 393c9372f82ef37fc6497dd46fc453507a463d42) would
return an empty string and success if the command was not registered yet.
Gracefully handle that case by retrying.

If we still fail to parse, exit entirely with EINVAL.

Fixes: #4952
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@intank.com>
12 years agoinit-ceph: fix osd_data location when checking df utilization
Sage Weil [Wed, 8 May 2013 21:35:54 +0000 (14:35 -0700)]
init-ceph: fix osd_data location when checking df utilization

Do not assume default osd data location.

Fixes: #4951
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowelll <gary.lowell@inktank.com>
12 years agoMerge branch 'wip_split_upgrade' into next
Samuel Just [Wed, 8 May 2013 18:14:11 +0000 (11:14 -0700)]
Merge branch 'wip_split_upgrade' into next

Fixes: #4927
12 years agoOSD: handle stray snap collections from upgrade bug
Samuel Just [Tue, 7 May 2013 23:41:22 +0000 (16:41 -0700)]
OSD: handle stray snap collections from upgrade bug

Previously, we failed to clear snap_collections, which causes split to
spawn a bunch of snap collections.  In load_pgs, we now clear any such
snap collections and then snap_collections field on the PG itself.

Related: #4927
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPG: clear snap_collections on upgrade
Samuel Just [Tue, 7 May 2013 23:35:57 +0000 (16:35 -0700)]
PG: clear snap_collections on upgrade

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoOSD: snap collections can be ignored on split
Samuel Just [Tue, 7 May 2013 23:34:57 +0000 (16:34 -0700)]
OSD: snap collections can be ignored on split

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoceph: return error code when failing to get result from admin socket
Sage Weil [Wed, 8 May 2013 18:05:29 +0000 (11:05 -0700)]
ceph: return error code when failing to get result from admin socket

Make sure we return a non-zero result code when we fail to read something
from the admin socket.

Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'next'
Gary Lowell [Tue, 7 May 2013 02:51:47 +0000 (19:51 -0700)]
Merge branch 'next'

12 years agoos/ObjectStore: add missing break in dump()
Sage Weil [Tue, 7 May 2013 00:13:15 +0000 (17:13 -0700)]
os/ObjectStore: add missing break in dump()

CID 751331 (#1 of 1): Missing break in switch (MISSING_BREAK)
unterminated_case: This case (value 35) is not terminated by a 'break' statement.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc: Deleted redundant "so that" phrase.
John Wilkins [Mon, 6 May 2013 23:41:08 +0000 (16:41 -0700)]
doc: Deleted redundant "so that" phrase.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Corrected typo.
John Wilkins [Mon, 6 May 2013 23:38:41 +0000 (16:38 -0700)]
doc: Corrected typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Corrected typo.
John Wilkins [Mon, 6 May 2013 23:38:21 +0000 (16:38 -0700)]
doc: Corrected typo.

12 years agoRemoved comment out of header, and added "coming soon."
John Wilkins [Mon, 6 May 2013 23:37:50 +0000 (16:37 -0700)]
Removed comment out of header, and added "coming soon."

12 years agodoc: Updated usage for push | pull.
John Wilkins [Mon, 6 May 2013 23:37:12 +0000 (16:37 -0700)]
doc: Updated usage for push | pull.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoosd: make class load errors louder
Sage Weil [Mon, 6 May 2013 21:34:37 +0000 (14:34 -0700)]
osd: make class load errors louder

Fixes: #4639
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agov0.61 v0.61
Gary Lowell [Mon, 6 May 2013 20:18:56 +0000 (13:18 -0700)]
v0.61

12 years agoos/: default to dio for non-block journals
Samuel Just [Mon, 6 May 2013 17:56:50 +0000 (10:56 -0700)]
os/: default to dio for non-block journals

Workaround: #4910
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoceph-disk: use separate lock files for prepare, activate
Sage Weil [Mon, 6 May 2013 18:40:52 +0000 (11:40 -0700)]
ceph-disk: use separate lock files for prepare, activate

Use a separate lock file for prepare and activate to avoid deadlock.  This
didn't seem to trigger on all machines, but in many cases, the prepare
process would take the file lock and later trigger a udev event and the
activate would then block on the same lock, either when we explicitly call
'udevadm settle --timeout=10' or when partprobe does it on our behalf
(without a timeout!).   Avoid this by using separate locks for prepare
and activate.  We only care if multiple activates race; it is
okay for a prepare to be in progress and for an activate to be kicked
off.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool
Danny Al-Gaaf [Mon, 6 May 2013 13:42:57 +0000 (15:42 +0200)]
ceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: remove twice listed ceph-coverage
Danny Al-Gaaf [Mon, 6 May 2013 13:21:56 +0000 (15:21 +0200)]
ceph.spec.in: remove twice listed ceph-coverage

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec: add some files to ceph
Danny Al-Gaaf [Mon, 6 May 2013 13:09:32 +0000 (15:09 +0200)]
ceph.spec: add some files to ceph

Add installed, but not packaged files to ceph-test (ceph-monstore-tool,
ceph-osdomap-tool) rpm file section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodoc: Update the usage to reflect optional directory name.
John Wilkins [Mon, 6 May 2013 18:19:33 +0000 (11:19 -0700)]
doc: Update the usage to reflect optional directory name.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Rearranged to show zapping multiple disks and creating multiple OSDs.
John Wilkins [Mon, 6 May 2013 18:19:09 +0000 (11:19 -0700)]
doc: Rearranged to show zapping multiple disks and creating multiple OSDs.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Moved install to the second step, from the first step.
John Wilkins [Mon, 6 May 2013 17:50:24 +0000 (10:50 -0700)]
doc: Moved install to the second step, from the first step.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge pull request #256 from dalgaaf/wip-da-spec-update
Gary Lowell [Mon, 6 May 2013 17:28:22 +0000 (10:28 -0700)]
Merge pull request #256 from dalgaaf/wip-da-spec-update

Fix ceph.spec.in

12 years agoMerge pull request #257 from dalgaaf/wip-da-fix-debian
Gary Lowell [Mon, 6 May 2013 17:28:04 +0000 (10:28 -0700)]
Merge pull request #257 from dalgaaf/wip-da-fix-debian

ceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool

12 years agodoc: Autonumbering syntax correction.
John Wilkins [Mon, 6 May 2013 17:08:38 +0000 (10:08 -0700)]
doc: Autonumbering syntax correction.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added troubleshooting PGs to the index.
John Wilkins [Mon, 6 May 2013 17:04:29 +0000 (10:04 -0700)]
doc: Added troubleshooting PGs to the index.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Commented out osd list for now.
John Wilkins [Mon, 6 May 2013 16:44:31 +0000 (09:44 -0700)]
doc: Commented out osd list for now.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Commented out remove a mds for now.
John Wilkins [Mon, 6 May 2013 16:44:13 +0000 (09:44 -0700)]
doc: Commented out remove a mds for now.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Forwarding link. FAQ migrated to new Ceph wiki.
John Wilkins [Mon, 6 May 2013 16:43:41 +0000 (09:43 -0700)]
doc: Forwarding link. FAQ migrated to new Ceph wiki.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool 257/head
Danny Al-Gaaf [Mon, 6 May 2013 13:42:57 +0000 (15:42 +0200)]
ceph-test.install: add ceph-monstore-tool and ceph-osdomap-tool

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: remove twice listed ceph-coverage 256/head
Danny Al-Gaaf [Mon, 6 May 2013 13:21:56 +0000 (15:21 +0200)]
ceph.spec.in: remove twice listed ceph-coverage

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec: add some files to ceph
Danny Al-Gaaf [Mon, 6 May 2013 13:09:32 +0000 (15:09 +0200)]
ceph.spec: add some files to ceph

Add installed, but not packaged files to ceph-test (ceph-monstore-tool,
ceph-osdomap-tool) rpm file section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon: fix init sequence when not daemonizing
Sage Weil [Fri, 3 May 2013 23:20:26 +0000 (16:20 -0700)]
mon: fix init sequence when not daemonizing

We made the common_init_finish and chdir conditional on daemonize in commit
2e0dd5ae6c8751e33d456b2b06c1204b63db959a, breaking init (asok at least)
when -f is specified (as with upstart).

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agomon: avoid null deref in Monitor::_mon_status()
Sage Weil [Fri, 3 May 2013 23:04:31 +0000 (16:04 -0700)]
mon: avoid null deref in Monitor::_mon_status()

mikedawson reports:

*** Caught signal (Segmentation fault) **
 in thread 7f40ce270700

 ceph version 0.60-801-g7ec0151 (7ec01513970b5a977bdbdf60052b6f6e257d267e)
 1: /usr/bin/ceph-mon() [0x59d550]
 2: (()+0xfbd0) [0x7f40d3e38bd0]
 3: (operator<<(std::ostream&, entity_name_t const&)+0x16) [0x4d7c46]
 4: (operator<<(std::ostream&, entity_inst_t const&)+0x1b) [0x4d837b]
 5: (Monitor::_mon_status(std::ostream&)+0x2ce) [0x4d284e]
 6: (Monitor::do_admin_command(std::string, std::string, std::ostream&)+0x4f) [0x4d652f]
 7: (AdminHook::call(std::string, std::string, ceph::buffer::list&)+0x68) [0x4efa38]
 8: (AdminSocket::do_accept()+0x451) [0x64ab81]
 9: (AdminSocket::entry()+0x398) [0x64c528]
 10: (()+0x7f8e) [0x7f40d3e30f8e]
 11: (clone()+0x6d) [0x7f40d237ae1d]

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoceph.spec: require xfsprogs
Sage Weil [Fri, 3 May 2013 20:28:24 +0000 (13:28 -0700)]
ceph.spec: require xfsprogs

This is needed when creating new OSDs (via ceph-disk).  At least for most
people.  Eventually we'll want to include btrfs here.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Fri, 3 May 2013 18:36:42 +0000 (11:36 -0700)]
Merge branch 'next'

12 years agodoc/release-notes: warn about sysvinit crush map update
Sage Weil [Fri, 3 May 2013 18:36:37 +0000 (11:36 -0700)]
doc/release-notes: warn about sysvinit crush map update

See c189d855e67baadf977d8ca14509dcacd579af7a.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoinit-ceph: update osd crush map position on start
Sage Weil [Fri, 3 May 2013 00:18:27 +0000 (17:18 -0700)]
init-ceph: update osd crush map position on start

This is what the upstart ceph-osd.conf does; we need to do the same so that
new OSDs (e.g., that ceph-deploy creates) get added to the crush map.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: fork early to avoid leveldb static env state
Sage Weil [Fri, 3 May 2013 18:29:24 +0000 (11:29 -0700)]
mon: fork early to avoid leveldb static env state

leveldb has static state that prevents it from recreating its worker thread
after our fork(), even when we close and reopen the database (tsk tsk!).
Avoid this by forking early, before we touch leveldb.

Hide the details in a Preforker class.  This is modeled after what
ceph-fuse already does; we should convert it later.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agodoc/release-notes: add/link complete changelogs
Sage Weil [Fri, 3 May 2013 18:04:35 +0000 (11:04 -0700)]
doc/release-notes: add/link complete changelogs

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/release-notes: v0.56.5
Sage Weil [Fri, 3 May 2013 18:04:05 +0000 (11:04 -0700)]
doc/release-notes: v0.56.5

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc: Fixed typos.
John Wilkins [Thu, 2 May 2013 22:32:16 +0000 (15:32 -0700)]
doc: Fixed typos.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Thu, 2 May 2013 20:33:54 +0000 (13:33 -0700)]
Merge branch 'next'

12 years agoRevert "mon: fix Monitor::pick_random_mon()"
Sage Weil [Thu, 2 May 2013 20:33:36 +0000 (13:33 -0700)]
Revert "mon: fix Monitor::pick_random_mon()"

This reverts commit 741f46852380c8e75669f6d7bf1202adad0358fb.

This is fixed in next; revert this to avoid a conflict.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-mon-rank' into next
Sage Weil [Thu, 2 May 2013 20:32:41 +0000 (13:32 -0700)]
Merge remote-tracking branch 'gh/wip-mon-rank' into next

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc/install/upgrading...: note that argonaut->bobtail->cuttlefish must be v0.56.5
Sage Weil [Thu, 2 May 2013 20:19:30 +0000 (13:19 -0700)]
doc/install/upgrading...: note that argonaut->bobtail->cuttlefish must be v0.56.5

Which will be released shortly.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agotools/: add paranoid option to ceph-osdomap-tool
Samuel Just [Thu, 2 May 2013 19:49:34 +0000 (12:49 -0700)]
tools/: add paranoid option to ceph-osdomap-tool

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoosd: default 'osd leveldb paranoid = false'
Sage Weil [Thu, 2 May 2013 19:47:24 +0000 (12:47 -0700)]
osd: default 'osd leveldb paranoid = false'

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agolibrados,client: bump mount timeout to 5 min
Sage Weil [Thu, 2 May 2013 19:31:38 +0000 (12:31 -0700)]
librados,client: bump mount timeout to 5 min

30 seconds is pretty short.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge pull request #251 from bkerensa/patch-1
Sage Weil [Thu, 2 May 2013 19:30:41 +0000 (12:30 -0700)]
Merge pull request #251 from bkerensa/patch-1

Improve verbiage

Signed-off-by: Benjamin Kerensa <bkerensa@ubuntu.com>
12 years agoOSD: also walk maps individually for start_split in consume_map()
Samuel Just [Thu, 2 May 2013 17:47:55 +0000 (10:47 -0700)]
OSD: also walk maps individually for start_split in consume_map()

We need to go map-by-map to get the parents right in consume_map()
just as we must in load_pgs().

Fixes: 4884
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agorgw: increase startup timeout to 5 min
Sage Weil [Thu, 2 May 2013 18:06:22 +0000 (11:06 -0700)]
rgw: increase startup timeout to 5 min

30s is too short.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'wip-paranoid' into next
Sage Weil [Thu, 2 May 2013 17:18:39 +0000 (10:18 -0700)]
Merge branch 'wip-paranoid' into next

12 years agodoc/install/upgrading...: note about transitioning to ceph-deploy
Sage Weil [Thu, 2 May 2013 14:30:55 +0000 (07:30 -0700)]
doc/install/upgrading...: note about transitioning to ceph-deploy

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/release-notes: note about ceph-deploy
Sage Weil [Thu, 2 May 2013 14:30:36 +0000 (07:30 -0700)]
doc/release-notes: note about ceph-deploy

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoUpdate debian.rst 251/head
Benjamin Kerensa [Thu, 2 May 2013 09:26:47 +0000 (02:26 -0700)]
Update debian.rst

"complete list of distributions" should be complete list of releases since we already know what distributions are supported and the list specifies releases. (Wheezy, Precise etc.)

12 years agoMerge branch 'next'
Sage Weil [Thu, 2 May 2013 04:46:50 +0000 (21:46 -0700)]
Merge branch 'next'

12 years agoMerge remote-tracking branch 'gh/wip-doc-cuttlefish' into next
Sage Weil [Thu, 2 May 2013 00:24:40 +0000 (17:24 -0700)]
Merge remote-tracking branch 'gh/wip-doc-cuttlefish' into next

12 years agoMerge remote-tracking branch 'upstream/wip_4884' into next
Samuel Just [Wed, 1 May 2013 23:11:47 +0000 (16:11 -0700)]
Merge remote-tracking branch 'upstream/wip_4884' into next

Fixes: #4884
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoMakefile,gitignore: ceph-monstore-tool, not ceph_monstore_tool
Samuel Just [Wed, 1 May 2013 01:11:05 +0000 (18:11 -0700)]
Makefile,gitignore: ceph-monstore-tool, not ceph_monstore_tool

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMakefile: put ceph_monstore_tool in bin_DEBUGPROGRAMS
Samuel Just [Wed, 1 May 2013 00:57:56 +0000 (17:57 -0700)]
Makefile: put ceph_monstore_tool in bin_DEBUGPROGRAMS

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agotools: ceph-osdomap-tool.cc
Samuel Just [Tue, 30 Apr 2013 16:31:26 +0000 (09:31 -0700)]
tools: ceph-osdomap-tool.cc

Add tool for dumping info from osd omap.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: load_pgs() should fill in start_split honestly
Samuel Just [Wed, 1 May 2013 21:59:08 +0000 (14:59 -0700)]
OSD: load_pgs() should fill in start_split honestly

In load_pgs(), we previously called assigned children starting
at the loaded pg created between its stored epoch and the current
osdmap to have that pg as their parent.  This is not correct, some
of the children may have been split in subsequent epochs from children
split in earlier epochs.  Instead, do each map individually.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoOSD: cancel_pending_splits needs to cancel all descendants
Samuel Just [Wed, 1 May 2013 21:56:25 +0000 (14:56 -0700)]
OSD: cancel_pending_splits needs to cancel all descendants

expand_pg_num() and load_pgs() may result in a pg with children
in pending_splits which also have children in pending_splits (etc).

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoosd: add --osd-leveldb-paranoid flag
Sage Weil [Wed, 1 May 2013 21:40:33 +0000 (14:40 -0700)]
osd: add --osd-leveldb-paranoid flag

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: add --mon-leveldb-paranoid flag
Sage Weil [Wed, 1 May 2013 21:38:59 +0000 (14:38 -0700)]
mon: add --mon-leveldb-paranoid flag

This is sort of equivalent to an fsck.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodumper: fix Objecter locking
Greg Farnum [Wed, 1 May 2013 21:10:31 +0000 (14:10 -0700)]
dumper: fix Objecter locking

Locking expectations changed at some point, and the Dumper wasn't
updated to comply:
1) We need to take the lock for Objecter, as it
doesn't do so on its own any more.
2) We need to drop the lock in several places so that Objecter
can take delivery of messages

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Wed, 1 May 2013 21:03:31 +0000 (14:03 -0700)]
Merge remote-tracking branch 'gh/next'

12 years agodoc/rados/deploy: note that osd delete does not work yet
Sage Weil [Wed, 1 May 2013 21:03:19 +0000 (14:03 -0700)]
doc/rados/deploy: note that osd delete does not work yet

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/rados/deploy: misc edits
Sage Weil [Wed, 1 May 2013 21:02:37 +0000 (14:02 -0700)]
doc/rados/deploy: misc edits

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoRevert "PaxosService: use get and put for version_t"
Sage Weil [Wed, 1 May 2013 05:48:52 +0000 (22:48 -0700)]
Revert "PaxosService: use get and put for version_t"

This reverts commit e725c3e210b244e090d70c77d937c94f4f63a2be.

These inadvertantely got rid of the prefix portion of the key, which
lead to overwriting the wrong keys.

Fixes: #4872
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agomon/Paxos: update first_committed when we trim
Sage Weil [Wed, 1 May 2013 17:57:35 +0000 (10:57 -0700)]
mon/Paxos: update first_committed when we trim

The Paxos::trim() -> ::trim_to() path trims old states but does not
update first_committed.  This misinforms later paxos rounds such that
peers think they can participate and end up with COMMIT messages
following the COLLECT/LAST exchange that are for future commits they
can't do anything with and then crash out when they get the BEGIN:

mon/Paxos.cc: 557: FAILED assert(begin->last_committed == last_committed)

Fixes: #4879
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agomon/Paxos: don't ignore peer first_committed
Sage Weil [Wed, 1 May 2013 04:16:16 +0000 (21:16 -0700)]
mon/Paxos: don't ignore peer first_committed

We go to the effort of keeping a map of the peer's first/last committed
so that we can send the right commits during the first phase of paxos,
but we forgot to record the first value.  This appears to simply be an
oversight.  It is mostly harmless; it just means we send extra states
that the peer already has.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agomon: Monitor: fix bug on _pick_random_mon() that would choose an invalid rank
Joao Eduardo Luis [Tue, 30 Apr 2013 16:12:05 +0000 (17:12 +0100)]
mon: Monitor: fix bug on _pick_random_mon() that would choose an invalid rank

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: Monitor: use rank instead of name when randomly picking monitors
Joao Eduardo Luis [Tue, 30 Apr 2013 15:28:42 +0000 (16:28 +0100)]
mon: Monitor: use rank instead of name when randomly picking monitors

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoOSD: clean up in progress split state on pg removal
Samuel Just [Tue, 30 Apr 2013 22:48:10 +0000 (15:48 -0700)]
OSD: clean up in progress split state on pg removal

There are two cases: 1) The parent pg has not yet initiated the split 2) The
parent pg has initiated the split.

Previously in case 1), _remove_pg left the entry for its children in the
in_progress_splits map blocking subsequent peering attempts.

In case 1), we need to unblock requests on the child pgs for the parent on
parent removal.  We don't need to bother waking requests since any requests
received prior to the remove_pg request are necessarily obsolete.

In case 2), we don't need to do anything: the child will complete the split on
its own anyway.

Thus, we now track pending_splits vs in_progress_splits.  Children in
pending_splits are in state 1), in_progress_splits in state 2).  split_pgs
bumps pgs from pending_splits to in_progress_splits atomically with respect to
_remove_pg since the parent pg lock is held in both places.

Fixes: #4813
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoMerge pull request #250 from wido/docs
Sage Weil [Wed, 1 May 2013 14:57:46 +0000 (07:57 -0700)]
Merge pull request #250 from wido/docs

docs: Various updates for the documentation

12 years agodocs: Update links to Github and the Tracker 250/head
Wido den Hollander [Wed, 1 May 2013 09:56:33 +0000 (11:56 +0200)]
docs: Update links to Github and the Tracker

12 years agodocs: Update the ceph-users join and leave addresses
Wido den Hollander [Wed, 1 May 2013 09:52:12 +0000 (11:52 +0200)]
docs: Update the ceph-users join and leave addresses

These were pointing to vger, where only -devel lives.

12 years agodocs: Update CloudStack RBD documentation
Wido den Hollander [Wed, 1 May 2013 09:09:11 +0000 (11:09 +0200)]
docs: Update CloudStack RBD documentation

12 years agomon: communicate the quorum_features properly when declaring victory.
Greg Farnum [Wed, 1 May 2013 01:12:10 +0000 (18:12 -0700)]
mon: communicate the quorum_features properly when declaring victory.

Fixes #4747.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Incorporating Tamil's feedback.
John Wilkins [Wed, 1 May 2013 01:04:46 +0000 (18:04 -0700)]
doc: Incorporating Tamil's feedback.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Reordered header levels for visual clarity.
John Wilkins [Wed, 1 May 2013 00:48:05 +0000 (17:48 -0700)]
doc: Reordered header levels for visual clarity.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed a few typos.
John Wilkins [Wed, 1 May 2013 00:39:50 +0000 (17:39 -0700)]
doc: Fixed a few typos.

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