Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

abf/abf-ideas#83: updated AbfWorker::BuildListsPublishTaskManager

This commit is contained in:
Vokhmin Alexey V 2013-07-29 19:35:16 +04:00
parent 00ffc5ece6
commit 2b04d0bcf9
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/repository.rb
View File

@ -75,6 +75,11 @@ class Repository < ActiveRecord::Base
lock_file_actions :remove, :repo lock_file_actions :remove, :repo
end end
# Presence of `.repo.lock` file means that mirror is currently synchronising the repository state.
def repo_lock_file_exists?
lock_file_actions :check, :repo
end
def add_member(member, role = 'admin') def add_member(member, role = 'admin')
Relation.add_member(member, self, role) Relation.add_member(member, self, role)
end end

7
lib/abf_worker/build_lists_publish_task_manager.rb
View File

@ -173,6 +173,8 @@ module AbfWorker
resign_repos = @redis.lrange RESIGN_REPOSITORIES, 0, -1 resign_repos = @redis.lrange RESIGN_REPOSITORIES, 0, -1
Repository.where(:id => (resign_repos - locked_repositories)).each do |r| Repository.where(:id => (resign_repos - locked_repositories)).each do |r|
# Checks mirror sync status
next if r.repo_lock_file_exists?
@redis.lrem RESIGN_REPOSITORIES, 0, r.id @redis.lrem RESIGN_REPOSITORIES, 0, r.id
@redis.lpush LOCKED_REPOSITORIES, r.id @redis.lpush LOCKED_REPOSITORIES, r.id
@ -274,6 +276,9 @@ module AbfWorker
return false if !bl && old_packages[:sources].empty? return false if !bl && old_packages[:sources].empty?
save_to_repository = Repository.find save_to_repository_id save_to_repository = Repository.find save_to_repository_id
# Checks mirror sync status
return false if save_to_repository.repo_lock_file_exists?
save_to_platform = save_to_repository.platform save_to_platform = save_to_repository.platform
build_for_platform = Platform.find build_for_platform_id build_for_platform = Platform.find build_for_platform_id
platform_path = "#{save_to_platform.path}/repository" platform_path = "#{save_to_platform.path}/repository"
@ -346,6 +351,8 @@ module AbfWorker
regen_repos = regen_repos_and_pl.map{ |r| r.gsub(/\-[\d]*$/, '') } regen_repos = regen_repos_and_pl.map{ |r| r.gsub(/\-[\d]*$/, '') }
Repository.where(:id => regen_repos).each do |rep| Repository.where(:id => regen_repos).each do |rep|
# Checks mirror sync status
next if rep.repo_lock_file_exists?
regen_repos_and_pl.select{ |kind| kind =~ /^#{rep.id}\-/ }.each do |lock_str| regen_repos_and_pl.select{ |kind| kind =~ /^#{rep.id}\-/ }.each do |lock_str|
next if locked_rep_and_pl.include?(lock_str) next if locked_rep_and_pl.include?(lock_str)
@redis.lrem REGENERATE_METADATA, 0, lock_str @redis.lrem REGENERATE_METADATA, 0, lock_str