From 12cf0122ca16f81fd5355525b0e86b699f1f03b8 Mon Sep 17 00:00:00 2001
From: Thorsten Eckel <te@znuny.com>
Date: Fri, 24 Jul 2015 11:57:45 +0200
Subject: [PATCH] Fixed bug: Race conditions may occur because of duplicate
 offset processing.

---
 lib/import/otrs.rb | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/import/otrs.rb b/lib/import/otrs.rb
index 4da033f90..dbc6aeb1c 100644
--- a/lib/import/otrs.rb
+++ b/lib/import/otrs.rb
@@ -377,27 +377,31 @@ module Import::OTRS
     Thread.abort_on_exception = true
     thread_count              = 8
     threads                   = {}
-    count                     = 0
+    steps                     = 20
     locks                     = { User: {} }
     (1..thread_count).each {|thread|
+
       threads[thread] = Thread.new {
-        Thread.current[:thread_no] = thread
-        sleep thread * 3
+
         log "Started import thread# #{thread} ..."
-        steps = 20
+        Thread.current[:thread_no]  = thread
+        Thread.current[:loop_count] = 0
+
         loop do
-          count += steps
+          # get the offset for the current thread and loop count
+          thread_offset_base = (Thread.current[:thread_no] - 1) * steps
+          thread_step        = thread_count * steps
+          offset             = Thread.current[:loop_count] * thread_step + thread_offset_base
+
           log "loading... thread# #{thread} ..."
-          offset = count - steps
-          if offset != 0
-            offset = count - steps + 1
-          end
-          records = load( 'Ticket', steps, count - steps)
+          records = load( 'Ticket', steps, offset)
           if !records || !records[0]
             log "... thread# #{thread}, no more work."
             break
           end
           _ticket_result(records, locks, thread)
+
+          Thread.current[:loop_count] += 1
         end
         ActiveRecord::Base.connection.close
       }