librados, test: Have write, append and write_full return 0 on success

Fix consistency of write, append, write_full, all return 0 on success
Include C (rados_*) variants, C++ ctx variants
and aio get_return_value() and rados_aio_get_return_value()

Signed-off-by: David Zafman <david.zafman@inktank.com>

diff --git a/doc/release-notes.rst b/doc/release-notes.rst
index a589c1f498d022e08c7580fb4e4bfb6e33fc3e95..6b56eecb41d5f6bffa47bc4ec61d4d5dffcde42d 100644 (file)
--- a/doc/release-notes.rst
+++ b/doc/release-notes.rst
@@ -30,6 +30,11 @@ Upgrade Sequencing
   for multipart uploads that prevents a multipart request that was initiated
   with a new radosgw from being completed by an old radosgw.
 
+* Librados interface change:  As there are no partial writes, the rados_write()
+  and rados_append() operations now return 0 on success like rados_write_full()
+  always has.  This includes the C++ interface equivalents and AIO return
+  values for the aio variants.
+
 Upgrading from v0.79
 --------------------
 

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 40124b922deb9d93be12d8947aaf53486bae3774..80d2574360cc35e7545094ace5e295d601be1eb5 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -1064,8 +1064,7 @@ uint64_t rados_get_last_version(rados_ioctx_t io);
  * @param buf data to write
  * @param len length of the data, in bytes
  * @param off byte offset in the object to begin writing at
- * @returns number of bytes written on success, negative error code on
- * failure
+ * @returns 0 on success, negative error code on failure
  */
 int rados_write(rados_ioctx_t io, const char *oid, const char *buf, size_t len, uint64_t off);
 
