Merge pull request #10756 from linuxbox2/fix_gc_interval

rgw_file: restore local definition of RGWLibFS gc interval Reviewed-by: Orit Wasserman <owasserm@redhat.com>
ceph · Aug 17, 2016 · 8f535ba · 8f535ba
2 parents 2611cdc + 31936ca
commit 8f535ba
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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;