From: Sage Weil <sage@newdream.net>
Date: Wed, 21 Apr 2010 22:23:46 +0000 (-0700)
Subject: filestore: default to writeahead journal, and no btrfs snaps
X-Git-Tag: v0.20~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44208739bc9edf068eb0cce28d33dcd7eddae507;p=ceph.git

filestore: default to writeahead journal, and no btrfs snaps

At least until btrfs snap deletion doesn't require a full commit (i.e. each
commit cycle doesn't do a commit for the snap creation AND another for the
old snap deletion).
---

diff --git a/src/config.cc b/src/config.cc
index 4ea68b65545d..54ecfeece36e 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -514,12 +514,12 @@ static struct config_option config_optionsp[] = {
 	OPTION(filestore_fake_collections, 0, OPT_BOOL, false),
 	OPTION(filestore_dev, 0, OPT_STR, 0),
 	OPTION(filestore_btrfs_trans, 0, OPT_BOOL, true),
-	OPTION(filestore_btrfs_snap, 0, OPT_BOOL, true),
+	OPTION(filestore_btrfs_snap, 0, OPT_BOOL, false),
 	OPTION(filestore_flusher, 0, OPT_BOOL, true),
 	OPTION(filestore_flusher_max_fds, 0, OPT_INT, 512),
 	OPTION(filestore_sync_flush, 0, OPT_BOOL, false),
-	OPTION(filestore_journal_parallel, 0, OPT_BOOL, true),
-	OPTION(filestore_journal_writeahead, 0, OPT_BOOL, false),
+	OPTION(filestore_journal_parallel, 0, OPT_BOOL, false),
+	OPTION(filestore_journal_writeahead, 0, OPT_BOOL, true),
 	OPTION(filestore_queue_max_ops, 0, OPT_INT, 500),
 	OPTION(filestore_queue_max_bytes, 0, OPT_INT, 100 << 20),
 	OPTION(filestore_op_threads, 0, OPT_INT, 2),
diff --git a/src/sample.ceph.conf b/src/sample.ceph.conf
index c535711fce51..cd1132660f72 100644
--- a/src/sample.ceph.conf
+++ b/src/sample.ceph.conf
@@ -62,11 +62,6 @@
  	; separate disk or partition.
 	osd journal = /data/osd$id/journal
 
-	; If you are NOT using btrfs, you need writeahead (not
-	; parallel) journaling.
-	;filestore journal parallel = 0
-	;filestore journal writeahead = 1
-
 [osd0]
 	host = delta