]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoosd: don't assert if get_omap_iterator() returns NULL 266/head
Yehuda Sadeh [Wed, 8 May 2013 19:18:49 +0000 (12:18 -0700)]
osd: don't assert if get_omap_iterator() returns NULL

Fixes: #4949
This can happen if the object does not exist and it's
a write operation. Just return -ENOENT.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
12 years agorgw: user operation mask
Yehuda Sadeh [Fri, 3 May 2013 04:05:21 +0000 (21:05 -0700)]
rgw: user operation mask

Fixes: #4716
add user operation mask for controlling user permissions.
Also add admin controls for it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoMerge pull request #180 from ceph/wip-rados-clone
Josh Durgin [Wed, 8 May 2013 18:26:04 +0000 (11:26 -0700)]
Merge pull request #180 from ceph/wip-rados-clone

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge pull request #265 from ceph/wip-mon-trace
Sage Weil [Wed, 8 May 2013 18:08:48 +0000 (11:08 -0700)]
Merge pull request #265 from ceph/wip-mon-trace

12 years agomon: set MonitorDBStore options on open 265/head
Sage Weil [Wed, 8 May 2013 18:08:16 +0000 (11:08 -0700)]
mon: set MonitorDBStore options on open

So both ctors set the options.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #254 from ceph/wip-crush-rules
Sage Weil [Wed, 8 May 2013 18:06:18 +0000 (11:06 -0700)]
Merge pull request #254 from ceph/wip-crush-rules

Reviewed-by: Joao Luis <joao.luis@inktank.com>
12 years agoceph-monstore-tool: added replay
Samuel Just [Thu, 2 May 2013 22:23:48 +0000 (15:23 -0700)]
ceph-monstore-tool: added replay

12 years agoceph-monstore-tool: add MonitorDBStore trace dumper
Samuel Just [Thu, 2 May 2013 22:19:06 +0000 (15:19 -0700)]
ceph-monstore-tool: add MonitorDBStore trace dumper

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>
12 years agoMerge pull request #261 from ceph/wip-leveldb
Sage Weil [Wed, 8 May 2013 18:01:51 +0000 (11:01 -0700)]
Merge pull request #261 from ceph/wip-leveldb

Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agodoc/install/os-recs: reverse order of releases
Sage Weil [Wed, 8 May 2013 01:26:40 +0000 (18:26 -0700)]
doc/install/os-recs: reverse order of releases

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #263 from wido/config-get
Sage Weil [Wed, 8 May 2013 01:17:01 +0000 (18:17 -0700)]
Merge pull request #263 from wido/config-get

Add "config get <var>" to the admin

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Fixed typos.
John Wilkins [Wed, 8 May 2013 01:05:28 +0000 (18:05 -0700)]
doc: Fixed typos.

fixes: #4932

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed typo.
John Wilkins [Tue, 7 May 2013 23:11:29 +0000 (16:11 -0700)]
doc: Fixed typo.

fixes: #4422

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Removed "and" as suggested.
John Wilkins [Tue, 7 May 2013 23:08:11 +0000 (16:08 -0700)]
doc: Removed "and" as suggested.

fixes: #3686

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed hyperlink.
John Wilkins [Tue, 7 May 2013 20:48:55 +0000 (13:48 -0700)]
doc: Fixed hyperlink.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed path typo.
John Wilkins [Tue, 7 May 2013 20:43:32 +0000 (13:43 -0700)]
doc: Fixed path typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Updated OS support for Cuttlefish.
John Wilkins [Tue, 7 May 2013 18:49:30 +0000 (11:49 -0700)]
doc: Updated OS support for Cuttlefish.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Minor tweak to the definition list style.
John Wilkins [Tue, 7 May 2013 17:09:15 +0000 (10:09 -0700)]
doc: Minor tweak to the definition list style.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added glossary to TOC.
John Wilkins [Tue, 7 May 2013 14:58:04 +0000 (07:58 -0700)]
doc: Added glossary to TOC.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added glossary.
John Wilkins [Tue, 7 May 2013 14:57:40 +0000 (07:57 -0700)]
doc: Added glossary.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed usage typo.
John Wilkins [Tue, 7 May 2013 14:57:16 +0000 (07:57 -0700)]
doc: Fixed usage typo.

fixes: #4923

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge pull request #262 from gollub/typos
Sage Weil [Tue, 7 May 2013 14:30:44 +0000 (07:30 -0700)]
Merge pull request #262 from gollub/typos

fixed common typo in error messages

12 years agoFix whitespace indentation 263/head
Wido den Hollander [Tue, 7 May 2013 12:26:15 +0000 (14:26 +0200)]
Fix whitespace indentation

Signed-off-by: Wido den Hollander <wido@42on.com>
12 years agoImplement 'config get <var>' for the admin socket
Wido den Hollander [Tue, 7 May 2013 11:56:17 +0000 (13:56 +0200)]
Implement 'config get <var>' for the admin socket

Signed-off-by: Wido den Hollander <wido@42on.com>
12 years agofixed common typo in error messages 262/head
Daniel Gollub [Tue, 7 May 2013 09:55:46 +0000 (11:55 +0200)]
fixed common typo in error messages

Signed-off-by: Daniel Gollub <d.gollub@telekom.de>
12 years agodoc/install/{debian,rpm}: update for cuttlefish
Sage Weil [Tue, 7 May 2013 03:16:23 +0000 (20:16 -0700)]
doc/install/{debian,rpm}: update for cuttlefish

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/start/get-involved: fix links
Sage Weil [Tue, 7 May 2013 03:11:29 +0000 (20:11 -0700)]
doc/start/get-involved: fix links

ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/start/get-involved.rst:33: Unknown target name: "tracker".
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/start/get-involved.rst:43: Unknown target name: "support".

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc/release-notes: I missed rgw rest api in the release notes
Sage Weil [Tue, 7 May 2013 03:07:53 +0000 (20:07 -0700)]
doc/release-notes: I missed rgw rest api in the release notes

Mostly from here dd19d693e6528c70167958ebc57e075200a08803

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 agorados: add whole-object 'clonedata' command 180/head
Sage Weil [Mon, 6 May 2013 23:45:12 +0000 (16:45 -0700)]
rados: add whole-object 'clonedata' command

Clone the data stream from one object to another.

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 agoosd: optionally enable leveldb logging 261/head
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>
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>
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 agoceph: add 'osd crush rule ...' to usage 254/head
Sage Weil [Fri, 3 May 2013 23:08:45 +0000 (16:08 -0700)]
ceph: add 'osd crush rule ...' to usage

Signed-off-by: Sage Weil <sage@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 agomon: generate useful error msgs for 'osd crush rule create-simple ...'
Sage Weil [Fri, 3 May 2013 22:54:19 +0000 (15:54 -0700)]
mon: generate useful error msgs for 'osd crush rule create-simple ...'

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agocrush: return -1 on error from get_type_id
Sage Weil [Fri, 3 May 2013 22:26:22 +0000 (15:26 -0700)]
crush: return -1 on error from get_type_id

So we can distinguish between a bad type name and type 0.

Fix both callers, too.

Signed-off-by: Sage Weil <sage@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>