From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 22 Jan 2020 17:39:12 +0000 (+0100)
Subject: test: fix unused assert's variable in ceph_test_osd_stale_read.cc
X-Git-Tag: v15.1.1~600^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd7640dc53c010bc3494a5f410ca6389089e43df;p=ceph.git

test: fix unused assert's variable in ceph_test_osd_stale_read.cc

This rectifies:
```
ceph_test_osd_stale_read.cc:39:7: warning: unused variable ‘r’ [-Wunused-variable]
   int r = rados.mon_command(cmd, inbl, &outbl, NULL);
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/test/osd/ceph_test_osd_stale_read.cc b/src/test/osd/ceph_test_osd_stale_read.cc
index dc4b63a32f69..41b5aa6d348f 100644
--- a/src/test/osd/ceph_test_osd_stale_read.cc
+++ b/src/test/osd/ceph_test_osd_stale_read.cc
@@ -36,8 +36,10 @@ int get_primary_osd(Rados& rados, const string& pool_name,
     + oid
     + string("\",\"format\": \"json\"}");
   bufferlist outbl;
-  int r = rados.mon_command(cmd, inbl, &outbl, NULL);
-  assert(r >= 0);
+  if (int r = rados.mon_command(cmd, inbl, &outbl, nullptr);
+      r < 0) {
+    return r;
+  }
   string outstr(outbl.c_str(), outbl.length());
   json_spirit::Value v;
   if (!json_spirit::read(outstr, v)) {