Fixes #20626 - Periodic execution plan cleaner

config/settings.yml.example

@@ -39,3 +39,7 @@
 
 # Log level, one of UNKNOWN, FATAL, ERROR, WARN, INFO, DEBUG
 # :log_level: ERROR
+
+# Maximum age of execution plans to keep before having them cleaned
+# by the execution plan cleaner (in seconds), defaults to 24 hours
+# :execution_plan_cleaner_age: 86400

lib/smart_proxy_dynflow_core/core.rb

@@ -42,6 +42,7 @@ def default_world_config
         config.auto_rescue = true
         config.logger_adapter = logger_adapter
         config.persistence_adapter = persistence_adapter
+        config.execution_plan_cleaner = execution_plan_cleaner
         yield config if block_given?
       end
     end
@@ -54,6 +55,14 @@ def logger_adapter
       end
     end
 
+    def execution_plan_cleaner
+      proc do |world|
+        age = Settings.instance.execution_plan_cleaner_age
+        options = { :poll_interval => age, :max_age => age }
+        ::Dynflow::Actors::ExecutionPlanCleaner.new(world, options)
+      end
+    end
+
     class << self
       attr_reader :instance
 

lib/smart_proxy_dynflow_core/settings.rb

@@ -40,13 +40,15 @@ class Settings < OpenStruct
         :plugins => {},
         :pid_file => '/var/run/foreman-proxy/smart_proxy_dynflow_core.pid',
         :daemonize => false,
+        :execution_plan_cleaner_age => 60 * 60 * 24,
         :loaded => false
     }
 
     PROXY_SETTINGS = [:ssl_ca_file, :ssl_certificate, :ssl_private_key, :foreman_url,
                       :foreman_ssl_ca, :foreman_ssl_cert, :foreman_ssl_key,
                       :log_file, :log_level, :ssl_disabled_ciphers]
-    PLUGIN_SETTINGS = [:database, :core_url, :console_auth]
+    PLUGIN_SETTINGS = [:database, :core_url, :console_auth,
+                       :execution_plan_cleaner_age]
 
     def initialize(settings = {})
       super(DEFAULT_SETTINGS.merge(settings))

lib/smart_proxy_dynflow_core/testing.rb

@@ -16,6 +16,7 @@ def create_world(&block)
             config.exit_on_terminate = false
             config.auto_terminate    = false
             config.logger_adapter    = ::Dynflow::LoggerAdapters::Simple.new $stderr, DYNFLOW_TESTING_LOG_LEVEL
+            config.execution_plan_cleaner = nil
             block.call(config) if block
           end
         end

smart_proxy_dynflow_core.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rubocop', '0.32.1')
 
   gem.add_runtime_dependency('foreman-tasks-core', '>= 0.1')
-  gem.add_runtime_dependency('dynflow', "~> 0.8.4")
+  gem.add_runtime_dependency('dynflow', "~> 0.8.27")
   gem.add_runtime_dependency('sequel')
   gem.add_runtime_dependency('sqlite3')
   gem.add_runtime_dependency('sinatra', '~> 1.4')