Fix the binding for ServerModule to the root SystemProps Configuration (

Netflix#1895)

* Fixing the root configuration issue

* Add Override annotation and make singleton

* Making repairservice default in properties files

Co-authored-by: James DeMichele <james.demichele@redfin.com>

docker/server/config/config-local.properties

@@ -24,6 +24,10 @@ workflow.namespace.queue.prefix=conductor_queues
 # No. of threads allocated to dyno-queues (optional)
 queues.dynomite.threads=10
 
+# By default with dynomite, we want the repairservice enabled
+workflow.repairservice.enabled=true
+
+
 # Non-quorum port used to connect to local redis.  Used by dyno-queues.
 # When using redis directly, set this to the same port as redis server
 # For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite.

docker/server/config/config.properties

@@ -27,6 +27,9 @@ workflow.namespace.queue.prefix=conductor_queues
 # No. of threads allocated to dyno-queues (optional)
 queues.dynomite.threads=10
 
+# By default with dynomite, we want the repairservice enabled
+workflow.repairservice.enabled=true
+
 # Non-quorum port used to connect to local redis.  Used by dyno-queues.
 # When using redis directly, set this to the same port as redis server
 # For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite.

docker/serverAndUI/config/config-local.properties

@@ -20,6 +20,10 @@ workflow.namespace.queue.prefix=conductor_queues
 # No. of threads allocated to dyno-queues (optional)
 queues.dynomite.threads=10
 
+# By default with dynomite, we want the repairservice enabled
+workflow.repairservice.enabled=true
+
+
 # Non-quorum port used to connect to local redis.  Used by dyno-queues.
 # When using redis directly, set this to the same port as redis server
 # For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite.

docker/serverAndUI/config/config.properties

@@ -23,6 +23,10 @@ workflow.namespace.queue.prefix=conductor_queues
 # No. of threads allocated to dyno-queues (optional)
 queues.dynomite.threads=10
 
+# By default with dynomite, we want the repairservice enabled
+workflow.repairservice.enabled=true
+
+
 # Non-quorum port used to connect to local redis.  Used by dyno-queues.
 # When using redis directly, set this to the same port as redis server
 # For Dynomite, this is 22122 by default or the local redis-server port used by Dynomite.

redis-persistence/src/main/java/com/netflix/conductor/dyno/DynomiteConfiguration.java

@@ -74,12 +74,4 @@ default String getQueuePrefix() {
 
         return prefix;
     }
-
-    /**
-     * WorkflowRepairService is enabled by default for DynoQueues, since this queue receipe supports getMessage feature.
-     * @return
-     */
-    default boolean isWorkflowRepairServiceEnabled() {
-        return true;
-    }
 }

server/src/main/java/com/netflix/conductor/bootstrap/BootstrapModule.java

@@ -8,6 +8,5 @@ public class BootstrapModule extends AbstractModule {
     @Override
     protected void configure() {
         bind(Configuration.class).to(SystemPropertiesConfiguration.class);
-        bind(ModulesProvider.class);
     }
 }

server/src/main/java/com/netflix/conductor/server/ServerModule.java

@@ -20,6 +20,7 @@
 import com.netflix.conductor.core.config.Configuration;
 import com.netflix.conductor.core.config.CoreModule;
 import com.netflix.conductor.core.config.EventModule;
+import com.netflix.conductor.core.config.SystemPropertiesConfiguration;
 import com.netflix.conductor.core.config.ValidationModule;
 import com.netflix.conductor.core.execution.WorkflowSweeper;
 import com.netflix.conductor.dyno.SystemPropertiesDynomiteConfiguration;
@@ -48,7 +49,7 @@ protected void configure() {
         install(new EventModule());
 
         bindInterceptor(Matchers.any(), Matchers.annotatedWith(Service.class), new ServiceInterceptor(getProvider(Validator.class)));
-        bind(Configuration.class).to(SystemPropertiesDynomiteConfiguration.class);
+        bind(Configuration.class).to(SystemPropertiesConfiguration.class).in(Scopes.SINGLETON);
         bind(ExecutorService.class).toProvider(ExecutorServiceProvider.class).in(Scopes.SINGLETON);
         bind(WorkflowSweeper.class).asEagerSingleton();
         bind(WorkflowMonitor.class).asEagerSingleton();

server/src/main/resources/server.properties

@@ -27,6 +27,10 @@ workflow.namespace.queue.prefix=
 #no. of threads allocated to dyno-queues
 queues.dynomite.threads=10
 
+# By default with dynomite, we want the repairservice enabled
+workflow.repairservice.enabled=true
+
+
 #non-quorum port used to connect to local redis.  Used by dyno-queues
 queues.dynomite.nonQuorum.port=22122