increasing termination max wait time for child thread to 2 hours

cr https://code.amazon.com/reviews/CR-1318207

Author: Katyal

lib/instance_agent/config.rb

@@ -31,6 +31,7 @@ def initialize
         :wait_between_runs => 30,
         :wait_after_error => 30,
         :codedeploy_test_profile => 'prod',
+        :kill_agent_max_wait_time_seconds => 7200,
         :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml',
         :proxy_uri => nil,
         :enable_deployments_log => true

lib/instance_agent/plugins/codedeploy/command_poller.rb

@@ -23,8 +23,6 @@ class CommandPoller < InstanceAgent::Agent::Base
             "AfterAllowTraffic"=>["AfterAllowTraffic"],
             "ValidateService"=>["ValidateService"]}
 
-        WAIT_FOR_ALL_THREADS_TIMEOUT_SECONDS = 60 * 60 # One hour timeout in seconds
-
         def initialize
           test_profile = InstanceAgent::Config.config[:codedeploy_test_profile]
           unless ["beta", "gamma"].include?(test_profile.downcase)
@@ -89,12 +87,12 @@ def perform
         end
 
         def graceful_shutdown
-          log(:info, "Gracefully shutting down agent child threads now, will wait up to #{WAIT_FOR_ALL_THREADS_TIMEOUT_SECONDS} seconds")
+          log(:info, "Gracefully shutting down agent child threads now, will wait up to #{ProcessManager::Config.config[:kill_agent_max_wait_time_seconds]} seconds")
           # tell the pool to shutdown in an orderly fashion, allowing in progress work to complete
           @thread_pool.shutdown
           # now wait for all work to complete, wait till the timeout value
           # TODO: Make the timeout configurable in the agent configuration
-          @thread_pool.wait_for_termination WAIT_FOR_ALL_THREADS_TIMEOUT_SECONDS
+          @thread_pool.wait_for_termination ProcessManager::Config.config[:kill_agent_max_wait_time_seconds]
           log(:info, 'All agent child threads have been shut down')
         end
 

lib/instance_agent/runner/master.rb

@@ -6,8 +6,6 @@ module InstanceAgent
   module Runner
     class Master < ProcessManager::Daemon::Master
 
-      ChildTerminationMaxWaitTime = 80
-      
       def self.description(pid = $$)
         "master #{pid}"
       end
@@ -40,7 +38,7 @@ def stop
           end
 
           begin
-            Timeout.timeout(ChildTerminationMaxWaitTime) do  
+            Timeout.timeout(ProcessManager::Config.config[:kill_agent_max_wait_time_seconds]) do  
               loop do
                 begin
                   Process.kill(0, pid)
@@ -68,7 +66,7 @@ def kill_children(sig)
         end
 
         begin
-          Timeout.timeout(ChildTerminationMaxWaitTime) do
+          Timeout.timeout(ProcessManager::Config.config[:kill_agent_max_wait_time_seconds]) do
             children.each do |index, child_pid|
               begin
                 Process.wait(child_pid)

test/instance_agent/config_test.rb

@@ -29,7 +29,8 @@ class InstanceAgentConfigTest < InstanceAgentTestCase
         :codedeploy_test_profile => 'prod',
         :on_premises_config_file => '/etc/codedeploy-agent/conf/codedeploy.onpremises.yml',
         :proxy_uri => nil,
-        :enable_deployments_log => true
+        :enable_deployments_log => true,
+        :kill_agent_max_wait_time_seconds => 7200
       }, InstanceAgent::Config.config)
     end