NOTE: You will need to recreate your database for this patch to work. * Minor css cleanup for incorrect image path --- src/app/controllers/image_descriptor_controller.rb | 2 +- src/app/models/image_descriptor_target.rb | 1 + src/config/image_descriptor_targets.yml | 14 +++++++------- ...100527095428_create_image_descriptor_targets.rb | 2 +- src/public/stylesheets/components.css | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/controllers/image_descriptor_controller.rb b/src/app/controllers/image_descriptor_controller.rb index 11daa9c..e5a3a2d 100644 --- a/src/app/controllers/image_descriptor_controller.rb +++ b/src/app/controllers/image_descriptor_controller.rb @@ -21,7 +21,7 @@ class ImageDescriptorController < ApplicationController @tab = 'summary' if params[:targets] params[:targets].each do |target| - ImageDescriptorTarget.new_if_not_exists(:name => target, :image_descriptor_id => params[:image_descriptor][:id], :status => ImageDescriptorTarget::STATE_WAITING) + ImageDescriptorTarget.new_if_not_exists(:name => target, :image_descriptor_id => params[:image_descriptor][:id], :status => ImageDescriptorTarget::STATE_QUEUED) end end end diff --git a/src/app/models/image_descriptor_target.rb b/src/app/models/image_descriptor_target.rb index 4fceb0b..33437f1 100644 --- a/src/app/models/image_descriptor_target.rb +++ b/src/app/models/image_descriptor_target.rb @@ -6,6 +6,7 @@ class ImageDescriptorTarget < ActiveRecord::Base #TODO: validations validates_presence_of :name + STATE_QUEUED = 'queued' STATE_WAITING = 'waiting' STATE_BUILDING = 'building' STATE_COMPLETE = 'complete' diff --git a/src/config/image_descriptor_targets.yml b/src/config/image_descriptor_targets.yml index 16e9f56..669ea53 100644 --- a/src/config/image_descriptor_targets.yml +++ b/src/config/image_descriptor_targets.yml @@ -1,14 +1,14 @@ +rhevm: + name: RHEV-M + ec2: name: Amazon EC2 rackspace: name: RackSpace -rhevm: - name: RHEV-M - -gogrid: - name: GoGrid +#gogrid: +# name: GoGrid -vmware_esx: - name: VMWare ESX +#vmware_esx: +# name: VMWare ESX diff --git a/src/db/migrate/20100527095428_create_image_descriptor_targets.rb b/src/db/migrate/20100527095428_create_image_descriptor_targets.rb index 2cb49da..b760b90 100644 --- a/src/db/migrate/20100527095428_create_image_descriptor_targets.rb +++ b/src/db/migrate/20100527095428_create_image_descriptor_targets.rb @@ -2,7 +2,7 @@ class CreateImageDescriptorTargets < ActiveRecord::Migration def self.up create_table :image_descriptor_targets do |t| t.string :name, :null => false - t.integer :build_id + t.string :build_id t.string :status t.integer :image_descriptor_id t.timestamps diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css index 2bfbdde..cbc0b23 100644 --- a/src/public/stylesheets/components.css +++ b/src/public/stylesheets/components.css @@ -376,7 +376,7 @@ ul.nav li.selected { /* mfojtik's hacks ;-) */ #image_descriptor_nav h2 { - background : url('/images/h2_grad.png') repeat-x; + background : url('../images/h2_grad.png') repeat-x; height : 29px; font-weight : normal; padding : 10px 10px 0px 10px; -- 1.6.2.5

