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

Backport #12009 to 7.x branch, bugfix in pipeline reload

Browse source 
fix Settings equality test which broke the PipelineConfig equality
This commit is contained in:
Colin Surprenant 2020-06-10 22:12:12 -04:00 • committed by J.A.R.V.I.S. - an Elastic git bot
parent 41272371a5
commit 659ef33f72
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/src/main/java/org/logstash/config/ir/PipelineConfig.java
View file

@ -126,7 +126,7 @@ public final class PipelineConfig {
PipelineConfig cother = (PipelineConfig) other; PipelineConfig cother = (PipelineConfig) other;
return configHash().equals(cother.configHash()) && return configHash().equals(cother.configHash()) &&
this.pipelineId.equals(cother.pipelineId) && this.pipelineId.equals(cother.pipelineId) &&
this.settings.eql(cother.settings); this.settings.equals(cother.settings);
} }
@Override @Override

6
logstash-core/src/test/java/org/logstash/config/ir/PipelineConfigTest.java
View file

@ -44,7 +44,7 @@ public class PipelineConfigTest extends RubyEnvTestCase {
private final static RubyObject SETTINGS = (RubyObject) RubyUtil.RUBY.evalScriptlet( private final static RubyObject SETTINGS = (RubyObject) RubyUtil.RUBY.evalScriptlet(
"require 'logstash/environment'\n" + // this is needed to register "pipeline.system" setting "require 'logstash/environment'\n" + // this is needed to register "pipeline.system" setting
"require 'logstash/settings'\n" + "require 'logstash/settings'\n" +
"LogStash::SETTINGS");; "LogStash::SETTINGS");
private PipelineConfig sut; private PipelineConfig sut;
private SourceWithMetadata[] orderedConfigParts; private SourceWithMetadata[] orderedConfigParts;
public static final String PIPELINE_CONFIG_PART_2 = public static final String PIPELINE_CONFIG_PART_2 =
@ -101,6 +101,10 @@ public class PipelineConfigTest extends RubyEnvTestCase {
PipelineConfig anotherExactPipeline = new PipelineConfig(source, pipelineIdSym, toRubyArray(orderedConfigParts), SETTINGS); PipelineConfig anotherExactPipeline = new PipelineConfig(source, pipelineIdSym, toRubyArray(orderedConfigParts), SETTINGS);
assertEquals(anotherExactPipeline, sut); assertEquals(anotherExactPipeline, sut);
final RubyObject CLONED_SETTINGS = (RubyObject)SETTINGS.callMethod("clone");
PipelineConfig anotherExactPipelineWithClonedSettings = new PipelineConfig(source, pipelineIdSym, toRubyArray(orderedConfigParts), CLONED_SETTINGS);
assertEquals(anotherExactPipelineWithClonedSettings, sut);
PipelineConfig notMatchingPipeline = new PipelineConfig(source, pipelineIdSym, RubyArray.newEmptyArray(RubyUtil.RUBY), SETTINGS); PipelineConfig notMatchingPipeline = new PipelineConfig(source, pipelineIdSym, RubyArray.newEmptyArray(RubyUtil.RUBY), SETTINGS);
assertNotEquals(notMatchingPipeline, sut); assertNotEquals(notMatchingPipeline, sut);