RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: store data pool id with image header during creation

Browse Source 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-10-06 15:04:51 -04:00
parent e4a3d56e34
commit f5a244ae3d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librbd/image/CreateRequest.cc
View File

@ -72,7 +72,7 @@ int validate_striping(CephContext *cct, uint8_t order, uint64_t stripe_unit,
}
int validate_data_pool(CephContext *cct, IoCtx &io_ctx, uint64_t features,
const std::string &data_pool) {
const std::string &data_pool, int64_t *data_pool_id) {
if ((features & RBD_FEATURE_DATA_POOL) == 0) {
return 0;
}
@ -84,6 +84,8 @@ int validate_data_pool(CephContext *cct, IoCtx &io_ctx, uint64_t features,
lderr(cct) << "data pool " << data_pool << " does not exist" << dendl;
return -ENOENT;
}
*data_pool_id = data_io_ctx.get_id();
return 0;
}
@ -185,7 +187,7 @@ CreateRequest<I>::CreateRequest(IoCtx &ioctx, const std::string &image_name,
m_force_non_primary = !non_primary_global_image_id.empty();
if (/* TODO */ false && !m_data_pool.empty() && m_data_pool != ioctx.get_pool_name()) {
if (!m_data_pool.empty() && m_data_pool != ioctx.get_pool_name()) {
m_features |= RBD_FEATURE_DATA_POOL;
} else {
m_features &= ~RBD_FEATURE_DATA_POOL;
@ -242,7 +244,8 @@ void CreateRequest<I>::send() {
return;
}
r = validate_data_pool(m_cct, m_ioctx, m_features, m_data_pool);
r = validate_data_pool(m_cct, m_ioctx, m_features, m_data_pool,
&m_data_pool_id);
if (r < 0) {
complete(r);
return;
@ -388,10 +391,12 @@ void CreateRequest<I>::create_image() {
ostringstream oss;
oss << RBD_DATA_PREFIX << m_image_id;
assert(m_data_pool.empty() || m_data_pool_id != -1);
librados::ObjectWriteOperation op;
op.create(true);
cls_client::create_image(&op, m_size, m_order, m_features, oss.str(),
/* TODO */-1);
m_data_pool_id);
using klass = CreateRequest<I>;
librados::AioCompletion *comp =

1
src/librbd/image/CreateRequest.h
View File

@ -109,6 +109,7 @@ private:
uint8_t m_journal_splay_width = 0;
std::string m_journal_pool;
std::string m_data_pool;
int64_t m_data_pool_id = -1;
const std::string m_non_primary_global_image_id;
const std::string m_primary_mirror_uuid;