]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #52648 from lxbsz/wip-62036
authorRishabh Dave <ridave@redhat.com>
Thu, 4 Apr 2024 12:23:02 +0000 (17:53 +0530)
committerGitHub <noreply@github.com>
Thu, 4 Apr 2024 12:23:02 +0000 (17:53 +0530)
mds: defer trim() until after the last cache_rejoin ack being received

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/MDCache.h

Simple merge
index 7ac4f95627889ad3fc7afa3bc6fc091065152c29,ab76d24406507b66a137da6aa0a07b54371f9bf6..d4aed9be55e663d9ec1b27f6df37b62fc1b29ef8
@@@ -1468,11 -1366,10 +1468,13 @@@ private
    void finish_uncommitted_fragment(dirfrag_t basedirfrag, int op);
    void rollback_uncommitted_fragment(dirfrag_t basedirfrag, frag_vec_t&& old_frags);
  
 +  void dispatch_quiesce_path(const MDRequestRef& mdr);
 +  void dispatch_quiesce_inode(const MDRequestRef& mdr);
 +
    void upkeep_main(void);
  
+   bool is_ready_to_trim_cache(void);
    uint64_t cache_memory_limit;
    double cache_reservation;
    double cache_health_threshold;