]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #30969 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 30 Jan 2020 15:20:11 +0000 (07:20 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 30 Jan 2020 15:20:43 +0000 (07:20 -0800)
* refs/pull/30969/head:
mds : clean up data written to unsafe inodes

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSRank.cc
src/mds/Server.cc
src/mds/Server.h
src/mds/journal.cc

Simple merge
Simple merge
index 705f1bf1a5dc69a1cabd780cbae9499be76fbf58,023c9f0b38abaac850955e41d6c15e21f4aacc65..cc43b732e4650dbed8e60fd5a25e1583c22cfd84
@@@ -125,10 -152,11 +126,10 @@@ public
    void finish_flush_session(Session *session, version_t seq);
    void terminate_sessions();
    void find_idle_sessions();
-   void kill_session(Session *session, Context *on_safe);
+   void kill_session(Session *session, Context *on_safe, bool need_purge_inos = false);
    size_t apply_blacklist(const std::set<entity_addr_t> &blacklist);
-   void journal_close_session(Session *session, int state, Context *on_safe);
+   void journal_close_session(Session *session, int state, Context *on_safe, bool need_purge_inos = false);
  
 -  set<client_t> client_reclaim_gather;
    size_t get_num_pending_reclaim() const { return client_reclaim_gather.size(); }
    Session *find_session_by_uuid(std::string_view uuid);
    void reclaim_session(Session *session, const cref_t<MClientReclaim> &m);
Simple merge