filestore: clean up error output

No color codes in the logs!

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 8eb5bd4da5ca41c585bddc5b3262e2b4e7f1e70e..4550bfc849268fc49111881a832475220b4c1b20 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1513,20 +1513,18 @@ int FileStore::mount()
        
        if (cp != curr_seq) {
          if (!m_osd_use_stale_snap) { 
-           derr << TEXT_RED
-                << " ** ERROR: current/ volume data version is not equal to snapshotted version\n"
-                << "           which can lead to data inconsistency. \n"
-                << "           Current version " << curr_seq << ", last snap " << cp << "\n"
-                << "           Startup with snapshotted version can be forced using the\n"
-                <<"            'osd use stale snap = true' config option.\n"
-                << TEXT_NORMAL << dendl;
+           derr << "ERROR: current/ volume data version is not equal to snapshotted version." << dendl;
+           derr << "Current version " << curr_seq << ", last snap " << cp << dendl;
+           derr << "Force rollback to snapshotted version with 'osd use stale snap = true'" << dendl;
+           derr << "config option for --osd-use-stale-snap startup argument." << dendl;
            ret = -ENOTSUP;
            goto close_basedir_fd;
          }
          derr << "WARNING: user forced start with data sequence mismatch: current was " << curr_seq
               << ", newest snap is " << cp << dendl;
          cerr << TEXT_YELLOW
-            << " ** WARNING: forcing the use of stale snapshot data\n" << TEXT_NORMAL;
+              << " ** WARNING: forcing the use of stale snapshot data **"
+              << TEXT_NORMAL << std::endl;
        }
 
         dout(10) << "mount rolling back to consistent snap " << cp << dendl;