cls_cas: improve dynamic_encode accuracy a bit

- no default arg
- account for extra padding
- adjust test to target 512 bytes, which sounds reasonable?

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/cls/cas/cls_cas_internal.cc b/src/cls/cas/cls_cas_internal.cc
index 79ff206cfbd8b042db01ccaf1684376f6e2ff7a5..65ab38023d336f43b3a6b6a9cea611903da6b941 100644 (file)
--- a/src/cls/cas/cls_cas_internal.cc
+++ b/src/cls/cas/cls_cas_internal.cc
@@ -338,7 +338,8 @@ void chunk_refs_t::dynamic_encode(ceph::buffer::list& bl, size_t max)
   bufferlist t;
   while (true) {
     _encode_r(t);
-    if (t.length() <= max) {
+    // account for the additional overhead in _encode_final
+    if (t.length() + 8 <= max) {
       break;
     }
     // downgrade resolution

diff --git a/src/cls/cas/cls_cas_internal.h b/src/cls/cas/cls_cas_internal.h
index 1949832e51df0acb84802a9a00e80c20ffdc25cc..2831ae0cc71405e3e1a7a01ce2559899c562115b 100644 (file)
--- a/src/cls/cas/cls_cas_internal.h
+++ b/src/cls/cas/cls_cas_internal.h
@@ -80,7 +80,7 @@ struct chunk_refs_t {
 
   void _encode_r(bufferlist& bl) const;
   void _encode_final(bufferlist& bl, bufferlist& t) const;
-  void dynamic_encode(ceph::buffer::list& bl, size_t max = 1024);
+  void dynamic_encode(ceph::buffer::list& bl, size_t max);
   void encode(ceph::buffer::list& bl) const;
   void decode(ceph::buffer::list::const_iterator& p);
 

diff --git a/src/test/cls_cas/test_cls_cas.cc b/src/test/cls_cas/test_cls_cas.cc
index f57ad4b5307834a1e0e0dc93ed760574f8ea85ef..870b573fb06f1b612e91f7080f6da2e2df172f37 100644 (file)
--- a/src/test/cls_cas/test_cls_cas.cc
+++ b/src/test/cls_cas/test_cls_cas.cc
@@ -314,7 +314,7 @@ TEST(chunk_refs_t, size)
     ASSERT_TRUE(ret);
     if (count_bits(i) <= 2) {
       bufferlist bl;
-      r.dynamic_encode(bl, 1024);
+      r.dynamic_encode(bl, 512);
       if (count_bits(i) == 1) {
        cout << i << "\t" << bl.length()
             << "\t" << r.describe_encoding()