From: Jos Collin <jcollin@redhat.com>
Date: Tue, 11 Feb 2020 13:21:56 +0000 (+0530)
Subject: src/: fixed error message and dropped variable
X-Git-Tag: v16.1.0~1482^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cec2d3c211c20a6553de22366dc4f8782beb79e;p=ceph.git

src/: fixed error message and dropped variable

Signed-off-by: Jos Collin <jcollin@redhat.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 9fde44000288..72083bcaf00b 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -505,9 +505,8 @@ flushjournal_out:
   }
 
   {
-    auto from_release = require_osd_release;
     ostringstream err;
-    if (!can_upgrade_from(from_release, "require_osd_release", err)) {
+    if (!can_upgrade_from(require_osd_release, "require_osd_release", err)) {
       derr << err.str() << dendl;
       forker.exit(1);
     }
diff --git a/src/common/ceph_releases.cc b/src/common/ceph_releases.cc
index 67264c45aba2..92e58256fc75 100644
--- a/src/common/ceph_releases.cc
+++ b/src/common/ceph_releases.cc
@@ -38,7 +38,7 @@ bool can_upgrade_from(ceph_release_t from_release,
   if (cutoff < to_release) {
     err << "recorded " << from_release_name << " "
         << to_integer<int>(from_release) << " (" << from_release << ") "
-        << "is >2 releases older than installed "
+        << "is more than two releases older than installed "
         << to_integer<int>(to_release) << " (" << to_release << "); "
         << "you can only upgrade 2 releases at a time\n"
         << "you should first upgrade to ";