]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
objclass: fix cls_get_snapset_seq for cache tier case 25945/head
authorMykola Golub <mgolub@suse.com>
Mon, 18 Feb 2019 17:11:03 +0000 (17:11 +0000)
committerMykola Golub <mgolub@suse.com>
Tue, 19 Feb 2019 08:58:08 +0000 (08:58 +0000)
Signed-off-by: Mykola Golub <mgolub@suse.com>
src/objclass/class_api.cc

index 6ed28c2f2cc03aac72cecd6208288e4760d3a452..303d9c864bb1fcdff8f12ec56e6fee6ea52828a9 100644 (file)
@@ -713,7 +713,8 @@ void cls_cxx_subop_version(cls_method_context_t hctx, string *s)
 
 int cls_get_snapset_seq(cls_method_context_t hctx, uint64_t *snap_seq) {
   PrimaryLogPG::OpContext *ctx = *(PrimaryLogPG::OpContext **)hctx;
-  if (!ctx->new_obs.exists) {
+  if (!ctx->new_obs.exists || (ctx->new_obs.oi.is_whiteout() &&
+                               ctx->obc->ssc->snapset.clones.empty())) {
     return -ENOENT;
   }
   *snap_seq = ctx->obc->ssc->snapset.seq;