load unique tasks - fix names and line numbers of task sources

whummer · Jul 20, 2014 · 086b798 · 086b798
1 parent eb502bc
commit 086b798
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 15 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.5
+1.1.6
diff --git a/config.json b/config.json
@@ -19,7 +19,8 @@
 
 "testing": {
 	"timeservice_url" : "http://www.infosys.tuwien.ac.at/staff/hummer/tmp/time.php",
-	"test_hosts" : ["localhost"]
+	"test_hosts" : ["localhost"],
+	"max_threads" : 8
 },
 "db": {
 	"host": "localhost",

diff --git a/lib/toaster/chef/chef_listener.rb b/lib/toaster/chef/chef_listener.rb
@@ -432,7 +432,7 @@ def self.register_aop_hook()
                 end
               end
               task = get_task_from_sourcecode_line(resource, action, source_line_spec)
-              puts "get task #{resource} #{action} #{source_line_spec}: #{task}"
+              #puts "get task #{resource} #{action} #{source_line_spec}: #{task}"
             end
 
             # check if we execute within an "immediate notification"

diff --git a/lib/toaster/chef/chef_util.rb b/lib/toaster/chef/chef_util.rb
@@ -813,17 +813,17 @@ def self.parse_resources(cookbook, recipe_name, version="latest",
 
       File.open(recipe_file) do |io|
         io.each_with_index { |line,idx| 
-          #if line.match(/^\s*((#{resource_names.join(")|(")}))\s+.*((do)|(\{)).*$/)
+          idx += 1 # index is 0-based, line should be 1-based
           if line.match(/^(\s*[0-9a-zA-Z_]+\s*=\s*)?\s*((#{resource_names.join(")|(")}))((\s+)|($)|(\s*\())/)
             resource_lines << idx
           elsif line.match(/execute.*do/) && !line.match(/^\s*#/)
             puts "WARN: NO resource line: #{line}"
           end
         }
         resource_lines.each do |line|
-          code = read_sourcecode_from_line(recipe_file, line + 1)
+          code = read_sourcecode_from_line(recipe_file, line)
           if !code
-            puts "WARN: Could not parse code file #{recipe_file} : #{line + 1}"
+            puts "WARN: Could not parse code file #{recipe_file} : #{line}"
           else
             resource_obj = ResourceInspector.get_resource_from_source(code, attributes_source)
             result[cookbook][recipe_name]["resources"][line] = code

diff --git a/lib/toaster/model/task.rb b/lib/toaster/model/task.rb
@@ -271,12 +271,12 @@ def self.load_from_chef_source(resource, action, sourcecode, sourcefile, sourcel
       params = {
         :resource => resource.to_s,
         :action => action,
-        :sourcecode => sourcecode,
         :sourcefile => sourcefile,
         :sourceline => sourceline
       }
       task = find_by(params)
       if !task
+        params[:sourcecode] = sourcecode
         task = Task.new(params)
       end
       task.resource_obj = resource

diff --git a/lib/toaster/test/test_case.rb b/lib/toaster/test/test_case.rb
@@ -143,6 +143,11 @@ def success
       return automation_run ? automation_run.success : nil
     end
 
+    # force loading of associations from DB
+    def load_associations
+      hash() # loads all
+    end
+
     def hash()
       h = 0
       h += skip_task_uuids.hash

diff --git a/lib/toaster/test/test_runner.rb b/lib/toaster/test/test_runner.rb
@@ -33,7 +33,7 @@ class << self
 
     # private constructor
     def initialize(max_threads_active=nil, terminate_when_queue_empty=false)
-      @max_threads_active = max_threads_active ? max_threads_active : 5
+      @max_threads_active = max_threads_active ? max_threads_active : Config.get("testing.max_threads")
       @active_threads = []
       @terminate_when_queue_empty = terminate_when_queue_empty
       @request_queue = Queue.new
@@ -368,6 +368,10 @@ def start_worker_threads()
               end
               if test_case
                 begin
+                  # do this to load all fields and avoid activeRecord error 
+                  # "could not obtain a database connection within X seconds""
+                  test_case.load_associations()
+                  # now execute the test case
                   automation_run = TestRunner.execute_test(test_case)
                   @result_map.put(test_case, automation_run)
                 rescue Object => ex

diff --git a/lib/toaster/toaster_app_service.rb b/lib/toaster/toaster_app_service.rb
@@ -137,9 +137,5 @@ def self.start_service()
   puts "Starting service on port #{$service_port}"
   Toaster::Config.init_db_connection()
   server = ToasterAppService.new($service_port, "0.0.0.0")
-
-#  client = ToasterApp.new()
-# client.runtest("2285f8539f6c48873")
-#  client.runtests("88056bebc7e384cac")
   server.start
 end
diff --git a/lib/toaster/util/config.rb b/lib/toaster/util/config.rb
@@ -44,6 +44,9 @@ def self.get(key, v=values)
     end
 
     def self.init_db_connection(config=nil)
+      if $db_connection_initialized
+        return
+      end
       require "toaster/util/util"
       if !config || !config["mysql"]
         config = {
@@ -59,8 +62,10 @@ def self.init_db_connection(config=nil)
           :host => "#{config["mysql"]["host"]}".empty? ? get("db.host") : config["mysql"]["host"],
           :database => "#{config["mysql"]["database"]}".empty? ? get("db.database") : config["mysql"]["database"],
           :username => "#{config["mysql"]["username"]}".empty? ? get("db.username") : config["mysql"]["username"],
-          :password => "#{config["mysql"]["password"]}".empty? ? get("db.password") : config["mysql"]["password"]
+          :password => "#{config["mysql"]["password"]}".empty? ? get("db.password") : config["mysql"]["password"],
+          :pool => 50 # connection pool size limit (default is 5 which is not sufficient)
         )
+        $db_connection_initialized = true
       else
         puts "WARN: Incorrect database connection configuration"
       end

diff --git a/webapp/app/controllers/scripts_controller.rb b/webapp/app/controllers/scripts_controller.rb
@@ -143,7 +143,7 @@ def import_chef
   	  			  if recipe_info["resource_objs"][line]
   		  			   action = recipe_info["resource_objs"][line].action
   	  				   action = action.join(" , ") if action.kind_of?(Array)
-  	  				   resource = recipe_info["resource_objs"][line].resource_name
+  	  				   resource = recipe_info["resource_objs"][line].to_s
     	        end
   	  				task = Task.new(
   		  				:automation => a,

diff --git a/webapp/app/views/execs/task_executions.html.erb b/webapp/app/views/execs/task_executions.html.erb
@@ -112,7 +112,7 @@ global_executions = task.global_executions
 <p>Automation run UUID: <%= run.uuid %></p>
 <table class="tablesorter" id="tablesorter">
 	<thead>
-	<tr><th>#</th><th>ID</th>
+	<tr><th>#</th><th>Task ID</th>
 		<th>Start Time</th><th>Duration</th>
 		<th>Resource</th><th>Action</th><th>File</th><th>Line</th>
 		<th>Success</th>