@@ -1111,8 +1110,7 @@ int rados_clone_range(rados_ioctx_t io, const char *dst, uint64_t dst_off,
  * @param oid the name of the object
  * @param buf the data to append
  * @param len length of buf (in bytes)
- * @returns number of bytes written on success, negative error code on
- * failure
+ * @returns 0 on success, negative error code on failure
  */
 int rados_append(rados_ioctx_t io, const char *oid, const char *buf, size_t len);
 

diff --git a/src/librados/AioCompletionImpl.h b/src/librados/AioCompletionImpl.h
index 521f3bc153b00a1ca287fc6b4919f5fa848cda3a..39a0d70d1f08e4d710981fd2189649e06b6444e0 100644 (file)
--- a/src/librados/AioCompletionImpl.h
+++ b/src/librados/AioCompletionImpl.h
@@ -40,7 +40,6 @@ struct librados::AioCompletionImpl {
   // for read
   bool is_read;
   bufferlist bl;
-  unsigned maxlen;
 
   IoCtxImpl *io;
   ceph_tid_t aio_write_seq;
@@ -53,7 +52,7 @@ struct librados::AioCompletionImpl {
                        callback_safe(0),
                        callback_complete_arg(0),
                        callback_safe_arg(0),
-                       is_read(false), maxlen(0),
+                       is_read(false),
                        io(NULL), aio_write_seq(0), aio_write_list_item(this) { }
 
   int set_complete_callback(void *cb_arg, rados_callback_t cb) {

diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc
index 4f5387aa578c49e1f641a51a0981a9186383a989..08db0e6a0a6df2d3b038ca4a86d61b550372c845 100644 (file)
--- a/src/librados/IoCtxImpl.cc
+++ b/src/librados/IoCtxImpl.cc
@@ -460,11 +460,7 @@ int librados::IoCtxImpl::write(const object_t& oid, bufferlist& bl,
   bufferlist mybl;
   mybl.substr_of(bl, 0, len);
   op.write(off, mybl);
-  int r =  operate(oid, &op, NULL);
-  if (r < 0)
-    return r;
-
-  return len;
+  return operate(oid, &op, NULL);
 }
 
 int librados::IoCtxImpl::append(const object_t& oid, bufferlist& bl, size_t len)
@@ -474,11 +470,7 @@ int librados::IoCtxImpl::append(const object_t& oid, bufferlist& bl, size_t len)
   bufferlist mybl;
   mybl.substr_of(bl, 0, len);
   op.append(mybl);
-  int r = operate(oid, &op, NULL);
-  if (r < 0)
-    return r;
-
-  return len;
+  return operate(oid, &op, NULL);
 }
 
 int librados::IoCtxImpl::write_full(const object_t& oid, bufferlist& bl)
@@ -655,7 +647,6 @@ int librados::IoCtxImpl::aio_read(const object_t oid, AioCompletionImpl *c,
 
   c->is_read = true;
   c->io = this;
-  c->maxlen = len;
   c->bl.clear();
   c->bl.push_back(buffer::create_static(len, buf));
 

diff --git a/src/pybind/rados.py b/src/pybind/rados.py
index 098e200c889f91557c7c03ad27f4f2b3d07a4db0..9fd0324ae766dd06a3b7beac23c8ea76a5812bfb 100644 (file)
--- a/src/pybind/rados.py
+++ b/src/pybind/rados.py
@@ -1205,7 +1205,6 @@ class Ioctx(object):
         :type offset: int
 
         :raises: :class:`TypeError`
-        :raises: :class:`IncompleteWriteError`
         :raises: :class:`LogicError`
         :returns: int - number of bytes written 
         """
@@ -1216,18 +1215,14 @@ class Ioctx(object):
         ret = run_in_thread(self.librados.rados_write,
                             (self.io, c_char_p(key), c_char_p(data),
                             c_size_t(length), c_uint64(offset)))
-        if ret == length:
+        if ret == 0:
             return ret
         elif ret < 0:
             raise make_ex(ret, "Ioctx.write(%s): failed to write %s" % \
                 (self.name, key))
-        elif ret < length:
-            raise IncompleteWriteError("Wrote only %d out of %d bytes" % \
-                (ret, length))
         else:
             raise LogicError("Ioctx.write(%s): rados_write \
-returned %d, but %d was the maximum number of bytes it could have \
-written." % (self.name, ret, length))
+returned %d, but should return zero on success." % (self.name, ret))
 
     def write_full(self, key, data):
         """
@@ -1256,9 +1251,12 @@ written." % (self.name, ret, length))
                             c_size_t(length)))
         if ret == 0:
             return ret
-        else:
-            raise make_ex(ret, "Ioctx.write(%s): failed to write_full %s" % \
+        elif ret < 0:
+            raise make_ex(ret, "Ioctx.write_full(%s): failed to write %s" % \
                 (self.name, key))
+        else:
+            raise LogicError("Ioctx.write_full(%s): rados_write_full \
+returned %d, but should return zero on success." % (self.name, ret))
 
     def read(self, key, length=8192, offset=0):
         """

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index efa44fcff5dd00c1bb4b5b7a31017baab2e26325..48cfb33a9e1c5b14f9b1f1768313475a6c8f904d 100644 (file)
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -869,7 +869,7 @@ TEST(cls_rbd, snapid_race)
   bl.append(bp);
 
   string oid = "foo";
-  ASSERT_EQ(4096, ioctx.write(oid, bl, 4096, 0));
+  ASSERT_EQ(0, ioctx.write(oid, bl, 4096, 0));
   ASSERT_EQ(0, old_snapshot_add(&ioctx, oid, 1, "test1"));
   ASSERT_EQ(0, old_snapshot_add(&ioctx, oid, 3, "test3"));
   ASSERT_EQ(-ESTALE, old_snapshot_add(&ioctx, oid, 2, "test2"));

diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc
index 106f6b4f162d99e36f5641da4393d2e1025117a3..3ca31f4ce42e9e4a2727f4c8b765e33f715ad969 100644 (file)
--- a/src/test/librados/c_read_operations.cc
+++ b/src/test/librados/c_read_operations.cc
@@ -16,7 +16,7 @@ class CReadOpsTest : public RadosTest {
 protected:
   void write_object() {
     // Create an object and write to it
-    ASSERT_EQ(len, rados_write(ioctx, obj, data, len, 0));
+    ASSERT_EQ(0, rados_write(ioctx, obj, data, len, 0));
   }
   void remove_object() {
     ASSERT_EQ(0, rados_remove(ioctx, obj));

diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc
index ebad7c7880672cbc0651e712c57799b5bada2496..a8e311d6de0ac704656efea5f753e75b15ed4907 100644 (file)
--- a/src/test/librados/io.cc
+++ b/src/test/librados/io.cc
@@ -20,9 +20,9 @@ typedef RadosTestECPP LibRadosIoECPP;
 TEST_F(LibRadosIo, SimpleWrite) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "nspace");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
 }
 
 TEST_F(LibRadosIoPP, SimpleWritePP) {
@@ -30,9 +30,9 @@ TEST_F(LibRadosIoPP, SimpleWritePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   ioctx.set_namespace("nspace");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
 }
 
 TEST_F(LibRadosIoPP, ReadOpPP) {
@@ -40,7 +40,7 @@ TEST_F(LibRadosIoPP, ReadOpPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
 
   {
       bufferlist op_bl;
@@ -161,7 +161,7 @@ TEST_F(LibRadosIo, RoundTrip) {
   char buf[128];
   char buf2[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   memset(buf2, 0, sizeof(buf2));
   ASSERT_EQ((int)sizeof(buf2), rados_read(ioctx, "foo", buf2, sizeof(buf2), 0));
   ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf)));
@@ -169,14 +169,13 @@ TEST_F(LibRadosIo, RoundTrip) {
 
 TEST_F(LibRadosIoPP, RoundTripPP) {
   char buf[128];
-  char buf2[128];
   Rados cluster;
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   bufferlist cl;
-  ASSERT_EQ((int)sizeof(buf2), ioctx.read("foo", cl, sizeof(buf), 0));
+  ASSERT_EQ((int)sizeof(buf), ioctx.read("foo", cl, sizeof(buf), 0));
   ASSERT_EQ(0, memcmp(buf, cl.c_str(), sizeof(buf)));
 }
 
@@ -185,9 +184,9 @@ TEST_F(LibRadosIo, OverlappingWriteRoundTrip) {
   char buf2[64];
   char buf3[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
   memset(buf3, 0xdd, sizeof(buf3));
   ASSERT_EQ((int)sizeof(buf3), rados_read(ioctx, "foo", buf3, sizeof(buf3), 0));
   ASSERT_EQ(0, memcmp(buf3, buf2, sizeof(buf2)));
@@ -200,11 +199,11 @@ TEST_F(LibRadosIoPP, OverlappingWriteRoundTripPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), 0));
   bufferlist bl3;
   ASSERT_EQ((int)sizeof(buf), ioctx.read("foo", bl3, sizeof(buf), 0));
   ASSERT_EQ(0, memcmp(bl3.c_str(), buf2, sizeof(buf2)));
@@ -216,7 +215,7 @@ TEST_F(LibRadosIo, WriteFullRoundTrip) {
   char buf2[64];
   char buf3[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
   ASSERT_EQ(0, rados_write_full(ioctx, "foo", buf2, sizeof(buf2)));
   memset(buf3, 0xdd, sizeof(buf3));
@@ -230,7 +229,7 @@ TEST_F(LibRadosIoPP, WriteFullRoundTripPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
@@ -245,9 +244,9 @@ TEST_F(LibRadosIo, AppendRoundTrip) {
   char buf2[64];
   char buf3[sizeof(buf) + sizeof(buf2)];
   memset(buf, 0xde, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   memset(buf2, 0xad, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), rados_append(ioctx, "foo", buf2, sizeof(buf2)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf2, sizeof(buf2)));
   memset(buf3, 0, sizeof(buf3));
   ASSERT_EQ((int)sizeof(buf3), rados_read(ioctx, "foo", buf3, sizeof(buf3), 0));
   ASSERT_EQ(0, memcmp(buf3, buf, sizeof(buf)));
@@ -260,11 +259,11 @@ TEST_F(LibRadosIoPP, AppendRoundTripPP) {
   memset(buf, 0xde, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   memset(buf2, 0xad, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.append("foo", bl2, sizeof(buf2)));
+  ASSERT_EQ(0, ioctx.append("foo", bl2, sizeof(buf2)));
   bufferlist bl3;
   ASSERT_EQ((int)(sizeof(buf) + sizeof(buf2)),
            ioctx.read("foo", bl3, (sizeof(buf) + sizeof(buf2)), 0));
@@ -277,7 +276,7 @@ TEST_F(LibRadosIo, TruncTest) {
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0, rados_trunc(ioctx, "foo", sizeof(buf) / 2));
   memset(buf2, 0, sizeof(buf2));
   ASSERT_EQ((int)(sizeof(buf)/2), rados_read(ioctx, "foo", buf2, sizeof(buf2), 0));
@@ -289,7 +288,7 @@ TEST_F(LibRadosIoPP, TruncTestPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl, sizeof(buf)));
   ASSERT_EQ(0, ioctx.trunc("foo", sizeof(buf) / 2));
   bufferlist bl2;
   ASSERT_EQ((int)(sizeof(buf)/2), ioctx.read("foo", bl2, sizeof(buf), 0));
@@ -300,7 +299,7 @@ TEST_F(LibRadosIo, RemoveTest) {
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0, rados_remove(ioctx, "foo"));
   memset(buf2, 0, sizeof(buf2));
   ASSERT_EQ(-ENOENT, rados_read(ioctx, "foo", buf2, sizeof(buf2), 0));
@@ -311,7 +310,7 @@ TEST_F(LibRadosIoPP, RemoveTestPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   ASSERT_EQ(0, ioctx.remove("foo"));
   bufferlist bl2;
   ASSERT_EQ(-ENOENT, ioctx.read("foo", bl2, sizeof(buf), 0));
@@ -322,7 +321,7 @@ TEST_F(LibRadosIo, XattrsRoundTrip) {
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(-ENODATA, rados_getxattr(ioctx, "foo", attr1, buf, sizeof(buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ((int)sizeof(attr1_buf),
@@ -337,7 +336,7 @@ TEST_F(LibRadosIoPP, XattrsRoundTripPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   ASSERT_EQ(-ENODATA, ioctx.getxattr("foo", attr1, bl2));
   bufferlist bl3;
@@ -354,7 +353,7 @@ TEST_F(LibRadosIo, RmXattr) {
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0,
       rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ(0, rados_rmxattr(ioctx, "foo", attr1));
@@ -368,7 +367,7 @@ TEST_F(LibRadosIoPP, RmXattrPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   bl2.append(attr1_buf, sizeof(attr1_buf));
   ASSERT_EQ(0, ioctx.setxattr("foo", attr1, bl2));
@@ -387,7 +386,7 @@ TEST_F(LibRadosIo, XattrIter) {
     attr2_buf[j] = j % 0xff;
   }
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr2, attr2_buf, sizeof(attr2_buf)));
   rados_xattrs_iter_t iter;
@@ -429,7 +428,7 @@ TEST_F(LibRadosIoPP, XattrListPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   bl2.append(attr1_buf, sizeof(attr1_buf));
   ASSERT_EQ(0, ioctx.setxattr("foo", attr1, bl2));
@@ -455,9 +454,9 @@ TEST_F(LibRadosIoPP, XattrListPP) {
 TEST_F(LibRadosIoEC, SimpleWrite) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "nspace");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
 }
 
 TEST_F(LibRadosIoECPP, SimpleWritePP) {
@@ -465,9 +464,9 @@ TEST_F(LibRadosIoECPP, SimpleWritePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   ioctx.set_namespace("nspace");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
 }
 
 TEST_F(LibRadosIoECPP, ReadOpPP) {
@@ -475,7 +474,7 @@ TEST_F(LibRadosIoECPP, ReadOpPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
 
   {
       bufferlist op_bl;
@@ -596,7 +595,7 @@ TEST_F(LibRadosIoEC, RoundTrip) {
   char buf[128];
   char buf2[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   memset(buf2, 0, sizeof(buf2));
   ASSERT_EQ((int)sizeof(buf2), rados_read(ioctx, "foo", buf2, sizeof(buf2), 0));
   ASSERT_EQ(0, memcmp(buf, buf2, sizeof(buf)));
@@ -604,14 +603,13 @@ TEST_F(LibRadosIoEC, RoundTrip) {
 
 TEST_F(LibRadosIoECPP, RoundTripPP) {
   char buf[128];
-  char buf2[128];
   Rados cluster;
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   bufferlist cl;
-  ASSERT_EQ((int)sizeof(buf2), ioctx.read("foo", cl, sizeof(buf), 0));
+  ASSERT_EQ((int)sizeof(buf), ioctx.read("foo", cl, sizeof(buf) * 3, 0));
   ASSERT_EQ(0, memcmp(buf, cl.c_str(), sizeof(buf)));
 }
 
@@ -622,7 +620,7 @@ TEST_F(LibRadosIoEC, OverlappingWriteRoundTrip) {
   char *buf2 = (char *)new char[bsize];
   char *buf3 = (char *)new char[dbsize];
   memset(buf, 0xcc, dbsize);
-  ASSERT_EQ(dbsize, rados_write(ioctx, "foo", buf, dbsize, 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, dbsize, 0));
   memset(buf2, 0xdd, sizeof(buf2));
   ASSERT_EQ(-EOPNOTSUPP, rados_write(ioctx, "foo", buf2, bsize, 0));
   memset(buf3, 0xdd, sizeof(buf3));
@@ -643,7 +641,7 @@ TEST_F(LibRadosIoECPP, OverlappingWriteRoundTripPP) {
   memset(buf, 0xcc, dbsize);
   bufferlist bl1;
   bl1.append(buf, dbsize);
-  ASSERT_EQ(dbsize, ioctx.write("foo", bl1, dbsize, 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, dbsize, 0));
   memset(buf2, 0xdd, bsize);
   bufferlist bl2;
   bl2.append(buf2, bsize);
@@ -662,12 +660,12 @@ TEST_F(LibRadosIoEC, WriteFullRoundTrip) {
   char buf2[64];
   char buf3[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
   ASSERT_EQ(0, rados_write_full(ioctx, "foo", buf2, sizeof(buf2)));
-  memset(buf3, 0xdd, sizeof(buf3));
+  memset(buf3, 0xee, sizeof(buf3));
   ASSERT_EQ((int)sizeof(buf2), rados_read(ioctx, "foo", buf3, sizeof(buf3), 0));
-  ASSERT_EQ(0, memcmp(buf2, buf2, sizeof(buf2)));
+  ASSERT_EQ(0, memcmp(buf3, buf2, sizeof(buf2)));
 }
 
 TEST_F(LibRadosIoECPP, WriteFullRoundTripPP) {
@@ -676,7 +674,7 @@ TEST_F(LibRadosIoECPP, WriteFullRoundTripPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   memset(buf2, 0xdd, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
@@ -691,9 +689,9 @@ TEST_F(LibRadosIoEC, AppendRoundTrip) {
   char *buf2 = (char *)new char[alignment];
   char *buf3 = (char *)new char[alignment *2];
   memset(buf, 0xde, alignment);
-  ASSERT_EQ((int)alignment, rados_append(ioctx, "foo", buf, alignment));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, alignment));
   memset(buf2, 0xad, alignment);
-  ASSERT_EQ((int)alignment, rados_append(ioctx, "foo", buf2, alignment));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf2, alignment));
   memset(buf3, 0, alignment*2);
   ASSERT_EQ((int)alignment*2, rados_read(ioctx, "foo", buf3, alignment*2, 0));
   ASSERT_EQ(0, memcmp(buf3, buf, alignment));
@@ -710,14 +708,14 @@ TEST_F(LibRadosIoECPP, AppendRoundTripPP) {
   memset(buf, 0xde, alignment);
   bufferlist bl1;
   bl1.append(buf, alignment);
-  ASSERT_EQ((int)alignment, ioctx.append("foo", bl1, alignment));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, alignment));
   memset(buf2, 0xad, alignment);
   bufferlist bl2;
   bl2.append(buf2, alignment);
-  ASSERT_EQ((int)alignment, ioctx.append("foo", bl2, alignment));
+  ASSERT_EQ(0, ioctx.append("foo", bl2, alignment));
   bufferlist bl3;
   ASSERT_EQ((int)(alignment * 2),
-           ioctx.read("foo", bl3, (alignment * 2), 0));
+           ioctx.read("foo", bl3, (alignment * 4), 0));
   const char *bl3_str = bl3.c_str();
   ASSERT_EQ(0, memcmp(bl3_str, buf, alignment));
   ASSERT_EQ(0, memcmp(bl3_str + alignment, buf2, alignment));
@@ -730,7 +728,7 @@ TEST_F(LibRadosIoEC, TruncTest) {
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(-EOPNOTSUPP, rados_trunc(ioctx, "foo", sizeof(buf) / 2));
   memset(buf2, 0, sizeof(buf2));
   // Same size
@@ -744,7 +742,7 @@ TEST_F(LibRadosIoECPP, TruncTestPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl, sizeof(buf)));
   ASSERT_EQ(-EOPNOTSUPP, ioctx.trunc("foo", sizeof(buf) / 2));
   bufferlist bl2;
   // Same size
@@ -757,7 +755,7 @@ TEST_F(LibRadosIoEC, RemoveTest) {
   char buf[128];
   char buf2[sizeof(buf)];
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0, rados_remove(ioctx, "foo"));
   memset(buf2, 0, sizeof(buf2));
   ASSERT_EQ(-ENOENT, rados_read(ioctx, "foo", buf2, sizeof(buf2), 0));
@@ -768,7 +766,7 @@ TEST_F(LibRadosIoECPP, RemoveTestPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   ASSERT_EQ(0, ioctx.remove("foo"));
   bufferlist bl2;
   ASSERT_EQ(-ENOENT, ioctx.read("foo", bl2, sizeof(buf), 0));
@@ -779,7 +777,7 @@ TEST_F(LibRadosIoEC, XattrsRoundTrip) {
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(-ENODATA, rados_getxattr(ioctx, "foo", attr1, buf, sizeof(buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ((int)sizeof(attr1_buf),
@@ -794,7 +792,7 @@ TEST_F(LibRadosIoECPP, XattrsRoundTripPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   ASSERT_EQ(-ENODATA, ioctx.getxattr("foo", attr1, bl2));
   bufferlist bl3;
@@ -811,7 +809,7 @@ TEST_F(LibRadosIoEC, RmXattr) {
   char attr1[] = "attr1";
   char attr1_buf[] = "foo bar baz";
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0,
       rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ(0, rados_rmxattr(ioctx, "foo", attr1));
@@ -825,7 +823,7 @@ TEST_F(LibRadosIoECPP, RmXattrPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   bl2.append(attr1_buf, sizeof(attr1_buf));
   ASSERT_EQ(0, ioctx.setxattr("foo", attr1, bl2));
@@ -844,7 +842,7 @@ TEST_F(LibRadosIoEC, XattrIter) {
     attr2_buf[j] = j % 0xff;
   }
   memset(buf, 0xaa, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_append(ioctx, "foo", buf, sizeof(buf)));
+  ASSERT_EQ(0, rados_append(ioctx, "foo", buf, sizeof(buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr1, attr1_buf, sizeof(attr1_buf)));
   ASSERT_EQ(0, rados_setxattr(ioctx, "foo", attr2, attr2_buf, sizeof(attr2_buf)));
   rados_xattrs_iter_t iter;
@@ -886,7 +884,7 @@ TEST_F(LibRadosIoECPP, XattrListPP) {
   memset(buf, 0xaa, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.append("foo", bl1, sizeof(buf)));
+  ASSERT_EQ(0, ioctx.append("foo", bl1, sizeof(buf)));
   bufferlist bl2;
   bl2.append(attr1_buf, sizeof(attr1_buf));
   ASSERT_EQ(0, ioctx.setxattr("foo", attr1, bl2));

diff --git a/src/test/librados/list.cc b/src/test/librados/list.cc
index 2e400d5724961a4b1a8b6b23808e380dd8540796..e3fe007f860cc73e76b00425b4492ede003df49c 100644 (file)
--- a/src/test/librados/list.cc
+++ b/src/test/librados/list.cc
@@ -20,7 +20,7 @@ typedef RadosTestECPP LibRadosListECPP;
 TEST_F(LibRadosList, ListObjects) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   rados_list_ctx_t ctx;
   ASSERT_EQ(0, rados_objects_list_open(ioctx, &ctx));
   const char *entry;
@@ -38,7 +38,7 @@ TEST_F(LibRadosListPP, ListObjectsPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ObjectIterator iter(ioctx.objects_begin());
   bool foundit = false;
   while (iter != ioctx.objects_end()) {
@@ -54,7 +54,7 @@ TEST_F(LibRadosListPP, ListObjectsTwicePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ObjectIterator iter(ioctx.objects_begin());
   bool foundit = false;
   while (iter != ioctx.objects_end()) {
@@ -80,7 +80,7 @@ TEST_F(LibRadosListPP, ListObjectsCopyIterPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   // make sure this is still valid after the original iterators are gone
   ObjectIterator iter3;
@@ -112,7 +112,7 @@ TEST_F(LibRadosListPP, ListObjectsEndIter) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   ObjectIterator iter(ioctx.objects_begin());
   ObjectIterator iter_end(ioctx.objects_end());
@@ -154,18 +154,18 @@ TEST_F(LibRadosList, ListObjectsNS) {
   memset(buf, 0xcc, sizeof(buf));
   // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
 
   std::set<std::string> def, ns1, ns2;
   def.insert(std::string("foo1"));
@@ -222,18 +222,18 @@ TEST_F(LibRadosListPP, ListObjectsPPNS) {
   bl1.append(buf, sizeof(buf));
   // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo1", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns1");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo1", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo2", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo3", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo2", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo3", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns1");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo4", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo5", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo4", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo5", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns2");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo6", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo7", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo6", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo7", bl1, sizeof(buf), 0));
 
   std::set<std::string> def, ns1, ns2;
   def.insert(std::string("foo1"));
@@ -262,7 +262,7 @@ TEST_F(LibRadosListPP, ListObjectsManyPP) {
   bl.append(buf, sizeof(buf));
 
   for (int i=0; i<256; ++i) {
-    ASSERT_EQ((int)sizeof(buf), ioctx.write(stringify(i), bl, bl.length(), 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
   }
 
   librados::ObjectIterator it = ioctx.objects_begin();
@@ -287,7 +287,7 @@ TEST_F(LibRadosList, ListObjectsStart) {
 
   for (int i=0; i<16; ++i) {
     string n = stringify(i);
-    ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
+    ASSERT_EQ(0, rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
   }
 
   rados_list_ctx_t ctx;
@@ -321,7 +321,7 @@ TEST_F(LibRadosListPP, ListObjectsStartPP) {
   bl.append(buf, sizeof(buf));
 
   for (int i=0; i<16; ++i) {
-    ASSERT_EQ((int)sizeof(buf), ioctx.write(stringify(i), bl, bl.length(), 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
   }
 
   librados::ObjectIterator it = ioctx.objects_begin();
@@ -345,7 +345,7 @@ TEST_F(LibRadosListPP, ListObjectsStartPP) {
 TEST_F(LibRadosListEC, ListObjects) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   rados_list_ctx_t ctx;
   ASSERT_EQ(0, rados_objects_list_open(ioctx, &ctx));
   const char *entry;
@@ -363,7 +363,7 @@ TEST_F(LibRadosListECPP, ListObjectsPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ObjectIterator iter(ioctx.objects_begin());
   bool foundit = false;
   while (iter != ioctx.objects_end()) {
@@ -379,7 +379,7 @@ TEST_F(LibRadosListECPP, ListObjectsTwicePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ObjectIterator iter(ioctx.objects_begin());
   bool foundit = false;
   while (iter != ioctx.objects_end()) {
@@ -405,7 +405,7 @@ TEST_F(LibRadosListECPP, ListObjectsCopyIterPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   // make sure this is still valid after the original iterators are gone
   ObjectIterator iter3;
@@ -437,7 +437,7 @@ TEST_F(LibRadosListECPP, ListObjectsEndIter) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   ObjectIterator iter(ioctx.objects_begin());
   ObjectIterator iter_end(ioctx.objects_end());
@@ -462,18 +462,18 @@ TEST_F(LibRadosListEC, ListObjectsNS) {
   memset(buf, 0xcc, sizeof(buf));
   // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
   rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
 
   std::set<std::string> def, ns1, ns2;
   def.insert(std::string("foo1"));
@@ -512,18 +512,18 @@ TEST_F(LibRadosListECPP, ListObjectsPPNS) {
   bl1.append(buf, sizeof(buf));
   // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo1", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns1");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo1", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo2", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo3", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo2", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo3", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns1");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo4", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo5", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo4", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo5", bl1, sizeof(buf), 0));
   ioctx.set_namespace("ns2");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo6", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo7", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo6", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo7", bl1, sizeof(buf), 0));
 
   std::set<std::string> def, ns1, ns2;
   def.insert(std::string("foo1"));
@@ -552,7 +552,7 @@ TEST_F(LibRadosListECPP, ListObjectsManyPP) {
   bl.append(buf, sizeof(buf));
 
   for (int i=0; i<256; ++i) {
-    ASSERT_EQ((int)sizeof(buf), ioctx.write(stringify(i), bl, bl.length(), 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
   }
 
   librados::ObjectIterator it = ioctx.objects_begin();
@@ -577,7 +577,7 @@ TEST_F(LibRadosListEC, ListObjectsStart) {
 
   for (int i=0; i<16; ++i) {
     string n = stringify(i);
-    ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
+    ASSERT_EQ(0, rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
   }
 
   rados_list_ctx_t ctx;
@@ -611,7 +611,7 @@ TEST_F(LibRadosListECPP, ListObjectsStartPP) {
   bl.append(buf, sizeof(buf));
 
   for (int i=0; i<16; ++i) {
-    ASSERT_EQ((int)sizeof(buf), ioctx.write(stringify(i), bl, bl.length(), 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
   }
 
   librados::ObjectIterator it = ioctx.objects_begin();

diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index aff9bb30c21e8a81ae1e63220631a7a15f807966..f0f8447748f5c65b600917cd46c94074e477c4c4 100644 (file)
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -289,7 +289,7 @@ TEST_F(LibRadosMiscPP, Tmap2OmapPP) {
 TEST_F(LibRadosMisc, Exec) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   char buf2[512];
   int res = rados_exec(ioctx, "foo", "rbd", "get_all_features",
                          NULL, 0, buf2, sizeof(buf2));
@@ -378,7 +378,7 @@ TEST_F(LibRadosMiscPP, Operate2PP) {
 TEST_F(LibRadosMiscPP, BigObjectPP) {
   bufferlist bl;
   bl.append("abcdefg");
-  ASSERT_EQ((int)bl.length(), ioctx.write("foo", bl, bl.length(), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, bl.length(), 0));
 
   {
     ObjectWriteOperation o;
@@ -451,7 +451,7 @@ TEST_F(LibRadosMiscPP, CloneRangePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ(sizeof(buf), (size_t)ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, (size_t)ioctx.write("foo", bl, sizeof(buf), 0));
   ioctx.locator_set_key("foo");
   ASSERT_EQ(0, ioctx.clone_range("bar", 0, "foo", 0, sizeof(buf)));
   bufferlist bl2;
@@ -462,7 +462,7 @@ TEST_F(LibRadosMiscPP, CloneRangePP) {
 TEST_F(LibRadosMisc, CloneRange) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "src", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "src", buf, sizeof(buf), 0));
   rados_ioctx_locator_set_key(ioctx, "src");
   ASSERT_EQ(0, rados_clone_range(ioctx, "dst", 0, "src", 0, sizeof(buf)));
   char buf2[sizeof(buf)];

diff --git a/src/test/librados/snapshots.cc b/src/test/librados/snapshots.cc
index 436b9182209de7c146fe392a22e9fc556dc2b6dc..e490a088379b68a6a1b3fc5e1c548f30a01636fc 100644 (file)
--- a/src/test/librados/snapshots.cc
+++ b/src/test/librados/snapshots.cc
@@ -24,7 +24,7 @@ const int bufsize = 128;
 TEST_F(LibRadosSnapshots, SnapList) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   rados_snap_t snaps[10];
   EXPECT_EQ(1, rados_ioctx_snap_list(ioctx, snaps,
@@ -40,7 +40,7 @@ TEST_F(LibRadosSnapshotsPP, SnapListPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   std::vector<snap_t> snaps;
   EXPECT_EQ(0, ioctx.snap_list(&snaps));
@@ -54,7 +54,7 @@ TEST_F(LibRadosSnapshotsPP, SnapListPP) {
 TEST_F(LibRadosSnapshots, SnapRemove) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   rados_snap_t rid;
   ASSERT_EQ(0, rados_ioctx_snap_lookup(ioctx, "snap1", &rid));
@@ -68,7 +68,7 @@ TEST_F(LibRadosSnapshotsPP, SnapRemovePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   rados_snap_t rid;
   ASSERT_EQ(0, ioctx.snap_lookup("snap1", &rid));
@@ -79,7 +79,7 @@ TEST_F(LibRadosSnapshotsPP, SnapRemovePP) {
 TEST_F(LibRadosSnapshots, Rollback) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
@@ -96,7 +96,7 @@ TEST_F(LibRadosSnapshotsPP, RollbackPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
@@ -113,7 +113,7 @@ TEST_F(LibRadosSnapshotsPP, RollbackPP) {
 TEST_F(LibRadosSnapshots, SnapGetName) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snapfoo"));
   rados_snap_t rid;
   EXPECT_EQ(0, rados_ioctx_snap_lookup(ioctx, "snapfoo", &rid));
@@ -132,7 +132,7 @@ TEST_F(LibRadosSnapshotsPP, SnapGetNamePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snapfoo"));
   rados_snap_t rid;
   EXPECT_EQ(0, ioctx.snap_lookup("snapfoo", &rid));
@@ -155,7 +155,7 @@ TEST_F(LibRadosSnapshotsSelfManaged, Snap) {
   ::std::reverse(my_snaps.begin(), my_snaps.end());
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
@@ -165,7 +165,7 @@ TEST_F(LibRadosSnapshotsSelfManaged, Snap) {
   ::std::reverse(my_snaps.begin(), my_snaps.end());
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
   rados_ioctx_snap_set_read(ioctx, my_snaps[1]-1);
   char buf3[sizeof(buf)];
   ASSERT_EQ(-ENOENT, rados_read(ioctx, "foo", buf3, sizeof(buf3), 0));
@@ -192,7 +192,7 @@ TEST_F(LibRadosSnapshotsSelfManaged, Rollback) {
   ::std::reverse(my_snaps.begin(), my_snaps.end());
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
@@ -202,7 +202,7 @@ TEST_F(LibRadosSnapshotsSelfManaged, Rollback) {
   ::std::reverse(my_snaps.begin(), my_snaps.end());
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
   rados_ioctx_selfmanaged_snap_rollback(ioctx, "foo", my_snaps[1]);
   char buf3[sizeof(buf)];
   ASSERT_EQ((int)sizeof(buf3), rados_read(ioctx, "foo", buf3, sizeof(buf3), 0));
@@ -226,7 +226,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, ioctx.selfmanaged_snap_create(&my_snaps.back()));
@@ -237,7 +237,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapPP) {
   memset(buf2, 0xdd, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), 0));
 
   ioctx.snap_set_read(my_snaps[1]);
   bufferlist bl3;
@@ -269,9 +269,9 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, RollbackPP) {
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
   //Write 3 consecutive buffers
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize*2));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize*2));
 
   snap_set_t ss;
 
@@ -293,9 +293,9 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, RollbackPP) {
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
   //Change the middle buffer
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize));
   //Add another after
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*3));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*3));
 
   ASSERT_EQ(-EINVAL, ioctx.list_snaps("foo", &ss));
   ObjectReadOperation o;
@@ -352,11 +352,11 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize*2));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize*4));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize*6));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), bufsize*8));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize*2));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize*4));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize*6));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), bufsize*8));
 
   snap_set_t ss;
   snap_t head = SNAP_HEAD;
@@ -376,11 +376,11 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
   memset(buf2, 0xdd, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*1));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*3));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*5));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*7));
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize*9));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*1));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*3));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*5));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*7));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize*9));
 
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(2u, ss.clones.size());
@@ -414,10 +414,10 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
   memset(buf3, 0xee, sizeof(buf3));
   bufferlist bl4;
   bl4.append(buf3, sizeof(buf3));
-  ASSERT_EQ((int)sizeof(buf3), ioctx.write("foo", bl2, sizeof(buf3), bufsize*1));
-  ASSERT_EQ((int)sizeof(buf3), ioctx.write("foo", bl2, sizeof(buf3), bufsize*4));
-  ASSERT_EQ((int)sizeof(buf3), ioctx.write("foo", bl2, sizeof(buf3), bufsize*5));
-  ASSERT_EQ((int)sizeof(buf3), ioctx.write("foo", bl2, sizeof(buf3), bufsize*8));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf3), bufsize*1));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf3), bufsize*4));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf3), bufsize*5));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf3), bufsize*8));
 
   ASSERT_EQ(0, readioctx.list_snaps("foo", &ss));
   ASSERT_EQ(3u, ss.clones.size());
@@ -469,7 +469,7 @@ TEST_F(LibRadosSnapshotsSelfManagedPP, SnapOverlapPP) {
 TEST_F(LibRadosSnapshotsEC, SnapList) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   rados_snap_t snaps[10];
   EXPECT_EQ(1, rados_ioctx_snap_list(ioctx, snaps,
@@ -485,7 +485,7 @@ TEST_F(LibRadosSnapshotsECPP, SnapListPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   std::vector<snap_t> snaps;
   EXPECT_EQ(0, ioctx.snap_list(&snaps));
@@ -499,7 +499,7 @@ TEST_F(LibRadosSnapshotsECPP, SnapListPP) {
 TEST_F(LibRadosSnapshotsEC, SnapRemove) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   rados_snap_t rid;
   ASSERT_EQ(0, rados_ioctx_snap_lookup(ioctx, "snap1", &rid));
@@ -513,7 +513,7 @@ TEST_F(LibRadosSnapshotsECPP, SnapRemovePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   rados_snap_t rid;
   ASSERT_EQ(0, ioctx.snap_lookup("snap1", &rid));
@@ -524,7 +524,7 @@ TEST_F(LibRadosSnapshotsECPP, SnapRemovePP) {
 TEST_F(LibRadosSnapshotsEC, Rollback) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snap1"));
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
@@ -541,7 +541,7 @@ TEST_F(LibRadosSnapshotsECPP, RollbackPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snap1"));
   char buf2[sizeof(buf)];
   memset(buf2, 0xdd, sizeof(buf2));
@@ -558,7 +558,7 @@ TEST_F(LibRadosSnapshotsECPP, RollbackPP) {
 TEST_F(LibRadosSnapshotsEC, SnapGetName) {
   char buf[bufsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   ASSERT_EQ(0, rados_ioctx_snap_create(ioctx, "snapfoo"));
   rados_snap_t rid;
   EXPECT_EQ(0, rados_ioctx_snap_lookup(ioctx, "snapfoo", &rid));
@@ -577,7 +577,7 @@ TEST_F(LibRadosSnapshotsECPP, SnapGetNamePP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   ASSERT_EQ(0, ioctx.snap_create("snapfoo"));
   rados_snap_t rid;
   EXPECT_EQ(0, ioctx.snap_lookup("snapfoo", &rid));
@@ -601,7 +601,7 @@ TEST_F(LibRadosSnapshotsSelfManagedEC, Snap) {
   int bsize = alignment;
   char *buf = (char *)new char[bsize];
   memset(buf, 0xcc, bsize);
-  ASSERT_EQ(bsize, rados_write(ioctx, "foo", buf, bsize, 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, bsize, 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
@@ -611,7 +611,7 @@ TEST_F(LibRadosSnapshotsSelfManagedEC, Snap) {
   ::std::reverse(my_snaps.begin(), my_snaps.end());
   char *buf2 = (char *)new char[bsize];
   memset(buf2, 0xdd, sizeof(buf2));
-  ASSERT_EQ(bsize, rados_write(ioctx, "foo", buf2, bsize, bsize));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, bsize, bsize));
   rados_ioctx_snap_set_read(ioctx, my_snaps[1]-1);
   char *buf3 = (char *)new char[bsize*2];
   ASSERT_EQ(-ENOENT, rados_read(ioctx, "foo", buf3, bsize*2, 0));
@@ -642,7 +642,7 @@ TEST_F(LibRadosSnapshotsSelfManagedEC, Rollback) {
   int bsize = alignment;
   char *buf = (char *)new char[bsize];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ(bsize, rados_write(ioctx, "foo", buf, bsize, 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, bsize, 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, rados_ioctx_selfmanaged_snap_create(ioctx, &my_snaps.back()));
@@ -653,7 +653,7 @@ TEST_F(LibRadosSnapshotsSelfManagedEC, Rollback) {
   char *buf2 = (char *)new char[bsize];
   memset(buf2, 0xdd, sizeof(buf2));
 
-  ASSERT_EQ(bsize, rados_write(ioctx, "foo", buf2, bsize, bsize));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, bsize, bsize));
   rados_ioctx_selfmanaged_snap_rollback(ioctx, "foo", my_snaps[1]);
   char *buf3 = (char *)new char[bsize*2];
   ASSERT_EQ(bsize, rados_read(ioctx, "foo", buf3, bsize*2, 0));
@@ -681,7 +681,7 @@ TEST_F(LibRadosSnapshotsSelfManagedECPP, SnapPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, bsize);
-  ASSERT_EQ(bsize, ioctx.write("foo", bl1, bsize, 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, bsize, 0));
 
   my_snaps.push_back(-2);
   ASSERT_EQ(0, ioctx.selfmanaged_snap_create(&my_snaps.back()));
@@ -693,7 +693,7 @@ TEST_F(LibRadosSnapshotsSelfManagedECPP, SnapPP) {
   bufferlist bl2;
   bl2.append(buf2, bsize);
   // Add another aligned buffer
-  ASSERT_EQ(bsize, ioctx.write("foo", bl2, bsize, bsize));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, bsize, bsize));
 
   ioctx.snap_set_read(my_snaps[1]);
   bufferlist bl3;
@@ -728,9 +728,9 @@ TEST_F(LibRadosSnapshotsSelfManagedECPP, RollbackPP) {
   bufferlist bl1;
   bl1.append(buf, bsize);
   //Write 3 consecutive buffers
-  ASSERT_EQ(bsize, ioctx.write("foo", bl1, bsize, 0));
-  ASSERT_EQ(bsize, ioctx.write("foo", bl1, bsize, bsize));
-  ASSERT_EQ(bsize, ioctx.write("foo", bl1, bsize, bsize*2));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, bsize, 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, bsize, bsize));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, bsize, bsize*2));
 
   snap_set_t ss;
 
@@ -752,9 +752,9 @@ TEST_F(LibRadosSnapshotsSelfManagedECPP, RollbackPP) {
   bufferlist bl2;
   bl2.append(buf2, bsize);
   //Change the middle buffer
-  //ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), bufsize));
+  //ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), bufsize));
   //Add another after
-  ASSERT_EQ(bsize, ioctx.write("foo", bl2, bsize, bsize*3));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, bsize, bsize*3));
 
   ASSERT_EQ(-EINVAL, ioctx.list_snaps("foo", &ss));
   ObjectReadOperation o;

diff --git a/src/test/librados/stat.cc b/src/test/librados/stat.cc
index f15edd360d9fc0d09f9cd1b51641a29b38f62338..5757b30eefffdc293649b515c36c8becb611bd96 100644 (file)
--- a/src/test/librados/stat.cc
+++ b/src/test/librados/stat.cc
@@ -17,7 +17,7 @@ typedef RadosTestECPP LibRadosStatECPP;
 TEST_F(LibRadosStat, Stat) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   uint64_t size;
   time_t mtime;
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
@@ -30,7 +30,7 @@ TEST_F(LibRadosStatPP, StatPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   uint64_t size;
   time_t mtime;
   ASSERT_EQ(0, ioctx.stat("foo", &size, &mtime));
@@ -42,13 +42,13 @@ TEST_F(LibRadosStat, StatNS) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
 
   char buf2[64];
   memset(buf2, 0xcc, sizeof(buf2));
   rados_ioctx_set_namespace(ioctx, "nspace");
-  ASSERT_EQ((int)sizeof(buf2), rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
 
   uint64_t size;
   time_t mtime;
@@ -70,15 +70,15 @@ TEST_F(LibRadosStatPP, StatPPNS) {
   bufferlist bl;
   bl.append(buf, sizeof(buf));
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo2", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo2", bl, sizeof(buf), 0));
 
   char buf2[64];
   memset(buf2, 0xbb, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
   ioctx.set_namespace("nspace");
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), 0));
 
   uint64_t size;
   time_t mtime;
@@ -111,7 +111,7 @@ TEST_F(LibRadosStat, PoolStat) {
   ASSERT_EQ(strlen(actual_pool_name), l);
   ASSERT_EQ(0, strcmp(actual_pool_name, pool_name.c_str()));
   memset(buf, 0xff, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   struct rados_pool_stat_t stats;
   memset(&stats, 0, sizeof(stats));
   ASSERT_EQ(0, rados_ioctx_pool_stat(ioctx, &stats));
@@ -124,7 +124,7 @@ TEST_F(LibRadosStatPP, PoolStatPP) {
   memset(buf, 0xff, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   std::list<std::string> v;
   std::map<std::string,stats_map> stats;
   ASSERT_EQ(0, cluster.get_pool_stats(v, stats));
@@ -133,7 +133,7 @@ TEST_F(LibRadosStatPP, PoolStatPP) {
 TEST_F(LibRadosStatEC, Stat) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   uint64_t size;
   time_t mtime;
   ASSERT_EQ(0, rados_stat(ioctx, "foo", &size, &mtime));
@@ -146,7 +146,7 @@ TEST_F(LibRadosStatECPP, StatPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl;
   bl.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
   uint64_t size;
   time_t mtime;
   ASSERT_EQ(0, ioctx.stat("foo", &size, &mtime));
@@ -158,13 +158,13 @@ TEST_F(LibRadosStatEC, StatNS) {
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
   rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
 
   char buf2[64];
   memset(buf2, 0xcc, sizeof(buf2));
   rados_ioctx_set_namespace(ioctx, "nspace");
-  ASSERT_EQ((int)sizeof(buf2), rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf2, sizeof(buf2), 0));
 
   uint64_t size;
   time_t mtime;
@@ -186,15 +186,15 @@ TEST_F(LibRadosStatECPP, StatPPNS) {
   bufferlist bl;
   bl.append(buf, sizeof(buf));
   ioctx.set_namespace("");
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl, sizeof(buf), 0));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo2", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo2", bl, sizeof(buf), 0));
 
   char buf2[64];
   memset(buf2, 0xbb, sizeof(buf2));
   bufferlist bl2;
   bl2.append(buf2, sizeof(buf2));
   ioctx.set_namespace("nspace");
-  ASSERT_EQ((int)sizeof(buf2), ioctx.write("foo", bl2, sizeof(buf2), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl2, sizeof(buf2), 0));
 
   uint64_t size;
   time_t mtime;
@@ -227,7 +227,7 @@ TEST_F(LibRadosStatEC, PoolStat) {
   ASSERT_EQ(strlen(actual_pool_name), l);
   ASSERT_EQ(0, strcmp(actual_pool_name, pool_name.c_str()));
   memset(buf, 0xff, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   struct rados_pool_stat_t stats;
   memset(&stats, 0, sizeof(stats));
   ASSERT_EQ(0, rados_ioctx_pool_stat(ioctx, &stats));
@@ -240,7 +240,7 @@ TEST_F(LibRadosStatECPP, PoolStatPP) {
   memset(buf, 0xff, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   std::list<std::string> v;
   std::map<std::string,stats_map> stats;
   ASSERT_EQ(0, cluster.get_pool_stats(v, stats));

diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc
index 1543cbd379ffbf1d0e38c324c5ee22efa5e56d7c..ea3b4bf844136e4fc4a9f107c2c5f158310c6212 100644 (file)
--- a/src/test/librados/tier.cc
+++ b/src/test/librados/tier.cc
@@ -2051,7 +2051,7 @@ TEST_F(LibRadosTierPP, HitSetWrite) {
   for (int i=0; i<1000; ++i) {
     bufferlist bl;
     bl.append("a");
-    ASSERT_EQ(1, ioctx.write(stringify(i), bl, 1, 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, 1, 0));
   }
 
   // get HitSets
@@ -2133,7 +2133,7 @@ TEST_F(LibRadosTierPP, HitSetTrim) {
 
     bufferlist bl;
     bl.append("f");
-    ASSERT_EQ(1, ioctx.write("foo", bl, 1, 0));
+    ASSERT_EQ(0, ioctx.write("foo", bl, 1, 0));
 
     list<pair<time_t, time_t> > ls;
     AioCompletion *c = librados::Rados::aio_create_completion();
@@ -4011,7 +4011,7 @@ TEST_F(LibRadosTierECPP, HitSetWrite) {
   for (int i=0; i<1000; ++i) {
     bufferlist bl;
     bl.append("a");
-    ASSERT_EQ(1, ioctx.write(stringify(i), bl, 1, 0));
+    ASSERT_EQ(0, ioctx.write(stringify(i), bl, 1, 0));
   }
 
   // get HitSets
@@ -4097,7 +4097,7 @@ TEST_F(LibRadosTierECPP, HitSetTrim) {
 
     bufferlist bl;
     bl.append(buf, bsize);
-    ASSERT_EQ(bsize, ioctx.append("foo", bl, bsize));
+    ASSERT_EQ(0, ioctx.append("foo", bl, bsize));
 
     list<pair<time_t, time_t> > ls;
     AioCompletion *c = librados::Rados::aio_create_completion();

diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc
index 44c2a95373df146d0dd6806af82c1d5c8cf8f764..6d96e12fe65d02eca914acb68e808392bf8e54b9 100644 (file)
--- a/src/test/librados/watch_notify.cc
+++ b/src/test/librados/watch_notify.cc
@@ -35,7 +35,7 @@ TEST_F(LibRadosWatchNotify, WatchNotifyTest) {
   ASSERT_EQ(0, sem_init(&sem, 0, 0));
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   uint64_t handle;
   ASSERT_EQ(0,
       rados_watch(ioctx, "foo", 0, &handle, watch_notify_test_cb, NULL));
@@ -52,7 +52,7 @@ TEST_F(LibRadosWatchNotifyPP, WatchNotifyTestPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   uint64_t handle;
   WatchNotifyTestCtx ctx;
   ASSERT_EQ(0, ioctx.watch("foo", 0, &handle, &ctx));
@@ -77,7 +77,7 @@ TEST_F(LibRadosWatchNotifyPP, WatchNotifyTimeoutTestPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   ASSERT_EQ(0, ioctx.watch("foo", 0, &handle, &ctx));
   sem_destroy(&sem);
@@ -87,7 +87,7 @@ TEST_F(LibRadosWatchNotifyEC, WatchNotifyTest) {
   ASSERT_EQ(0, sem_init(&sem, 0, 0));
   char buf[128];
   memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), rados_write(ioctx, "foo", buf, sizeof(buf), 0));
+  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
   uint64_t handle;
   ASSERT_EQ(0,
       rados_watch(ioctx, "foo", 0, &handle, watch_notify_test_cb, NULL));
@@ -104,7 +104,7 @@ TEST_F(LibRadosWatchNotifyECPP, WatchNotifyTestPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
   uint64_t handle;
   WatchNotifyTestCtx ctx;
   ASSERT_EQ(0, ioctx.watch("foo", 0, &handle, &ctx));
@@ -129,7 +129,7 @@ TEST_F(LibRadosWatchNotifyECPP, WatchNotifyTimeoutTestPP) {
   memset(buf, 0xcc, sizeof(buf));
   bufferlist bl1;
   bl1.append(buf, sizeof(buf));
-  ASSERT_EQ((int)sizeof(buf), ioctx.write("foo", bl1, sizeof(buf), 0));
+  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
 
   ASSERT_EQ(0, ioctx.watch("foo", 0, &handle, &ctx));
   sem_destroy(&sem);

diff --git a/src/test/pybind/test_rados.py b/src/test/pybind/test_rados.py
index ae06a5f77c4c19f7e82791d7e51ae5e53146237f..7d5aa3bd9628d6be37ca6bcf2e2cc86276f4c23f 100644 (file)
--- a/src/test/pybind/test_rados.py
+++ b/src/test/pybind/test_rados.py
@@ -249,6 +249,7 @@ class TestIoctx(object):
             while count[0] < 4:
                 lock.wait()
         eq(comp.get_return_value(), 0)
+        eq(comp2.get_return_value(), 0)
         [i.remove() for i in self.ioctx.list_objects()]
 
     def test_aio_write_full(self):

diff --git a/src/test/system/rados_list_parallel.cc b/src/test/system/rados_list_parallel.cc
index 5fc4bfb6351be3af0912649ae78b82aa7d2aa776..7af86e414cf3666fcafe07205862dc048fea6e12 100644 (file)
--- a/src/test/system/rados_list_parallel.cc
+++ b/src/test/system/rados_list_parallel.cc
@@ -178,7 +178,7 @@ public:
 
       std::string buf(StRadosCreatePool::get_random_buf(256));
       int ret = rados_write(io_ctx, oid.c_str(), buf.c_str(), buf.size(), 0);
-      if (ret != (int)buf.size()) {
+      if (ret != 0) {
        printf("%s: rados_write(%s) failed with error %d\n",
               get_id_str(), oid.c_str(), ret);
        return ret;

diff --git a/src/test/system/st_rados_create_pool.cc b/src/test/system/st_rados_create_pool.cc
index 29b8d14b7e7ea7c3650b71ba09936fb865eee46a..6bbe628ed17d7134166f683d66f8eb5cb6734383 100644 (file)
--- a/src/test/system/st_rados_create_pool.cc
+++ b/src/test/system/st_rados_create_pool.cc
@@ -91,7 +91,7 @@ run()
     snprintf(oid, sizeof(oid), "%d%s", i, m_suffix.c_str());
     std::string buf(get_random_buf(256));
     int ret = rados_write(io_ctx, oid, buf.c_str(), buf.size(), 0);
-    if (ret < static_cast<int>(buf.size())) {
+    if (ret != 0) {
       printf("%s: rados_write error %d\n", get_id_str(), ret);
       return ret;
     }