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 b69e90349d7afdf6b2fac97d9cf6683ec3ac2ef7..4d2d166e194348763e8999c0db0262136cd07fd3 100644 (file)
--- 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";
            }