osd: warn on no osd journal

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 33c4ca0da02b94d5a52adc625645af37e013b5b5..43bf11a91eda966caaee6c55b2451f1a30be217c 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -470,16 +470,15 @@ int FileStore::_sanity_check_fs()
     }    
   }
 
-  if (!journal && g_conf.filestore_max_sync_interval > 2.0) {
-    dout(0) << "mount WARNING: no journal, and max_sync_interval is large (>2seconds)" << dendl;
+  if (!journal) {
+    dout(0) << "mount WARNING: no journal" << dendl;
     cerr << TEXT_YELLOW
-        << " ** WARNING: No journal, and sync interval is large (" << g_conf.filestore_max_sync_interval << ").\n"
-        << "             If you will not be using an osd journal, you should decrease the\n"
-        << "             filestore_max_sync_interval, or else the commit latency will be\n"
-        << "             very high.  For example,\n"
-        << "        filestore max sync interval = .2   ; 200 ms commit interval\n"
+        << " ** WARNING: No osd journal is configured: write latency may be high.\n"
+        << "             If you will not be using an osd journal, write latency may be\n"
+        << "             relatively high.  It can be reduced somewhat by lowering\n"
+        << "             filestore_max_sync_interval, but lower values mean lower write\n"
+        << "             throughput, especially with spinning disks.\n"
         << TEXT_NORMAL;
-
   }
 
   return 0;