librados: add op flag (IGNORE_REDIRECT)

Signed-off-by: Myoungwon Oh omwmw@sk.com

diff --git a/src/include/rados.h b/src/include/rados.h
index b9adab6c3bb1c3d2a54cfa1033f521f7596e4641..c92145f1e0de3a42e0dbdfbcb026aa6d326e3808 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -417,6 +417,7 @@ enum {
        CEPH_OSD_FLAG_KNOWN_REDIR = 0x400000,  /* redirect bit is authoritative */
        CEPH_OSD_FLAG_FULL_TRY =    0x800000,  /* try op despite full flag */
        CEPH_OSD_FLAG_FULL_FORCE = 0x1000000,  /* force op despite full flag */
+       CEPH_OSD_FLAG_IGNORE_REDIRECT = 0x2000000,  /* ignore redirection */
 };
 
 enum {

diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index 401d7d4453f0ebce1f1f1dbec6503aef3659751a..478e4365dac785dc2d33a3b93267f2dd95f62267 100644 (file)
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -128,6 +128,7 @@ enum {
    * Mainly for delete op
    */
   LIBRADOS_OPERATION_FULL_FORCE                = 128,
+  LIBRADOS_OPERATION_IGNORE_REDIRECT   = 256,
 };
 /** @} */
 

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 68f78ccb4da22358afd6a21932bc782f5b030116..c4fe081e027f893c59ed3f109f77446f9bf11fae 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -267,6 +267,7 @@ namespace librados
     OPERATION_FULL_TRY           = LIBRADOS_OPERATION_FULL_TRY,
     //mainly for delete
     OPERATION_FULL_FORCE        = LIBRADOS_OPERATION_FULL_FORCE,
+    OPERATION_IGNORE_REDIRECT   = LIBRADOS_OPERATION_IGNORE_REDIRECT,
   };
 
   /*

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index 04cf6cb361dd8b8fe774c1e9afa69c72c25d4b81..09a8c80e75dc442b9662b6677c010ae5190bdadf 100644 (file)
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -1481,6 +1481,8 @@ static int translate_flags(int flags)
     op_flags |= CEPH_OSD_FLAG_FULL_TRY;
   if (flags & librados::OPERATION_FULL_FORCE)
     op_flags |= CEPH_OSD_FLAG_FULL_FORCE;
+  if (flags & librados::OPERATION_IGNORE_REDIRECT)
+    op_flags |= CEPH_OSD_FLAG_IGNORE_REDIRECT;
 
   return op_flags;
 }