From: Mykola Golub <mgolub@mirantis.com>
Date: Sun, 6 Sep 2015 15:27:59 +0000 (+0300)
Subject: librbd: add image pool ID to journal object names.
X-Git-Tag: v10.0.2~100^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb10815ff0b1a9047bbcbe1ab2df50266124df52;p=ceph.git

librbd: add image pool ID to journal object names.

The data objects are named "journal_data.<pool id>.<image id>.<num>".
This is to avoid conflict when a journal objects pool is used for
several image pools.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
---

diff --git a/src/journal/Journaler.cc b/src/journal/Journaler.cc
index 3957f8f152b3..231cc0400d76 100644
--- a/src/journal/Journaler.cc
+++ b/src/journal/Journaler.cc
@@ -52,7 +52,8 @@ Journaler::Journaler(librados::IoCtx &header_ioctx,
   m_cct = reinterpret_cast<CephContext *>(m_header_ioctx.cct());
 
   m_header_oid = JOURNAL_HEADER_PREFIX + journal_id;
-  m_object_oid_prefix = JOURNAL_OBJECT_PREFIX + journal_id + ".";
+  m_object_oid_prefix = JOURNAL_OBJECT_PREFIX +
+    stringify(m_header_ioctx.get_id()) + "." + journal_id + ".";
 
   m_metadata = new JournalMetadata(m_header_ioctx, m_header_oid, m_client_id,
                                    commit_interval);