]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: fix unused assert's variable in ceph_test_osd_stale_read.cc 32789/head
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 22 Jan 2020 17:39:12 +0000 (18:39 +0100)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Sun, 26 Jan 2020 15:28:58 +0000 (16:28 +0100)
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>
src/test/osd/ceph_test_osd_stale_read.cc

index dc4b63a32f69fa21a11cc8c224d34d96699a2ad8..41b5aa6d348f041cfabc572bf2058ad13a2214fd 100644 (file)
@@ -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)) {