RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-10 03:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: format code and clean up

Browse Source 
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
This commit is contained in:
Yuan Zhou 2019-01-31 14:39:44 +08:00
parent 97991f6fc4
commit 275d828adc
7 changed files with 44 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/test/immutable_object_cache/test_ObjectCacheFile.cc
View File

@ -1,120 +0,0 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
#include "gtest/gtest.h"
#include "include/Context.h"
#include "include/buffer_fwd.h"
#include "common/Mutex.h"
#include "common/Cond.h"
#include "global/global_init.h"
#include "common/ceph_argparse.h"
#include "global/global_context.h"
#include <experimental/filesystem>
#include "tools/immutable_object_cache/ObjectCacheFile.h"
using namespace ceph::immutable_obj_cache;
namespace efs = std::experimental::filesystem;
class TestObjectCacheFile :public ::testing::Test {
public:
std::string m_cache_root_dir;
TestObjectCacheFile(){}
~TestObjectCacheFile(){}
static void SetUpTestCase() {}
static void TearDownTestCase() {}
void SetUp() override {
m_cache_root_dir = g_ceph_context->_conf.get_val<std::string>("immutable_object_cache_path")
+ "/ceph_immutable_obj_cache/";
if (efs::exists(m_cache_root_dir)) {
efs::remove_all(m_cache_root_dir);
}
efs::create_directories(m_cache_root_dir);
}
void TearDown() override {
efs::remove_all(m_cache_root_dir);
}
};
TEST_F(TestObjectCacheFile, test_write_object_to_file) {
ObjectCacheFile* m_cache_file_1 = new ObjectCacheFile(g_ceph_context, "test_sync_file_1");
ObjectCacheFile* m_cache_file_2 = new ObjectCacheFile(g_ceph_context, "test_sync_file_2");
ObjectCacheFile* m_cache_file_3 = new ObjectCacheFile(g_ceph_context, "test_sync_file_3");
ASSERT_TRUE(m_cache_file_1->get_file_size() == -1);
ASSERT_TRUE(m_cache_file_2->get_file_size() == -1);
ASSERT_TRUE(m_cache_file_3->get_file_size() == -1);
bufferlist* buf_1 = new ceph::bufferlist();
bufferlist* buf_2 = new ceph::bufferlist();
bufferlist* buf_3 = new ceph::bufferlist();
buf_1->append(std::string(1024, '0'));
buf_2->append(std::string(4096, '0'));
buf_3->append(std::string(0, '0'));
ASSERT_TRUE(m_cache_file_1->write_object_to_file(*buf_1, 1024) == 1024);
ASSERT_TRUE(m_cache_file_2->write_object_to_file(*buf_2, 4096) == 4096);
ASSERT_TRUE(m_cache_file_3->write_object_to_file(*buf_3, 0) == 0);
ASSERT_TRUE(m_cache_file_1->get_file_size() == 1024);
ASSERT_TRUE(m_cache_file_2->get_file_size() == 4096);
ASSERT_TRUE(m_cache_file_3->get_file_size() == 0);
delete m_cache_file_1;
delete m_cache_file_2;
delete m_cache_file_3;
delete buf_1;
delete buf_2;
delete buf_3;
}
TEST_F(TestObjectCacheFile, test_read_object_from_file) {
ObjectCacheFile* m_cache_file_1 = new ObjectCacheFile(g_ceph_context, "test_sync_file_1");
ObjectCacheFile* m_cache_file_2 = new ObjectCacheFile(g_ceph_context, "test_sync_file_2");
bufferlist* buf_1 = new ceph::bufferlist();
bufferlist* buf_2 = new ceph::bufferlist();
ASSERT_TRUE(m_cache_file_1->get_file_size() == -1);
ASSERT_TRUE(m_cache_file_2->get_file_size() == -1);
ASSERT_EQ(m_cache_file_1->read_object_from_file(buf_1, 0, 1024), -1);
ASSERT_EQ(m_cache_file_2->read_object_from_file(buf_2, 0, 1024), -1);
buf_1->append(std::string("helloworld"));
ASSERT_TRUE(m_cache_file_1->write_object_to_file(*buf_1, 10) == 10);
ASSERT_TRUE(m_cache_file_1->get_file_size() == 10);
bufferlist* buf_3 = new ceph::bufferlist();
bufferlist* buf_4 = new ceph::bufferlist();
bufferlist* buf_5 = new ceph::bufferlist();
bufferlist* buf_6 = new ceph::bufferlist();
ASSERT_EQ(m_cache_file_1->read_object_from_file(buf_3, 0, 10), 10);
ASSERT_EQ(10, buf_3->length());
ASSERT_EQ(0, (strncmp(buf_1->c_str(), buf_3->c_str(), 10)));
ASSERT_EQ(m_cache_file_1->read_object_from_file(buf_4, 0, 4096), 10);
ASSERT_EQ(10, buf_4->length());
ASSERT_EQ(0, (strncmp(buf_1->c_str(), buf_4->c_str(), 10)));
ASSERT_EQ(m_cache_file_1->read_object_from_file(buf_5, 2, 4), 4);
ASSERT_EQ(4, buf_5->length());
bufferlist sub_bl;
sub_bl.substr_of(*buf_1, 2, 4);
ASSERT_EQ(0, (strncmp(sub_bl.c_str(), buf_5->c_str(), 4)));
ASSERT_EQ(m_cache_file_1->read_object_from_file(buf_6, 12, 4), 0);
ASSERT_EQ(0, buf_6->length());
delete m_cache_file_1;
delete m_cache_file_2;
delete buf_1;
delete buf_2;
delete buf_3;
delete buf_4;
delete buf_5;
delete buf_6;
}