This is in the form of a script that could be run as a service. For now it needs to be run in the foreground. Note that this is highly experimental, and requires an Image Builder console gem be installed (which should be publicly available soon). Run the script with: ruby runner/image_builder_service.rb Logging needs cleanup, right now it is more or less on DEBUG, once this is past experimental, that will be defaulted to WARN. --- src/dutils/active_record_env.rb | 2 +- src/runner/image_builder_service.rb | 147 +++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletions(-) create mode 100644 src/runner/image_builder_service.rb diff --git a/src/dutils/active_record_env.rb b/src/dutils/active_record_env.rb index bc3bfcb..280d266 100644 --- a/src/dutils/active_record_env.rb +++ b/src/dutils/active_record_env.rb @@ -23,7 +23,7 @@ require 'rubygems' $LOAD_PATH << File.expand_path(File.dirname(__FILE__)) -ENV['RAILS_ENV'] = 'production' unless ENV['RAILS_ENV'] +ENV['RAILS_ENV'] = 'development' unless ENV['RAILS_ENV'] require File.dirname(__FILE__) + '/../config/boot' require "#{RAILS_ROOT}/config/environment" diff --git a/src/runner/image_builder_service.rb b/src/runner/image_builder_service.rb new file mode 100644 index 0000000..e4bde0a --- /dev/null +++ b/src/runner/image_builder_service.rb @@ -0,0 +1,147 @@ +# {library_summary} +# +# Copyright (C) 2009 Red Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +$: << File.join(File.dirname(__FILE__), "../dutils") +require 'dutils' +require "image_builder_console" +require 'logger' + + +#TODO: Figure out why logger does not work, w or w/o the class below +class Logger + def format_message(severity, timestamp, progname, msg) + "#{severity} #{timestamp} (#{$$}) #{msg}\n" + end +end + +class ImageBuilderService + def initialize() + @console ||= ImageBuilderConsole.new + @activebuilds ||= [] + poll + log = Logger.new(STDOUT) + log.warn "Service initialized..." + puts log.inspect + end + + def check_for_queued + queue = ImageDescriptorTarget.find(:all, :conditions => {:status => ImageDescriptorTarget::STATE_QUEUED}) + cur_builds = ImageDescriptorTarget.find(:all, :conditions => "build_id IS NOT NULL AND status != 'complete'") + if queue.size > 0 || cur_builds.size > 0 + puts "========================================" + puts "Queued Builds: " + queue.size.to_s + puts "All Incomplete Builds: " + cur_builds.size.to_s + puts "========================================" + end + cur_builds.size > queue.size ? find_orphaned(cur_builds) : + queue.each {|t| + build(t) + } + end + + def build(descriptor_target) + #targets.each do |t| + puts "========================================" + puts "target: " + descriptor_target.name + ", status: " + descriptor_target.status + puts "========================================" + ab = @console.build_image(descriptor_target.image_descriptor.xml.to_xml, descriptor_target.name) + if ab + update_build_list(ab, descriptor_target) + descriptor_target.build_id = ab.object_id.to_s + descriptor_target.save! + puts "========================================" + puts "Build id saved as: " + descriptor_target.build_id + puts "========================================" + end + #end + end + + def check_build_num + @activebuilds.size + end + + def find_orphaned(cur_builds) + cur_builds.delete_if do |b| + @activebuilds.size == 0 ? break : + @activebuilds.each do |ab| + b.build_id.eql?(ab[:build_id]) + end + end + if cur_builds.size > 0 + puts "========================================" + puts "There appear to be " + cur_builds.size.to_s + " untracked builds." + puts "Attempting to get status updates...." + puts "========================================" + found = [] + cur_builds.each do |t| + found << {:ab => @console.find_build(t.build_id), + :target => t } + end + puts "========================================" + puts "Retrieved " + found.size.to_s + " builds to update." + puts "========================================" + found.each do |f| + update_build_list(f[:ab], f[:target]) + end + end + end + + def update_agg(obj,new_status) + puts "========================================" + puts "Getting ar object to update using " + obj[:build].target.inspect + " and " + obj[:ar_id].inspect + " ..." + puts "========================================" + idt = ImageDescriptorTarget.find(:first, :conditions => { :name => obj[:build].target.to_s, + :image_descriptor_id => obj[:ar_id].to_i }) + puts "========================================" + puts "Updating with status: " + new_status + puts "========================================" + idt.status = new_status + idt.save! + puts "========================================" + puts "database updated!" + puts "========================================" + end + + private + def poll() + loop do + check_for_queued + @activebuilds.delete_if do |ab| + cur_status = @console.check_status(ab[:build]) + update_agg(ab, cur_status) unless cur_status.eql?(ab[:status]) + puts "========================================" + puts "Status for target " + ab[:build].target + ": " + cur_status + puts "Builds in array: " + check_build_num.to_s + puts "========================================" + cur_status.eql?("complete") + end + sleep 8 + end + end + + def update_build_list(ab, target) + @activebuilds << + { :ar_id => target.image_descriptor.id, + :build => ab, + :status => target.status, + :build_id => ab.object_id.to_s + } + end +end + +ImageBuilderService.new \ No newline at end of file -- 1.6.2.5