fixing possible race condition on asset delete

collins/app/util/Solr.scala

@@ -178,9 +178,12 @@ class SolrUpdater extends Actor {
   /**
    * Note, even though the callback checks if the asset is deleted, we're still
    * gonna get index requests from the delete asset's meta value deletions
+   *
+   * Note - also we re-fetch the asset from MySQL to avoid a possible race
+   * condition where an asset is deleted immediately after it is updated
    */
   def receive = {
-    case asset: Asset => if (!queue.contains(asset) && !asset.deleted.isDefined) {
+    case asset: Asset => if ((!queue.contains(asset)) && Asset.findByTag(asset.tag).map{_.deleted.isDefined == false}.getOrElse(false)) {
       queue += asset
       if (!scheduled) {
         context.system.scheduler.scheduleOnce(10 milliseconds, self, Reindex)

collins/test/spec/update.rb

@@ -12,10 +12,11 @@ def foo
   end
 
   it "put asset in maintenance mode" do
-    #the asset should be in allocated mode, but might not if a previous test failed
     assets = @client.search 'tag = "001016"'
     assets.size.should eql 1
-    @client.set_status!(assets[0], "Maintenance")
+    #the asset should be in allocated mode, but might not if a previous test failed
+    @client.set_status!(assets[0], "Allocated").should eql true
+    @client.set_status!(assets[0], "Maintenance").should eql true
     sleep(0.2)
     assets = @client.search 'tag = "001016" AND status = maintenance'
     assets.size.should eql 1