6
src/tools/immutable_object_cache/CacheClient.cc
View File

@ -174,9 +174,6 @@ namespace immutable_obj_cache {
void CacheClient::read_reply_header() {
/* one head buffer for all arrived reply. */
// bufferptr bp_head(buffer::create_static(sizeof(ObjectCacheMsgHeader), m_header_buffer));
/* create new head buffer for every reply */
bufferptr bp_head(buffer::create(sizeof(ObjectCacheMsgHeader)));
auto raw_ptr = bp_head.c_str();
@ -357,9 +354,6 @@ namespace immutable_obj_cache {
<< ec.message() << dendl;
}
// TODO : use async + wait_event
// TODO : accept one parameter : ObjectCacheRequest
int CacheClient::register_client(Context* on_finish) {
ObjectCacheRequest* message = new ObjectCacheRequest();
message->m_head.version = 0;

3
src/tools/immutable_object_cache/CacheSession.cc
View File

@ -67,8 +67,7 @@ void CacheSession::handle_request_header(const boost::system::error_code& err,
ObjectCacheMsgHeader* head = (ObjectCacheMsgHeader*)(m_head_buffer);
ceph_assert(head->version == 0);
ceph_assert(head->reserved == 0);
ceph_assert(head->type == RBDSC_REGISTER || head->type == RBDSC_READ ||
head->type == RBDSC_LOOKUP);
ceph_assert(head->type == RBDSC_REGISTER || head->type == RBDSC_READ);
read_request_data(head->data_len);
}

2
src/tools/immutable_object_cache/ObjectCacheStore.cc
View File

@ -141,8 +141,6 @@ int ObjectCacheStore::handle_promote_callback(int ret, bufferlist* read_buf,
ret = 0;
}
uint32_t file_size = ret;
std::string cache_file_path = std::move(generate_cache_file_path(cache_file_name));
ret = read_buf->write_file(cache_file_path.c_str());

7
src/tools/immutable_object_cache/SocketCommon.h
View File

@ -9,10 +9,9 @@ namespace immutable_obj_cache {
static const int RBDSC_REGISTER = 0X11;
static const int RBDSC_READ = 0X12;
static const int RBDSC_LOOKUP = 0X13;
static const int RBDSC_REGISTER_REPLY = 0X14;
static const int RBDSC_READ_REPLY = 0X15;
static const int RBDSC_READ_RADOS = 0X16;
static const int RBDSC_REGISTER_REPLY = 0X13;
static const int RBDSC_READ_REPLY = 0X14;
static const int RBDSC_READ_RADOS = 0X15;
static const int ASIO_ERROR_READ = 0X01;
static const int ASIO_ERROR_WRITE = 0X02;