Tweak the new inter-worker lock support

* Ensure to update atime to prevent tmpwatch from cleaning active lock files. * Fix instance/class variable access. * Unify the terminology from "lockdir" to "lock_dir". Signed-off-by: Fujimoto Seiji <[email protected]>
fluent · Jul 3, 2022 · caec5b7 · caec5b7
1 parent 49970e4
commit caec5b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/fluent/plugin/base.rb b/lib/fluent/plugin/base.rb
@@ -78,12 +78,15 @@ def get_lock_path(name)
 
       def acquire_worker_lock(name)
         if @fluentd_lock_dir.nil?
-          raise InvalidLockDirectory, "can't acquire lock because FLUENTD_LOCKDIR isn't set"
+          raise InvalidLockDirectory, "can't acquire lock because FLUENTD_LOCK_DIR isn't set"
         end
-        File.open(get_lock_path(name), "w") do |f|
+        lock_path = get_lock_path(name)
+        File.open(lock_path, "w") do |f|
           f.flock(File::LOCK_EX)
           yield
         end
+        # Update access time to prevent tmpwatch from deleting a lock file.
+        FileUtils.touch(lock_path);
       end
 
       def string_safe_encoding(str)

diff --git a/lib/fluent/plugin/out_file.rb b/lib/fluent/plugin/out_file.rb
@@ -189,8 +189,8 @@ def configure(conf)
         @need_ruby_on_macos_workaround = true if condition.match?('', RUBY_VERSION)
       end
 
-      if @need_lock && @append && fluentd_lockdir.nil?
-        raise InvalidLockDirectory, "must set FLUENTD_LOCKDIR on multi-worker append mode"
+      if @need_lock && @append && @fluentd_lock_dir.nil?
+        raise Fluent::InvalidLockDirectory, "must set FLUENTD_LOCK_DIR on multi-worker append mode"
       end
     end