diff options
| author | Greg Farnum <greg@inktank.com> | 2012-12-11 15:13:44 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-12-13 10:39:19 -0800 |
| commit | c17d628b52971e19af6fd032019b7d811c2f53c3 (patch) | |
| tree | 6b1da16d89407b53d01cbbe86f29af4421d16e53 | |
| parent | e6dd0681d162d46fb4d6b9ed204c7a742676294a (diff) | |
| download | ceph-c17d628b52971e19af6fd032019b7d811c2f53c3.tar.gz | |
clarify/correct some of sample.ceph.conf
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/sample.ceph.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf index dd121f2ee5c..664bec5bf4c 100644 --- a/src/sample.ceph.conf +++ b/src/sample.ceph.conf @@ -4,7 +4,7 @@ ; This file defines cluster membership, the various locations ; that Ceph stores data, and any other runtime options. -; If a 'host' is defined for a daemon, the start/stop script will +; If a 'host' is defined for a daemon, the init.d start/stop script will ; verify that it matches the hostname (or else ignore it). If it is ; not defined, it is assumed that the daemon is intended to start on ; the current host (e.g., in a setup with a startup.conf on each @@ -104,20 +104,19 @@ ; You need at least one. Two if you want data to be replicated. ; Define as many as you like. [osd] - ; This is where the btrfs volume will be mounted. + ; This is where the osd expects its data osd data = /data/$name - ; Ideally, make this a separate disk or partition. A few - ; hundred MB should be enough; more if you have fast or many + ; Ideally, make the journal will be separate disk or partition. + ; 1-10GB should be enough; more if you have fast or many ; disks. You can use a file under the osd data dir if need be ; (e.g. /data/$name/journal), but it will be slower than a ; separate disk or partition. - ; This is an example of a file-based journal. osd journal = /data/$name/journal osd journal size = 1000 ; journal size, in megabytes - ; If you want to run the journal on a tmpfs, disable DirectIO + ; If you want to run the journal on a tmpfs (don't), disable DirectIO ;journal dio = false ; You can change the number of recovery operations to speed up recovery @@ -131,6 +130,9 @@ ;debug filestore = 20 ;debug journal = 20 + + ; ### The below options only apply if you're using mkcephfs + ; ### and the devs options ; The filesystem used on the volumes osd mkfs type = btrfs ; If you want to specify some other mount options, you can do so. @@ -145,9 +147,7 @@ host = delta ; if 'devs' is not specified, you're responsible for - ; setting up the 'osd data' dir. if it is not btrfs, things - ; will behave up until you try to recover from a crash (which - ; usually fine for basic testing). + ; setting up the 'osd data' dir. devs = /dev/sdx [osd.1] |