From: David Zafman <dzafman@redhat.com>
Date: Tue, 7 May 2019 15:47:26 +0000 (-0700)
Subject: Merge pull request #27830 from dzafman/wip-38124
X-Git-Tag: v15.1.0~2741
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=827ced407e4389514aec9010daca07825fe33b2f;p=ceph.git

Merge pull request #27830 from dzafman/wip-38124

osd: Don't include user changeable flag in snaptrim related assert

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

827ced407e4389514aec9010daca07825fe33b2f
diff --cc src/osd/PrimaryLogPG.h
index f445df1f0ec8,70e390ae179a..33a0d32b2236
--- a/src/osd/PrimaryLogPG.h
+++ b/src/osd/PrimaryLogPG.h
@@@ -1611,9 -1605,9 +1615,9 @@@ private
  
      explicit Trimming(my_context ctx)
        : my_base(ctx),
 -	NamedState(context< SnapTrimmer >().pg, "Trimming") {
 +	NamedState(nullptr, "Trimming") {
        context< SnapTrimmer >().log_enter(state_name);
-       ceph_assert(context< SnapTrimmer >().can_trim());
+       ceph_assert(context< SnapTrimmer >().permit_trim());
        ceph_assert(in_flight.empty());
      }
      void exit() {