]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #9172 from majianpeng/librados-add-fullforce
authorKefu Chai <tchaikov@gmail.com>
Fri, 25 Nov 2016 15:12:45 +0000 (23:12 +0800)
committerGitHub <noreply@github.com>
Fri, 25 Nov 2016 15:12:45 +0000 (23:12 +0800)
librados:  For C-API, expose LIBRADOS_OPERATION_FULL_FORCE flag

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
src/include/rados/librados.h
src/include/rados/librados.hpp
src/librados/librados.cc

Simple merge
index d2284434d8d0615108f0ff4a95045ab151519dde,eac0b114b486b420a2421f4929c8878db1682b06..2fa9970996157b3c82490c5f04cc2bc8b3a6bac8
@@@ -278,24 -278,10 +278,26 @@@ namespace librado
      // marked full; ops will either succeed (e.g., delete) or return
      // EDQUOT or ENOSPC
      OPERATION_FULL_TRY           = LIBRADOS_OPERATION_FULL_TRY,
+     //mainly for delete
+     OPERATION_FULL_FORCE       = LIBRADOS_OPERATION_FULL_FORCE,
    };
  
 +  /*
 +   * Alloc hint flags for the alloc_hint operation.
 +   */
 +  enum AllocHintFlags {
 +    ALLOC_HINT_SEQUENTIAL_WRITE = 1,
 +    ALLOC_HINT_RANDOM_WRITE = 2,
 +    ALLOC_HINT_FLAG_SEQUENTIAL_READ = 4,
 +    ALLOC_HINT_FLAG_RANDOM_READ = 8,
 +    ALLOC_HINT_FLAG_APPEND_ONLY = 16,
 +    ALLOC_HINT_FLAG_IMMUTABLE = 32,
 +    ALLOC_HINT_FLAG_SHORTLIVED = 64,
 +    ALLOC_HINT_FLAG_LONGLIVED = 128,
 +    ALLOC_HINT_FLAG_COMPRESSIBLE = 256,
 +    ALLOC_HINT_FLAG_INCOMPRESSIBLE = 512,
 +  };
 +
    /*
     * ObjectOperation : compound object operation
     * Batch multiple object operations into a single request, to be applied
Simple merge