]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #64351 from ifed01/wip-ifed-discard-threads-better-lifecycle
authorIgor Fedotov <igor.fedotov@croit.io>
Wed, 30 Jul 2025 11:25:42 +0000 (14:25 +0300)
committerGitHub <noreply@github.com>
Wed, 30 Jul 2025 11:25:42 +0000 (14:25 +0300)
blk/kernel: improve DiscardThread life cycle.

Reviewed-by: Yite Gu <guyite@bytedance.com>
1  2 
src/blk/kernel/KernelDevice.cc
src/blk/kernel/KernelDevice.h

Simple merge
index 149b8b4aa4130e08ebdccc4d77adbdddd5ea0850,f10458b4aff7717e39963bf0516a819aabda96ec..b444b645bc34f5ba69d97e9c4376df3a25ac68d3
@@@ -94,11 -94,9 +94,11 @@@ private
    virtual void  _pre_close() { }  // hook for child implementations
  
    void _aio_thread();
-   void _discard_thread(uint64_t tid);
+   void _discard_thread(DiscardThread* thr);
    bool _queue_discard(interval_set<uint64_t> &to_release);
 -  bool try_discard(interval_set<uint64_t> &to_release, bool async = true) override;
 +  bool try_discard(interval_set<uint64_t> &to_release,
 +                   bool async = true,
 +                   bool force = false) override;
  
    int _aio_start();
    void _aio_stop();