Fixed bug: Race condition in thread object creation.

lib/import/otrs.rb

@@ -378,7 +378,6 @@ module Import::OTRS
     thread_count              = 8
     threads                   = {}
     count                     = 0
-    locks                     = { User: {} }
     (1..thread_count).each {|thread|
       threads[thread] = Thread.new {
         Thread.current[:thread_no] = thread
@@ -397,7 +396,7 @@ module Import::OTRS
             log "... thread# #{thread}, no more work."
             break
           end
-          _ticket_result(records, locks, thread)
+          _ticket_result(records, thread)
         end
         ActiveRecord::Base.connection.close
       }
@@ -461,7 +460,6 @@ module Import::OTRS
     count = 0
     run   = true
     steps = 20
-    locks = { User: {} }
     while run
       count += steps
       log 'loading... diff ...'
@@ -475,12 +473,12 @@ module Import::OTRS
         run = false
         next
       end
-      _ticket_result(records, locks)
+      _ticket_result(records)
     end
 
   end
 
-  def self._ticket_result(result, locks, _thread = '-')
+  def self._ticket_result(result, _thread = '-')
     map = {
       Ticket: {
         Changed: :updated_at,
@@ -572,9 +570,15 @@ module Import::OTRS
         ticket_old.update_attributes(ticket_new)
       else
         log "add Ticket.find(#{ticket_new[:id]})"
+
+        begin
           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
 
       # utf8 encode
@@ -584,7 +588,7 @@ module Import::OTRS
 
       # lookup customers to create first
       record['Articles'].each { |article|
-        _article_based_customers(article, locks)
+        _article_based_customers(article)
       }
 
       ActiveRecord::Base.transaction do
@@ -644,9 +648,14 @@ module Import::OTRS
             article_object.update_attributes(article_new)
           else
             log "add Ticket::Article.find(#{article_new[:id]})"
+            begin
               article_object    = Ticket::Article.new(article_new)
               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
 
           next if !article['Attachments']
@@ -666,6 +675,7 @@ module Import::OTRS
 
           # import article attachments
           article['Attachments'].each { |attachment|
+            begin
               Store.add(
                 object:      'Ticket::Article',
                 o_id:        article_object.id,
@@ -678,12 +688,18 @@ module Import::OTRS
                 },
                 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
 
       #puts "HS: #{record['History'].inspect}"
       record['History'].each { |history|
+
+        begin
           if history['HistoryType'] == 'NewTicket'
             #puts "HS.add( #{history.inspect} )"
             res = History.add(
@@ -695,8 +711,7 @@ module Import::OTRS
               created_by_id: history['CreateBy']
             )
             #puts "res #{res.inspect}"
-        end
+          elsif history['HistoryType'] == 'StateUpdate'
-        if history['HistoryType'] == 'StateUpdate'
             data = history['Name']
             # "%%new%%open%%"
             from = nil
@@ -726,8 +741,7 @@ module Import::OTRS
               created_at: history['CreateTime'],
               created_by_id: history['CreateBy']
             )
-        end
+          elsif history['HistoryType'] == 'Move'
-        if history['HistoryType'] == 'Move'
             data = history['Name']
             # "%%Queue1%%5%%Postmaster%%1"
             from = nil
@@ -751,8 +765,7 @@ module Import::OTRS
               created_at: history['CreateTime'],
               created_by_id: history['CreateBy']
             )
-        end
+          elsif history['HistoryType'] == 'PriorityUpdate'
-        if history['HistoryType'] == 'PriorityUpdate'
             data = history['Name']
             # "%%3 normal%%3%%5 very high%%5"
             from = nil
@@ -791,6 +804,11 @@ module Import::OTRS
             created_at: history['CreateTime'],
             created_by_id: history['CreateBy']
           )
+
+        rescue ActiveRecord::RecordNotUnique
+          log "Ticket #{ticket_new[:id]} (history #{history['HistoryID']}) is handled by another thead, skipping."
+          next
+        end
       }
     }
   end
@@ -1220,7 +1238,7 @@ module Import::OTRS
   # log
   def self.log(message)
     thread_no = Thread.current[:thread_no] || '-'
-    Rails.logger.info "thread##{thread_no}: #{message}"
+    Rails.logger.error "thread##{thread_no}: #{message}"
   end
 
   # set translate valid ids to active = true|false
@@ -1266,7 +1284,7 @@ module Import::OTRS
   end
 
   # create customers for article
-  def self._article_based_customers(article, locks)
+  def self._article_based_customers(article)
 
     # create customer/sender if needed
     return if article['sender'] != 'customer'
@@ -1283,15 +1301,6 @@ module Import::OTRS
       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
     if !user
       user = User.where( login: email ).first
@@ -1322,9 +1331,6 @@ module Import::OTRS
     end
     article['created_by_id'] = user.id
 
-    # unlock user
-    locks[:User][ email ] = false
-
     true
   end