December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : optionally read system status at background
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 469e69ddfdc62389f40b63fbb9d8e83f557f28fb Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 8 18:26:08 2009 +0100 optionally read system status at background --- plugins/patches/app/models/background_status.rb | 2 +- .../status/app/controllers/status_controller.rb | 5 +- plugins/status/lib/status.rb | 92 +++++++++++++++++++- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb index 23966cf..2625cb6 100644 --- a/plugins/patches/app/models/background_status.rb +++ b/plugins/patches/app/models/background_status.rb @@ -2,7 +2,7 @@ class BackgroundStatus - attr_writer :status, + attr_accessor :status, :progress, :subprogress diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index d649e7a..a57fe11 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -82,10 +82,13 @@ class StatusController < ApplicationController # GET /status/1 # GET /status/1.xml def show + bgr = params['background'] + Rails.logger.info "Reading status in background" if bgr + permission_check("org.opensuse.yast.system.status.read") @status = Status.new stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) - @status.collect_data(start, stop, params[:data]) + @status.collect_data(start, stop, params[:data], bgr) end end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 6836fa9..c17bc77 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -31,7 +31,18 @@ class Status :metrics, :limits + # currently running status requests in background (current states) + @@running = Hash.new + # finished requests (actual results) + @@done = Hash.new + # a mutex which guards access to the shared class variables above + @@mutex = Mutex.new + def to_xml(options = {}) + if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus + return @data[:progress].to_xml + end + xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -166,23 +177,99 @@ class Status def draw_graph(heigth=nil, width=nil) end + # this is a wrapper to collect_data + def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}, background = false) + # background reading doesn't work correctly if class reloading is active + # (static class members are lost between requests) + if background && !Rails.configuration.cache_classes + Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" + background = false + end + + if background + # background status + bs = nil + key = start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + @@mutex.synchronize do + if @@done.has_key?(key) + Rails.logger.debug "Request #{key} is done" + @data = @@done.delete key + @data.delete :progress + return @data + end + + running = @@running[key] + if running + Rails.logger.debug "Request #{key} is already running: #{running.inspect}" + @data = {:progress => running} + return @data + end + + bs = BackgroundStatus.new + @@running[key] = bs + end + + # read the status in a separate thread + Thread.new do + Rails.logger.info '*** Background thread for reading status started...' + res = collect_status_data(start, stop, data, bs) + @@mutex.synchronize do + @@running.delete(key) + @@done[key] = res + end + Rails.logger.info '*** Finishing background status thread' + end + + # return current progress + @data = {:progress => bs} + return @data + else + collect_status_data(start, stop, data) + end + end + # creates several metrics for a defined period - def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}) + def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=nil) + metrics = available_metrics #puts metrics.inspect result = Hash.new if @collectd_running - case data + current_step = 0 if progress + case data when nil, "all", "All" # all metrics + if progress + total_steps = metrics.size + end + metrics.each_pair do |m, n| + if progress + @@mutex.synchronize do + progress.status = m.to_s + progress.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + end + end + metrics[m][:rrds].each do |rrdb| result[File.basename(rrdb).chomp('.rrd')] = fetch_metric(rrdb, start, stop) end @data[m] = result result = Hash.new + + current_step += 1 if progress end else # only metrics in data + total_steps = data.size if progress data.each do |d| + if progress + @@mutex.synchronize do + progress.status = d.to_s + progress.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + end + end + metrics.each_pair do |m, n| if m.include?(d) metrics[m][:rrds].each do |rrdb| @@ -192,6 +279,7 @@ class Status result = Hash.new end end + current_step += 1 if progress end end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : Fixed reading patches in background
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit c7790e8acfe5ab33957c9a595a2169bb1d8bce66 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Mon Dec 14 18:52:16 2009 +0100 Fixed reading patches in background read patches in a separate process, do not use threads in this case - ruby-dbus is NOT thread safe added a callback to BackgroundStatus class --- plugins/patches/app/models/background_status.rb | 34 +++++++++++- plugins/patches/app/models/patch.rb | 64 ++++++++++++++++++++++- plugins/patches/app/models/resolvable.rb | 4 +- plugins/patches/scripts/list_patches.rb | 17 ++++++ 4 files changed, 114 insertions(+), 5 deletions(-) diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb index 2625cb6..b7f7127 100644 --- a/plugins/patches/app/models/background_status.rb +++ b/plugins/patches/app/models/background_status.rb @@ -2,14 +2,36 @@ class BackgroundStatus - attr_accessor :status, + attr_reader :status, :progress, :subprogress - def initialize(stat = 'unknown', progress = 0, subprogress = nil) + def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) @status = stat @progress = progress @subprogress = subprogress + @callback = block_given? ? block : nil + end + + def status=(status) + if @status != status + @status = status + trigger_callback + end + end + + def progress=(p) + if @progress != p + @progress = p + trigger_callback + end + end + + def subprogress=(s) + if @subprogress != s + @subprogress = s + trigger_callback + end end def to_xml(options = {}) @@ -23,4 +45,12 @@ class BackgroundStatus end end + private + + def trigger_callback + if @callback + @callback.call + end + end + end diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index fde6c98..dd861de 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -35,6 +35,46 @@ class Patch < Resolvable return patch_updates end + def self.subprocess_find(what, bs) + + # open subprocess + subproc = IO.popen(subprocess_command) + + result = nil + + while !subproc.eof? do + begin + line = subproc.readline + + unless line.blank? + received = Hash.from_xml(line) + + # is it a progress or the final list? + if received.has_key? 'patches' + Rails.logger.debug "Found #{received['patches'].size} patches" + result = received['patches'] + elsif received.has_key? 'background_status' + s = received['background_status'] + @@mutex.synchronize do + bs.status = s['status'] + bs.progress = s['progress'] + bs.subprogress = s['subprogress'] + end + end + end + rescue Exception => e + Rails.logger.error "Background thread: Could not evaluate output: #{line.chomp}, exception: #{e}" + Rails.logger.error "Background thread: Backtrace: #{e.backtrace.join("\n")}" + + # rethrow the exception + raise e + end + end + + result + end + + # find patches # Patch.find(:available) # Patch.find(:available, :background => true) - read patches in background @@ -73,7 +113,7 @@ class Patch < Resolvable Rails.logger.info "Starting background thread for reading patches..." # run the patch query in a separate thread Thread.new do - res = do_find(what, bs) + res = subprocess_find(what, bs) Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" @@mutex.synchronize do @@running.delete(what) @@ -108,4 +148,26 @@ class Patch < Resolvable end end + private + + def self.subprocess_script + # find the helper script + script = File.join(RAILS_ROOT, 'vendor/plugin/patches/scripts/list_patches.rb') + + unless File.exists? script + script = File.join(RAILS_ROOT, '../plugins/patches/scripts/list_patches.rb') + + unless File.exists? script + raise 'File patches/scripts/list_patches.rb was not found!' + end + end + + Rails.logger.debug "Using #{script} script file" + script + end + + def self.subprocess_command + 'cd ' + RAILS_ROOT + ' && ' + File.join(RAILS_ROOT, 'script/runner') + ' -e ' + + (ENV["RAILS_ENV"] || 'development') + ' ' + subprocess_script + end end diff --git a/plugins/patches/app/models/resolvable.rb b/plugins/patches/app/models/resolvable.rb index f4e8331..e636c44 100644 --- a/plugins/patches/app/models/resolvable.rb +++ b/plugins/patches/app/models/resolvable.rb @@ -162,12 +162,12 @@ public if bg_stat proxy.on_signal("StatusChanged") do |s| - Rails.logger.debug "Background process: StatusChanged: #{s}" + Rails.logger.debug "PackageKit progress: StatusChanged: #{s}" bg_stat.status = s end proxy.on_signal("ProgressChanged") do |p1, p2, p3, p4| - Rails.logger.debug "Background process: ProgressChanged: #{p1}%" + Rails.logger.debug "PackageKit progress: ProgressChanged: #{p1}%" bg_stat.progress = p1 # 101% means no subprogress available bg_stat.subprogress = p2 < 101 ? p2 : nil diff --git a/plugins/patches/scripts/list_patches.rb b/plugins/patches/scripts/list_patches.rb new file mode 100644 index 0000000..06c0c74 --- /dev/null +++ b/plugins/patches/scripts/list_patches.rb @@ -0,0 +1,17 @@ + +# this is a helper script +# +# ruby-dbus is NOT thread safe and therefore patches cannot be safely read +# in a separate thread, workaround is to use a separate process (this script) + +bs = BackgroundStatus.new do + # print the progress in XML format + puts bs.to_xml + + # print it immediately, flush the output buffer + $stdout.flush +end + +patches = Patch.do_find(:all, bs) + +puts patches.to_xml(:root => "patches", :dasherize => false).gsub!("\n", '') -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : cache ResourcesController#index action
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 5f0c6910bf2b82f46cb706939234443bc8f6db35 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Dec 3 13:42:43 2009 +0100 cache ResourcesController#index action speeds up the call about 4x, in absolute numbers it saves just about 10ms, but that's not bad for just one line patch --- webservice/app/controllers/resources_controller.rb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/webservice/app/controllers/resources_controller.rb b/webservice/app/controllers/resources_controller.rb index f363f00..b94d6e3 100644 --- a/webservice/app/controllers/resources_controller.rb +++ b/webservice/app/controllers/resources_controller.rb @@ -1,5 +1,6 @@ class ResourcesController < ApplicationController require "resource_registration" + caches_action :index def index @resources = Resource.all -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : patch.rb - added comments
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 299d7e0e17faf9967d658d9ad1d40df32468e29e Author: Ladislav Slezak <lslezak(a)novell.com> Date: Thu Nov 12 09:54:51 2009 +0100 patch.rb - added comments --- plugins/patches/app/models/patch.rb | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index eb868d5..fde6c98 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -3,8 +3,13 @@ require 'resolvable' # Model for patches available via package kit class Patch < Resolvable + # class variables - they keep the information between requests + # + # currently running patch requests in background (current states) @@running = Hash.new + # finished requests (actual results) @@done = Hash.new + # a mutex which guards access to the shared class variables above @@mutex = Mutex.new def to_xml( options = {} ) @@ -32,6 +37,9 @@ class Patch < Resolvable # find patches # Patch.find(:available) + # Patch.find(:available, :background => true) - read patches in background + # the result may the current state (progress) or the actual patch list + # call this function in a loop until a patch list (or an error) is received # Patch.find(212) def self.find(what, opts = {}) background = opts[:background] @@ -44,6 +52,7 @@ class Patch < Resolvable end if background + # background status bs = nil @@mutex.synchronize do if @@done.has_key?(what) @@ -62,6 +71,7 @@ class Patch < Resolvable end Rails.logger.info "Starting background thread for reading patches..." + # run the patch query in a separate thread Thread.new do res = do_find(what, bs) Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : background_status.rb has been moved to the base package
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 0063ee1b0deaac7579b0452c1afeb09f7d261e40 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 15 15:19:27 2009 +0100 background_status.rb has been moved to the base package so it can be used in other plugins (the status plugin currently) --- plugins/patches/app/models/background_status.rb | 56 ----------------------- webservice/lib/background_status.rb | 56 +++++++++++++++++++++++ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb deleted file mode 100644 index b7f7127..0000000 --- a/plugins/patches/app/models/background_status.rb +++ /dev/null @@ -1,56 +0,0 @@ -# This class collects progress data of a background process - -class BackgroundStatus - - attr_reader :status, - :progress, - :subprogress - - def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) - @status = stat - @progress = progress - @subprogress = subprogress - @callback = block_given? ? block : nil - end - - def status=(status) - if @status != status - @status = status - trigger_callback - end - end - - def progress=(p) - if @progress != p - @progress = p - trigger_callback - end - end - - def subprogress=(s) - if @subprogress != s - @subprogress = s - trigger_callback - end - end - - def to_xml(options = {}) - xml = options[:builder] ||= Builder::XmlMarkup.new(options) - xml.instruct! unless options[:skip_instruct] - - xml.tag! :background_status do - xml.tag!(:status, @status) - xml.tag!(:progress, @progress.to_i, {:type => "integer"} ) - xml.tag!(:subprogress, @subprogress.to_i, {:type => "integer"}) - end - end - - private - - def trigger_callback - if @callback - @callback.call - end - end - -end diff --git a/webservice/lib/background_status.rb b/webservice/lib/background_status.rb new file mode 100644 index 0000000..b7f7127 --- /dev/null +++ b/webservice/lib/background_status.rb @@ -0,0 +1,56 @@ +# This class collects progress data of a background process + +class BackgroundStatus + + attr_reader :status, + :progress, + :subprogress + + def initialize(stat = 'unknown', progress = 0, subprogress = nil, &block) + @status = stat + @progress = progress + @subprogress = subprogress + @callback = block_given? ? block : nil + end + + def status=(status) + if @status != status + @status = status + trigger_callback + end + end + + def progress=(p) + if @progress != p + @progress = p + trigger_callback + end + end + + def subprogress=(s) + if @subprogress != s + @subprogress = s + trigger_callback + end + end + + def to_xml(options = {}) + xml = options[:builder] ||= Builder::XmlMarkup.new(options) + xml.instruct! unless options[:skip_instruct] + + xml.tag! :background_status do + xml.tag!(:status, @status) + xml.tag!(:progress, @progress.to_i, {:type => "integer"} ) + xml.tag!(:subprogress, @subprogress.to_i, {:type => "integer"}) + end + end + + private + + def trigger_callback + if @callback + @callback.call + end + end + +end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : cache PermissionsController#show result
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 35a60c2c8394c24b669ecff74c45b407e0312684 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Dec 4 16:04:50 2009 +0100 cache PermissionsController#show result --- .../app/controllers/permissions_controller.rb | 56 ++++++++++++++++++-- 1 files changed, 51 insertions(+), 5 deletions(-) diff --git a/webservice/app/controllers/permissions_controller.rb b/webservice/app/controllers/permissions_controller.rb index fff3c05..3a57c6e 100644 --- a/webservice/app/controllers/permissions_controller.rb +++ b/webservice/app/controllers/permissions_controller.rb @@ -6,6 +6,18 @@ class PermissionsController < ApplicationController before_filter :login_required + # before filter is called even when the action is cached + before_filter :check_perms, :cache_valid, :only => :show + + # modify the cache path so it includes also the filter and user name parameters + caches_action :show, :cache_path => Proc.new { |controller| + ret = controller.controller_path + '/' + controller.params[:user_id] + '/' + controller.params[:filter] + Rails.logger.info "Using cache path: #{ret}" + ret + } + + CACHE_ID = 'permissions:timestamp' + def initialize @permissions = [] end @@ -18,9 +30,45 @@ class PermissionsController < ApplicationController def user_self( params ) !params[:user_id].blank? && (params[:user_id] == self.current_account.login) end - - public + def check_perms + unless user_self(params) + permission_check "org.opensuse.yast.permissions.read" + end + end + + def get_cache_timestamp + lst = [ + # the global config file + File.mtime('/etc/PolicyKit/PolicyKit.conf'), + # policies + File.mtime('/usr/share/PolicyKit/policy/'), + # explicit user authorizations + File.mtime('/var/lib/PolicyKit/'), + # default overrides + File.mtime('/var/lib/PolicyKit-public/'), + ] + + lst.delete_if { |item| item.nil? } + + lst.max.to_i + end + + def cache_valid + cache_timestamp = Rails.cache.read(CACHE_ID) + current_timestamp = get_cache_timestamp + + if !cache_timestamp + Rails.cache.write(CACHE_ID, current_timestamp) + elsif cache_timestamp < current_timestamp + Rails.logger.debug "#### Permissions cache expired" + # expire all cached values using a regexp (for all users/filters) + expire_fragment(%r{#{controller_path}/.*}) + Rails.cache.write(CACHE_ID, current_timestamp) + end + end + + public #-------------------------------------------------------------------------------- # # actions @@ -31,9 +79,7 @@ class PermissionsController < ApplicationController # GET /permissions/:user_id(.:format) def show - unless user_self(params) - permission_check "org.opensuse.yast.permissions.read" - end + # note: permission check is done in the check_perms before filter permission = Permission.find(:all,params) respond_to do |format| format.json { render :json => permission.to_json } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : don't use background mode if cache_classes = false
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit ae84b04828b0978e5a5bf0c98ce7e1063dcbb680 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 11 17:46:12 2009 +0100 don't use background mode if cache_classes = false - static class members are lost on class reloading - increased patch cache validity to 15 minutes (libzypp refreshes the cache only after 10 minutes anyway) --- .../patches/app/controllers/patches_controller.rb | 2 +- plugins/patches/app/models/patch.rb | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index 5552fc1..e60b489 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -29,7 +29,7 @@ class PatchesController < ApplicationController # the cache expires after 5 minutes, repository metadata # or RPM database update invalidates the cache immediately # (new patches might be applicable) - elsif cache_timestamp < 5.minutes.ago || cache_timestamp < Patch.mtime + elsif cache_timestamp < 15.minutes.ago || cache_timestamp < Patch.mtime logger.debug "#### Patch cache expired" expire_action :action => :index, :format => params["format"] Rails.cache.write('patches:timestamp', Time.now) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index a6deb90..37c1bfc 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -35,6 +35,13 @@ class Patch < Resolvable def self.find(what, opts = {}) background = opts[:background] + # background reading doesn't work correctly if class reloading is active + # (static class members are lost between requests) + if background && !Rails.configuration.cache_classes + Rails.logger.info "Class reloading is active, cannot run background thread (set config.cache_classes = true)" + background = false + end + if background if @@done.has_key?(what) Rails.logger.debug "Request #{what} is done" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : do not cache background progress result
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit 91d118a0441ef15037726e24c42b9f62bc8b2cd7 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 11 16:38:36 2009 +0100 do not cache background progress result cache only the real patches status, not the background progress --- .../patches/app/controllers/patches_controller.rb | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index b8dad76..5552fc1 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -51,6 +51,12 @@ class PatchesController < ApplicationController format.xml { render :xml => @patches.to_xml( :root => "patches", :dasherize => false ) } format.json { render :json => @patches.to_json( :root => "patches", :dasherize => false ) } end + + # do not cache the background progress status + # (expire the cache in the next request) + if bgr && @patches.first.class == BackgroundStatus + Rails.cache.write('patches:timestamp', Time.at(0)) + end end # GET /patch_updates/1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : added inxed.xml?background parameter
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit cde0fecee580fc32ed1b08de41b7fee3042ee6b1 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 11 15:23:40 2009 +0100 added inxed.xml?background parameter for reading patches in background --- .../patches/app/controllers/patches_controller.rb | 7 ++++--- plugins/patches/app/models/background_status.rb | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/patches/app/controllers/patches_controller.rb b/plugins/patches/app/controllers/patches_controller.rb index 6468c0c..b8dad76 100644 --- a/plugins/patches/app/controllers/patches_controller.rb +++ b/plugins/patches/app/controllers/patches_controller.rb @@ -42,9 +42,10 @@ class PatchesController < ApplicationController # GET /patch_updates.xml def index # note: permission check was performed in :before_filter -# ActionController::Base.benchmark("Patches read") do - @patches = Patch.find(:available, {:background => true}) -# end + bgr = params['background'] + Rails.logger.info "Reading patches in background" if bgr + + @patches = Patch.find(:available, {:background => bgr}) respond_to do |format| format.xml { render :xml => @patches.to_xml( :root => "patches", :dasherize => false ) } diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb index 9ee50f0..23966cf 100644 --- a/plugins/patches/app/models/background_status.rb +++ b/plugins/patches/app/models/background_status.rb @@ -1,5 +1,4 @@ -# To change this template, choose Tools | Templates -# and open the template in the editor. +# This class collects progress data of a background process class BackgroundStatus -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : use a Mutex for accessing the shared variables
by Ladislav Slezak 18 Dec '09

