Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed bug: Race condition in thread object creation.

Browse source
This commit is contained in:
Thorsten Eckel 2015-07-23 17:42:51 +02:00
parent d3ef72fcf7
commit c6ccb7cf84
1 changed files with 145 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

284
lib/import/otrs.rb
View file

@ -378,7 +378,6 @@ module Import::OTRS
thread_count = 8 thread_count = 8
threads = {} threads = {}
count = 0 count = 0
locks = { User: {} }
(1..thread_count).each {|thread| (1..thread_count).each {|thread|
threads[thread] = Thread.new { threads[thread] = Thread.new {
Thread.current[:thread_no] = thread Thread.current[:thread_no] = thread
@ -397,7 +396,7 @@ module Import::OTRS
log "... thread# #{thread}, no more work." log "... thread# #{thread}, no more work."
break break
end end
_ticket_result(records, locks, thread) _ticket_result(records, thread)
end end
ActiveRecord::Base.connection.close ActiveRecord::Base.connection.close
} }
@ -461,7 +460,6 @@ module Import::OTRS
count = 0 count = 0
run = true run = true
steps = 20 steps = 20
locks = { User: {} }
while run while run
count += steps count += steps
log 'loading... diff ...' log 'loading... diff ...'
@ -475,12 +473,12 @@ module Import::OTRS
run = false run = false
next next
end end
_ticket_result(records, locks) _ticket_result(records)
end end
end end
def self._ticket_result(result, locks, _thread = '-') def self._ticket_result(result, _thread = '-')
map = { map = {
Ticket: { Ticket: {
Changed: :updated_at, Changed: :updated_at,
@ -572,9 +570,15 @@ module Import::OTRS
ticket_old.update_attributes(ticket_new) ticket_old.update_attributes(ticket_new)
else else
log "add Ticket.find(#{ticket_new[:id]})" log "add Ticket.find(#{ticket_new[:id]})"
ticket = Ticket.new(ticket_new)
ticket.id = ticket_new[:id] begin
ticket.save ticket = Ticket.new(ticket_new)
ticket.id = ticket_new[:id]
ticket.save
rescue ActiveRecord::RecordNotUnique
log "Ticket #{ticket_new[:id]} is handled by another thead, skipping."
next
end
end end
# utf8 encode # utf8 encode
@ -584,7 +588,7 @@ module Import::OTRS
# lookup customers to create first # lookup customers to create first
record['Articles'].each { |article| record['Articles'].each { |article|
_article_based_customers(article, locks) _article_based_customers(article)
} }
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@ -644,9 +648,14 @@ module Import::OTRS
article_object.update_attributes(article_new) article_object.update_attributes(article_new)
else else
log "add Ticket::Article.find(#{article_new[:id]})" log "add Ticket::Article.find(#{article_new[:id]})"
article_object = Ticket::Article.new(article_new) begin
article_object.id = article_new[:id] article_object = Ticket::Article.new(article_new)
article_object.save article_object.id = article_new[:id]
article_object.save
rescue ActiveRecord::RecordNotUnique
log "Ticket #{ticket_new[:id]} (article #{article_new[:id]}) is handled by another thead, skipping."
next
end
end end
next if !article['Attachments'] next if !article['Attachments']
@ -666,131 +675,140 @@ module Import::OTRS
# import article attachments # import article attachments
article['Attachments'].each { |attachment| article['Attachments'].each { |attachment|
Store.add( begin
object: 'Ticket::Article', Store.add(
o_id: article_object.id, object: 'Ticket::Article',
filename: Base64.decode64(attachment['Filename']), o_id: article_object.id,
data: Base64.decode64(attachment['Content']), filename: Base64.decode64(attachment['Filename']),
preferences: { data: Base64.decode64(attachment['Content']),
'Mime-Type' => attachment['ContentType'], preferences: {
'Content-ID' => attachment['ContentID'], 'Mime-Type' => attachment['ContentType'],
'content-alternative' => attachment['ContentAlternative'], 'Content-ID' => attachment['ContentID'],
}, 'content-alternative' => attachment['ContentAlternative'],
created_by_id: 1, },
) created_by_id: 1,
)
rescue ActiveRecord::RecordNotUnique
log "Ticket #{ticket_new[:id]} (article #{article_object.id}) is handled by another thead, skipping."
next
end
} }
} }
end end
#puts "HS: #{record['History'].inspect}" #puts "HS: #{record['History'].inspect}"
record['History'].each { |history| record['History'].each { |history|
if history['HistoryType'] == 'NewTicket'
#puts "HS.add( #{history.inspect} )" begin
res = History.add( if history['HistoryType'] == 'NewTicket'
#puts "HS.add( #{history.inspect} )"
res = History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'created',
history_object: 'Ticket',
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
#puts "res #{res.inspect}"
elsif history['HistoryType'] == 'StateUpdate'
data = history['Name']
# "%%new%%open%%"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%/
from = $1
to = $2
state_from = Ticket::State.lookup( name: from )
state_to = Ticket::State.lookup( name: to )
if state_from
from_id = state_from.id
end
if state_to
to_id = state_to.id
end
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'state',
value_from: from,
id_from: from_id,
value_to: to,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
elsif history['HistoryType'] == 'Move'
data = history['Name']
# "%%Queue1%%5%%Postmaster%%1"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%(.+?)%%(.+?)$/
from = $1
from_id = $2
to = $3
to_id = $4
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'group',
value_from: from,
value_to: to,
id_from: from_id,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
elsif history['HistoryType'] == 'PriorityUpdate'
data = history['Name']
# "%%3 normal%%3%%5 very high%%5"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%(.+?)%%(.+?)$/
from = $1
from_id = $2
to = $3
to_id = $4
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'priority',
value_from: from,
value_to: to,
id_from: from_id,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
end
next if !history['ArticleID']
next if history['ArticleID'] == 0
History.add(
id: history['HistoryID'], id: history['HistoryID'],
o_id: history['TicketID'], o_id: history['ArticleID'],
history_type: 'created', history_type: 'created',
history_object: 'Ticket', history_object: 'Ticket::Article',
related_o_id: history['TicketID'],
related_history_object: 'Ticket',
created_at: history['CreateTime'], created_at: history['CreateTime'],
created_by_id: history['CreateBy'] created_by_id: history['CreateBy']
) )
#puts "res #{res.inspect}"
end
if history['HistoryType'] == 'StateUpdate'
data = history['Name']
# "%%new%%open%%"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%/
from = $1
to = $2
state_from = Ticket::State.lookup( name: from )
state_to = Ticket::State.lookup( name: to )
if state_from
from_id = state_from.id
end
if state_to
to_id = state_to.id
end
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'state',
value_from: from,
id_from: from_id,
value_to: to,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
end
if history['HistoryType'] == 'Move'
data = history['Name']
# "%%Queue1%%5%%Postmaster%%1"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%(.+?)%%(.+?)$/
from = $1
from_id = $2
to = $3
to_id = $4
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'group',
value_from: from,
value_to: to,
id_from: from_id,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
end
if history['HistoryType'] == 'PriorityUpdate'
data = history['Name']
# "%%3 normal%%3%%5 very high%%5"
from = nil
to = nil
if data =~ /%%(.+?)%%(.+?)%%(.+?)%%(.+?)$/
from = $1
from_id = $2
to = $3
to_id = $4
end
History.add(
id: history['HistoryID'],
o_id: history['TicketID'],
history_type: 'updated',
history_object: 'Ticket',
history_attribute: 'priority',
value_from: from,
value_to: to,
id_from: from_id,
id_to: to_id,
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
end
next if !history['ArticleID'] rescue ActiveRecord::RecordNotUnique
next if history['ArticleID'] == 0 log "Ticket #{ticket_new[:id]} (history #{history['HistoryID']}) is handled by another thead, skipping."
next
History.add( end
id: history['HistoryID'],
o_id: history['ArticleID'],
history_type: 'created',
history_object: 'Ticket::Article',
related_o_id: history['TicketID'],
related_history_object: 'Ticket',
created_at: history['CreateTime'],
created_by_id: history['CreateBy']
)
} }
} }
end end
@ -1220,7 +1238,7 @@ module Import::OTRS
# log # log
def self.log(message) def self.log(message)
thread_no = Thread.current[:thread_no] || '-' thread_no = Thread.current[:thread_no] || '-'
Rails.logger.info "thread##{thread_no}: #{message}" Rails.logger.error "thread##{thread_no}: #{message}"
end end
# set translate valid ids to active = true|false # set translate valid ids to active = true|false
@ -1266,7 +1284,7 @@ module Import::OTRS
end end
# create customers for article # create customers for article
def self._article_based_customers(article, locks) def self._article_based_customers(article)
# create customer/sender if needed # create customer/sender if needed
return if article['sender'] != 'customer' return if article['sender'] != 'customer'
@ -1283,15 +1301,6 @@ module Import::OTRS
end end
end end
# create article user if not exists
while locks[:User][ email ]
log "user #{email} is locked"
sleep 1
end
# lock user
locks[:User][ email ] = true
user = User.where( email: email ).first user = User.where( email: email ).first
if !user if !user
user = User.where( login: email ).first user = User.where( login: email ).first
@ -1322,9 +1331,6 @@ module Import::OTRS
end end
article['created_by_id'] = user.id article['created_by_id'] = user.id
# unlock user
locks[:User][ email ] = false
true true
end end