From: Kefu Chai <kchai@redhat.com>
Date: Wed, 23 Nov 2016 05:45:49 +0000 (+0800)
Subject: ReplicatedPG: check retcode before verifying trailing hole
X-Git-Tag: v11.1.0~139^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4d2eb9a20d863a4e4b7b5ff6d1bc70cbc58f3aa5;p=ceph-ci.git

ReplicatedPG: check retcode before verifying trailing hole

this silences the warning of

Value stored to 'r' is never used.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index b69e90349d7..4d2d166e194 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4566,7 +4566,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	    bufferlist t;
 	    uint64_t len = miter->first - last;
 	    r = pgbackend->objects_read_sync(soid, last, len, op.flags, &t);
-	    if (!t.is_zero()) {
+	    if (r < 0) {
+	      osd->clog->error() << coll << " " << soid
+				 << " sparse-read failed to read: "
+				 << r << "\n";
+	    } else if (!t.is_zero()) {
 	      osd->clog->error() << coll << " " << soid << " sparse-read found data in hole "
 				<< last << "~" << len << "\n";
 	    }
@@ -4597,7 +4601,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	    bufferlist t;
 	    uint64_t len = end - last;
 	    r = pgbackend->objects_read_sync(soid, last, len, op.flags, &t);
-	    if (!t.is_zero()) {
+	    if (r < 0) {
+	      osd->clog->error() << coll << " " << soid
+				 << " sparse-read failed to read: "
+				 << r << "\n";
+	    } else if (!t.is_zero()) {
 	      osd->clog->error() << coll << " " << soid << " sparse-read found data in hole "
 				<< last << "~" << len << "\n";
 	    }