From: Mykola Golub <mgolub@suse.com>
Date: Mon, 18 Feb 2019 17:11:03 +0000 (+0000)
Subject: objclass: fix cls_get_snapset_seq for cache tier case
X-Git-Tag: v14.1.0~56^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8ac8caca6b87b3a5f2c4fbdaba061bb6f95dd613;p=ceph.git

objclass: fix cls_get_snapset_seq for cache tier case

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

diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc
index 6ed28c2f2cc03..303d9c864bb1f 100644
--- a/src/objclass/class_api.cc
+++ b/src/objclass/class_api.cc
@@ -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;