18 Dec '09

ref: refs/heads/master commit de437369ca8af7f724b91d0ae4a653260c288ed8 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Wed Nov 11 19:03:46 2009 +0100 use a Mutex for accessing the shared variables make the code thread safe using a Mutex object for accesing the shared variables --- plugins/patches/app/models/patch.rb | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/plugins/patches/app/models/patch.rb b/plugins/patches/app/models/patch.rb index 37c1bfc..eb868d5 100644 --- a/plugins/patches/app/models/patch.rb +++ b/plugins/patches/app/models/patch.rb @@ -5,6 +5,7 @@ class Patch < Resolvable @@running = Hash.new @@done = Hash.new + @@mutex = Mutex.new def to_xml( options = {} ) super :patch_update, options @@ -38,31 +39,36 @@ class Patch < Resolvable # background reading doesn't work correctly if class reloading is active # (static class members are lost between requests) if background && !Rails.configuration.cache_classes - Rails.logger.info "Class reloading is active, cannot run background thread (set config.cache_classes = true)" + Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" background = false end if background - if @@done.has_key?(what) - Rails.logger.debug "Request #{what} is done" - @@running.delete(what) - return @@done.delete(what) - end + bs = nil + @@mutex.synchronize do + if @@done.has_key?(what) + Rails.logger.debug "Request #{what} is done" + return @@done.delete(what) + end - running = @@running[what] - if running - Rails.logger.debug "Request #{what} is already running: #{running.inspect}" - return [running] - end + running = @@running[what] + if running + Rails.logger.debug "Request #{what} is already running: #{running.inspect}" + return [running] + end - bs = BackgroundStatus.new - @@running[what] = bs + bs = BackgroundStatus.new + @@running[what] = bs + end Rails.logger.info "Starting background thread for reading patches..." Thread.new do res = do_find(what, bs) Rails.logger.info "*** Patches thread: Found #{res.size} applicable patches" - @@done[what] = res + @@mutex.synchronize do + @@running.delete(what) + @@done[what] = res + end end return [bs] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0