Disable native code generation until compiler interface is fixed (#145)

this change disables the tests for codegen as well as the config option to be a no-op
Graylog2 · Dec 9, 2016 · de4d062 · de4d062
1 parent 3ec6c6f
commit de4d062
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/plugin/src/main/java/org/graylog/plugins/pipelineprocessor/PipelineConfig.java b/plugin/src/main/java/org/graylog/plugins/pipelineprocessor/PipelineConfig.java
@@ -10,5 +10,5 @@ public class PipelineConfig implements PluginConfigBean {
     private boolean cachedStageIterators = true;
 
     @Parameter("generate_native_code")
-    private boolean generateNativeCode = true;
+    private boolean generateNativeCode = false;
 }
diff --git a/...main/java/org/graylog/plugins/pipelineprocessor/processors/ConfigurationStateUpdater.java b/...main/java/org/graylog/plugins/pipelineprocessor/processors/ConfigurationStateUpdater.java
@@ -81,8 +81,8 @@ public ConfigurationStateUpdater(RuleService ruleService,
         this.scheduler = scheduler;
         this.serverEventBus = serverEventBus;
         this.stateFactory = stateFactory;
-        // from global config
-        setAllowCodeGeneration(allowCodeGeneration);
+        // ignore global config, never allow generating code
+        setAllowCodeGeneration(false);
 
         // listens to cluster wide Rule, Pipeline and pipeline stream connection changes
         serverEventBus.register(this);

diff --git a/...test/java/org/graylog/plugins/pipelineprocessor/parser/CodegenPipelineRuleParserTest.java b/...test/java/org/graylog/plugins/pipelineprocessor/parser/CodegenPipelineRuleParserTest.java
@@ -17,7 +17,9 @@
 package org.graylog.plugins.pipelineprocessor.parser;
 
 import org.graylog.plugins.pipelineprocessor.codegen.PipelineClassloader;
+import org.junit.Ignore;
 
+@Ignore("code generation disabled")
 public class CodegenPipelineRuleParserTest extends PipelineRuleParserTest {
 
     // runs the same tests as in PipelineRuleParserTest but with dynamic code generation turned on.

diff --git a/.../java/org/graylog/plugins/pipelineprocessor/processors/ConfigurationStateUpdaterTest.java b/.../java/org/graylog/plugins/pipelineprocessor/processors/ConfigurationStateUpdaterTest.java
@@ -51,6 +51,7 @@
 import org.graylog2.shared.bindings.providers.MetricRegistryProvider;
 import org.graylog2.streams.StreamImpl;
 import org.graylog2.streams.StreamService;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,6 +60,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+@Ignore("code generation disabled")
 public class ConfigurationStateUpdaterTest {
     private static final Logger log = LoggerFactory.getLogger(ConfigurationStateUpdaterTest.class);
     private PipelineInterpreter.State reload;