From 4d2eb9a20d863a4e4b7b5ff6d1bc70cbc58f3aa5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 23 Nov 2016 13:45:49 +0800 Subject: [PATCH] ReplicatedPG: check retcode before verifying trailing hole this silences the warning of Value stored to 'r' is never used. Signed-off-by: Kefu Chai --- src/osd/ReplicatedPG.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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& 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& 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"; } -- 2.39.5