Optional event execution indexing (#1720)

* Optional evnet execution indexing * Fix unit tests
Netflix · Jun 10, 2020 · f5118ca · f5118ca
1 parent e4a0c6f
commit f5118ca
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 6 deletions.
diff --git a/cassandra-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java b/cassandra-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java
@@ -42,6 +42,11 @@ public boolean isEventMessageIndexingEnabled() {
         return true;
     }
 
+    @Override
+    public boolean isEventExecutionIndexingEnabled() {
+        return true;
+    }
+
     @Override
     public String getServerId() {
         return "server_id";

diff --git a/core/src/main/java/com/netflix/conductor/core/config/Configuration.java b/core/src/main/java/com/netflix/conductor/core/config/Configuration.java
@@ -90,6 +90,9 @@ public interface Configuration {
     String EVENT_MESSAGE_INDEXING_ENABLED_PROPERTY_NAME = "workflow.event.message.indexing.enabled";
     boolean EVENT_MESSAGE_INDEXING_ENABLED_DEFAULT_VALUE = true;
 
+    String EVENT_EXECUTION_INDEXING_ENABLED_PROPERTY_NAME = "workflow.event.execution.indexing.enabled";
+    boolean EVENT_EXECUTION_INDEXING_ENABLED_DEFAULT_VALUE = true;
+
     String TASKEXECLOG_INDEXING_ENABLED_PROPERTY_NAME = "workflow.taskExecLog.indexing.enabled";
     boolean TASKEXECLOG_INDEXING_ENABLED_DEFAULT_VALUE = true;
 
@@ -214,6 +217,11 @@ default int getSystemTaskWorkerIsolatedThreadCount() {
      */
     boolean isEventMessageIndexingEnabled();
 
+    /**
+     * @return when set to true, event execution results are indexed
+     */
+    boolean isEventExecutionIndexingEnabled();
+
     /**
      * @return ID of the server.  Can be host name, IP address or any other meaningful identifier.  Used for logging
      */

diff --git a/core/src/main/java/com/netflix/conductor/core/config/SystemPropertiesConfiguration.java b/core/src/main/java/com/netflix/conductor/core/config/SystemPropertiesConfiguration.java
@@ -56,6 +56,11 @@ public boolean isEventMessageIndexingEnabled() {
         return getBooleanProperty(EVENT_MESSAGE_INDEXING_ENABLED_PROPERTY_NAME, EVENT_MESSAGE_INDEXING_ENABLED_DEFAULT_VALUE);
     }
 
+    @Override
+    public boolean isEventExecutionIndexingEnabled() {
+        return getBooleanProperty(EVENT_EXECUTION_INDEXING_ENABLED_PROPERTY_NAME, EVENT_EXECUTION_INDEXING_ENABLED_DEFAULT_VALUE);
+    }
+
     @Override
     public String getServerId() {
         try {

diff --git a/core/src/main/java/com/netflix/conductor/core/orchestration/ExecutionDAOFacade.java b/core/src/main/java/com/netflix/conductor/core/orchestration/ExecutionDAOFacade.java
@@ -411,12 +411,13 @@ public void updateEventExecution(EventExecution eventExecution) {
         indexEventExecution(eventExecution);
     }
 
-    private void indexEventExecution(EventExecution eventExecution)
-    {
-        if (config.enableAsyncIndexing()) {
-            indexDAO.asyncAddEventExecution(eventExecution);
-        } else {
-            indexDAO.addEventExecution(eventExecution);
+    private void indexEventExecution(EventExecution eventExecution) {
+        if (config.isEventExecutionIndexingEnabled()) {
+            if (config.enableAsyncIndexing()) {
+                indexDAO.asyncAddEventExecution(eventExecution);
+            } else {
+                indexDAO.addEventExecution(eventExecution);
+            }
         }
     }
 

diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestConfiguration.java b/core/src/test/java/com/netflix/conductor/core/execution/TestConfiguration.java
@@ -45,6 +45,11 @@ public boolean isEventMessageIndexingEnabled() {
 		return true;
 	}
 
+	@Override
+	public boolean isEventExecutionIndexingEnabled() {
+		return true;
+	}
+
 	@Override
 	public String getServerId() {
 		return "server_id";

diff --git a/mysql-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java b/mysql-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java
@@ -56,6 +56,11 @@ public boolean isEventMessageIndexingEnabled() {
 		return true;
 	}
 
+	@Override
+	public boolean isEventExecutionIndexingEnabled() {
+		return true;
+	}
+
 	@Override
 	public String getServerId() {
 		try {

diff --git a/postgres-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java b/postgres-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java
@@ -56,6 +56,11 @@ public boolean isEventMessageIndexingEnabled() {
         return true;
     }
 
+    @Override
+    public boolean isEventExecutionIndexingEnabled() {
+        return true;
+    }
+
     @Override
     public String getServerId() {
         try {

diff --git a/redis-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java b/redis-persistence/src/test/java/com/netflix/conductor/config/TestConfiguration.java
@@ -45,6 +45,11 @@ public boolean isEventMessageIndexingEnabled() {
 		return true;
 	}
 
+	@Override
+	public boolean isEventExecutionIndexingEnabled() {
+		return true;
+	}
+
 	@Override
 	public String getServerId() {
 		return "server_id";

diff --git a/test-harness/src/test/java/com/netflix/conductor/tests/utils/MockConfiguration.java b/test-harness/src/test/java/com/netflix/conductor/tests/utils/MockConfiguration.java
@@ -47,6 +47,11 @@ public boolean isEventMessageIndexingEnabled() {
         return true;
     }
 
+    @Override
+    public boolean isEventExecutionIndexingEnabled() {
+        return true;
+    }
+
     @Override
     public String getServerId() {
         try {