rgw_file: restore local definition of RGWLibFS gc interval

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

Fixes: http://tracker.ceph.com/issues/17323

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 2741d838cd6559751c151d7c8fc695c1cacedf00..1f5b35deb7534eece6604637a18ece52432edc0c 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -684,7 +684,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 40853b0a9015a072ce2d1bb64e725f5fa3a4cb45..0998fa39965e4ba00521fe8dc50d679aab3588b5 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -698,9 +698,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;