rgw_file: restore local definition of RGWLibFS gc interval

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 31936caa09b46e86700faad969adfa9d43176206)

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 7332feff034e931e847df214871c752f799a86ee..ae60451f4e79fd370aa28d575ad055077c5f183c 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -558,7 +558,7 @@ namespace rgw {
          } /* rgw_fh */
        } /* event::type::READDIR */
       } /* ev */
-      std::this_thread::sleep_for(gc_interval);
+      std::this_thread::sleep_for(std::chrono::seconds(120));
     } while (! stop);
   } /* RGWLibFS::gc */
 

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index 36ba1ee0d924f0f1ff100a5fb8b3c0d383839a2f..42b6649105187a18b75f84be369c93ce91eebc98 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -679,9 +679,6 @@ namespace rgw {
     struct rgw_fs fs;
     RGWFileHandle root_fh;
 
-    static constexpr std::chrono::seconds gc_interval =
-      std::chrono::seconds(120);
-
     mutable std::atomic<uint64_t> refcnt;
 
     RGWFileHandle::FHCache fh_cache;