From: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
Date: Fri, 27 Apr 2012 23:05:36 +0000 (-0700)
Subject: filestore: fix error message
X-Git-Tag: v0.47~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=510eed0fcd8b95fe833156699ff2f5e2aa0636c6;p=ceph.git

filestore: fix error message

error message was misleading, fixing it.

Signed-off-by: Yehuda Sadeh <yehuda.sadeh@dreamhost.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 1a64d8cc6aa8..287b674443aa 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1783,9 +1783,8 @@ int FileStore::mount()
 	struct stat st;
 	if (::stat(nosnapfn, &st) == 0) {
 	  if (!m_osd_use_stale_snap) {
-	    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 << "ERROR: " << nosnapfn << " exists, not rolling back to avoid losing new data" << dendl;
+	    derr << "Force rollback to old 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;