From: Yuan Zhou <yuan.zhou@intel.com>
Date: Thu, 24 Jan 2019 13:38:59 +0000 (+0800)
Subject: tools: clean up object cache request struture
X-Git-Tag: v15.0.0~136^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6b315dc441e872eceede2ba52afd46d1d96987c4;p=ceph.git

tools: clean up object cache request struture

adding version and compat_version info for serailization

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/tools/immutable_object_cache/Types.cc b/src/tools/immutable_object_cache/Types.cc
index 4d341dd45b2c..61af325810d5 100644
--- a/src/tools/immutable_object_cache/Types.cc
+++ b/src/tools/immutable_object_cache/Types.cc
@@ -29,6 +29,7 @@ void ObjectCacheMsgHeader::decode(bufferlist::const_iterator& it) {
 }
 
 void ObjectCacheMsgData::encode(bufferlist& bl) {
+  ENCODE_START(1, 1, bl);
   ceph::encode(m_read_offset, bl);
   ceph::encode(m_read_len, bl);
   ceph::encode(m_pool_id, bl);
@@ -36,10 +37,12 @@ void ObjectCacheMsgData::encode(bufferlist& bl) {
   ceph::encode(m_oid, bl);
   ceph::encode(m_pool_namespace, bl);
   ceph::encode(m_cache_path, bl);
+  ENCODE_FINISH(bl);
 }
 
 void ObjectCacheMsgData::decode(bufferlist& bl) {
   auto i = bl.cbegin();
+  DECODE_START(1, i);
   ceph::decode(m_read_offset, i);
   ceph::decode(m_read_len, i);
   ceph::decode(m_pool_id, i);
@@ -47,12 +50,12 @@ void ObjectCacheMsgData::decode(bufferlist& bl) {
   ceph::decode(m_oid, i);
   ceph::decode(m_pool_namespace, i);
   ceph::decode(m_cache_path, i);
+  DECODE_FINISH(i);
 }
 
 void ObjectCacheRequest::encode() {
   m_data.encode(m_data_buffer);
   m_head.data_len = m_data_buffer.length();
-  m_head.data_len = m_data_buffer.length();
   ceph_assert(m_head_buffer.length() == 0);
   m_head.encode(m_head_buffer);
   ceph_assert(sizeof(ObjectCacheMsgHeader) == m_head_buffer.length());
diff --git a/src/tools/immutable_object_cache/Types.h b/src/tools/immutable_object_cache/Types.h
index cbe5f4da97a3..d6c1c01792f2 100644
--- a/src/tools/immutable_object_cache/Types.h
+++ b/src/tools/immutable_object_cache/Types.h
@@ -22,7 +22,6 @@ struct ObjectCacheMsgHeader {
     void decode(bufferlist::const_iterator& it);
 };
 
-// TODO : cleanup useless data
 class ObjectCacheMsgData {
 public:
   uint64_t m_read_offset;
@@ -30,7 +29,7 @@ public:
   uint64_t m_pool_id;
   uint64_t m_snap_id;
   std::string m_oid;
-  std::string m_pool_namespace; // TODO : Jason suggestion
+  std::string m_pool_namespace;
   std::string m_cache_path;
 
   void encode(bufferlist& bl);