update sources to v12.1.2

[ceph.git] / ceph / src / libradosstriper / RadosStriperImpl.cc

diff --git a/ceph/src/libradosstriper/RadosStriperImpl.cc b/ceph/src/libradosstriper/RadosStriperImpl.cc
index 52783b53cc794747ca8dcd20acbf82d9ab9a9732..55356e0d7e53477f51ce8b4719ac3e9fcf8468c5 100644 (file)
--- a/ceph/src/libradosstriper/RadosStriperImpl.cc
+++ b/ceph/src/libradosstriper/RadosStriperImpl.cc
@@ -12,6 +12,8 @@
  *
  */
 
+#include <boost/algorithm/string/replace.hpp>
+
 #include "libradosstriper/RadosStriperImpl.h"
 
 #include <errno.h>
@@ -697,7 +699,9 @@ int libradosstriper::RadosStriperImpl::aio_read(const std::string& soid,
   // get list of extents to be read from
   vector<ObjectExtent> *extents = new vector<ObjectExtent>();
   if (read_len > 0) {
-    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
+    std::string format = soid;
+    boost::replace_all(format, "%", "%%");
+    format += RADOS_OBJECT_EXTENSION_FORMAT;
     file_layout_t l;
     l.from_legacy(layout);
     Striper::file_to_extents(cct(), format.c_str(), &l, off, read_len,
@@ -1260,7 +1264,9 @@ libradosstriper::RadosStriperImpl::internal_aio_write(const std::string& soid,
   if (len > 0) {
     // get list of extents to be written to
     vector<ObjectExtent> extents;
-    std::string format = soid + RADOS_OBJECT_EXTENSION_FORMAT;
+    std::string format = soid;
+    boost::replace_all(format, "%", "%%");
+    format += RADOS_OBJECT_EXTENSION_FORMAT;
     file_layout_t l;
     l.from_legacy(layout);
     Striper::file_to_extents(cct(), format.c_str(), &l, off, len, 0, extents);