github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

introduce locking in path.data

Browse source 
Fixes #6738
This commit is contained in:
Joao Duarte 2017-02-20 15:14:42 +00:00 • committed by João Duarte
parent b998d41cb0
commit 4981cf878c
3 changed files with 76 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
logstash-core/lib/logstash/runner.rb
View file

@ -20,6 +20,8 @@ require "logstash/settings"
require "logstash/version"
require "logstash/plugins/registry"
java_import 'org.logstash.FileLockFactory'
class LogStash::Runner < Clamp::StrictCommand
include LogStash::Util::Loggable
# The `path.settings` and `path.logs` need to be defined in the runner instead of the `logstash-core/lib/logstash/environment.rb`
@ -264,6 +266,9 @@ class LogStash::Runner < Clamp::StrictCommand
end
end
# lock path.data before starting the agent
@data_path_lock = FileLockFactory.getDefault().obtainLock(setting("path.data"), ".lock");
@agent = create_agent(@settings)
@agent.register_pipeline(@settings)
@ -288,6 +293,9 @@ class LogStash::Runner < Clamp::StrictCommand
agent_return
rescue org.logstash.LockException => e
logger.fatal(I18n.t("logstash.runner.locked-data-path", :path => setting("path.data")))
return 1
rescue Clamp::UsageError => e
$stderr.puts "ERROR: #{e.message}"
show_short_help
@ -304,6 +312,7 @@ class LogStash::Runner < Clamp::StrictCommand
Stud::untrap("INT", sigint_id) unless sigint_id.nil?
Stud::untrap("TERM", sigterm_id) unless sigterm_id.nil?
Stud::untrap("HUP", sighup_id) unless sighup_id.nil?
FileLockFactory.getDefault().releaseLock(@data_path_lock) if @data_path_lock
@log_fd.close if @log_fd
end # def self.main

2
logstash-core/locales/en.yml
View file

@ -98,6 +98,8 @@ en:
the '-f yourlogstash.conf' flag?
reload-without-config-path: >-
Configuration reloading also requires passing a configuration path with '-f yourlogstash.conf'
locked-data-path: >-
Logstash could not be started because there is already another instance using the configured data directory. If you wish to run multiple instances, you must change the "path.data" setting.
invalid-shell: >-
Invalid option for interactive Ruby shell. Use either "irb" or "pry"
configtest-flag-information: |-

96
qa/integration/specs/01_logstash_bin_smoke_spec.rb
View file

@ -46,46 +46,80 @@ describe "Test Logstash instance" do
end
end
it "multiple of them can be started on the same box with automatically trying different ports for HTTP server" do
if @ls2.settings.feature_flag != "persistent_queues"
# Make sure that each instance use a different `path.queue`
@ls1.spawn_logstash("-f", config1)
context "multiple instances" do
it "cannot be started on the same box with the same path.data" do
tmp_path = Stud::Temporary.pathname
tmp_data_path = File.join(tmp_path, "data")
FileUtils.mkdir_p(tmp_data_path)
@ls1.spawn_logstash("-f", config1, "--path.data", tmp_data_path)
sleep(0.1) until File.exist?(file_config1) && File.size(file_config1) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9600)).to be true
puts "will try to start the second LS instance on 9601"
@ls2.spawn_logstash("-f", config2, "--path.data", tmp_data_path)
try(20) do
expect(@ls2.exited?).to be(true)
end
expect(@ls2.exit_code).to be(1)
end
# bring up new LS instance
# Use another path for the PQ
@ls2.spawn_logstash("-f", config2)
sleep(0.1) until File.exist?(file_config2) && File.size(file_config2) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9601)).to be true
expect(@ls1.process_id).not_to eq(@ls2.process_id)
else
# Make sure that each instance use a different `path.queue`
path = Stud::Temporary.pathname
FileUtils.mkdir_p(File.join(path, "data"))
data = File.join(path, "data")
settings = persistent_queue_settings.merge({ "path.queue" => data })
IO.write(File.join(path, "logstash.yml"), YAML.dump(settings))
@ls1.spawn_logstash("--path.settings", path, "-f", config1)
it "can be started on the same box with different path.data" do
tmp_path_1 = Stud::Temporary.pathname
tmp_data_path_1 = File.join(tmp_path_1, "data")
FileUtils.mkdir_p(tmp_data_path_1)
tmp_path_2 = Stud::Temporary.pathname
tmp_data_path_2 = File.join(tmp_path_2, "data")
FileUtils.mkdir_p(tmp_data_path_2)
@ls1.spawn_logstash("-f", config1, "--path.data", tmp_data_path_1)
sleep(0.1) until File.exist?(file_config1) && File.size(file_config1) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9600)).to be true
puts "will try to start the second LS instance on 9601"
# bring up new LS instance
path = Stud::Temporary.pathname
FileUtils.mkdir_p(File.join(path, "data"))
data = File.join(path, "data")
settings = persistent_queue_settings.merge({ "path.queue" => data })
IO.write(File.join(path, "logstash.yml"), YAML.dump(settings))
@ls2.spawn_logstash("--path.settings", path, "-f", config2)
@ls2.spawn_logstash("-f", config2, "--path.data", tmp_data_path_2)
sleep(0.1) until File.exist?(file_config2) && File.size(file_config2) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9601)).to be true
expect(@ls2.exited?).to be(false)
end
expect(@ls1.process_id).not_to eq(@ls2.process_id)
it "can be started on the same box with automatically trying different ports for HTTP server" do
if @ls2.settings.feature_flag != "persistent_queues"
@ls1.spawn_logstash("-f", config1)
sleep(0.1) until File.exist?(file_config1) && File.size(file_config1) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9600)).to be true
puts "will try to start the second LS instance on 9601"
# bring up new LS instance
tmp_path = Stud::Temporary.pathname
tmp_data_path = File.join(tmp_path, "data")
FileUtils.mkdir_p(tmp_data_path)
@ls2.spawn_logstash("-f", config2, "--path.data", tmp_data_path)
sleep(0.1) until File.exist?(file_config2) && File.size(file_config2) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9601)).to be true
expect(@ls1.process_id).not_to eq(@ls2.process_id)
else
# Make sure that each instance use a different `path.data`
path = Stud::Temporary.pathname
FileUtils.mkdir_p(File.join(path, "data"))
data = File.join(path, "data")
settings = persistent_queue_settings.merge({ "path.data" => data })
IO.write(File.join(path, "logstash.yml"), YAML.dump(settings))
@ls1.spawn_logstash("--path.settings", path, "-f", config1)
sleep(0.1) until File.exist?(file_config1) && File.size(file_config1) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9600)).to be true
puts "will try to start the second LS instance on 9601"
# bring up new LS instance
path = Stud::Temporary.pathname
FileUtils.mkdir_p(File.join(path, "data"))
data = File.join(path, "data")
settings = persistent_queue_settings.merge({ "path.data" => data })
IO.write(File.join(path, "logstash.yml"), YAML.dump(settings))
@ls2.spawn_logstash("--path.settings", path, "-f", config2)
sleep(0.1) until File.exist?(file_config2) && File.size(file_config2) > 0 # Everything is started succesfully at this point
expect(is_port_open?(9601)).to be true
expect(@ls1.process_id).not_to eq(@ls2.process_id)
end
end
end