rgw_file: restore local definition of RGWLibFS gc interval

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 3ecd565145f2c7c4f9e93c4dcb0674b88ad9bb07..f1f4a4b1764f94a3758b049d643cd998b63f9f3b 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -679,7 +679,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 5f871eee433ea3468b1dc628ed4b3eea3a1561bd..03bc95775cd26f5747517d12b8ae8c079de3956e 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -687,9 +687,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;