From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 9 Oct 2023 15:53:31 +0000 (-0400)
Subject: Merge PR #53206 into main
X-Git-Tag: v19.0.0~310
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e90f0e9e0025bdde33efe273582fe71b34176338;p=ceph.git

Merge PR #53206 into main

* refs/pull/53206/head:
	mds: use LogSegment dump for debugging

Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

e90f0e9e0025bdde33efe273582fe71b34176338
diff --cc src/mds/MDLog.cc
index 4ee654c8048f,37837791c0d4..14b998850da5
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@@ -1529,11 -1519,8 +1521,11 @@@ void MDLog::standby_trim_segments(
      }
  
      dout(10) << " removing segment" << dendl;
-     mds->mdcache->standby_trim_segment(seg);
+     mds->mdcache->standby_trim_segment(ls);
      remove_oldest_segment();
 +    if (pre_segments_size > 0) {
 +      --pre_segments_size;
 +    }
      removed_segment = true;
    }