Resolve merge commits, stage 1

2 files changed, 86 insertions, 58 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index d85d727..a0648f7 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -316,6 +316,12 @@ namespace Flotsam.RegionModules.AssetCache
                     LogException(e);
                 }
             }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                    asset.ID, e.Message, e.StackTrace);
+            }
         }
 
         public void Cache(AssetBase asset)
@@ -368,13 +374,13 @@ namespace Flotsam.RegionModules.AssetCache
 
                     asset = (AssetBase)bformatter.Deserialize(stream);
 
-                    UpdateMemoryCache(id, asset);
-
                     m_DiskHits++;
                 }
                 catch (System.Runtime.Serialization.SerializationException e)
                 {
-                    LogException(e);
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to get file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
 
                     // If there was a problem deserializing the asset, the asset may
                     // either be corrupted OR was serialized under an old format
@@ -384,7 +390,9 @@ namespace Flotsam.RegionModules.AssetCache
                 }
                 catch (Exception e)
                 {
-                    LogException(e);
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to get file {0} for asset {1}.  Exception {2} {3}",
+                        filename, id, e.Message, e.StackTrace);
                 }
                 finally
                 {
@@ -393,7 +401,6 @@ namespace Flotsam.RegionModules.AssetCache
                 }
             }
 
-
 #if WAIT_ON_INPROGRESS_REQUESTS
             // Check if we're already downloading this asset.  If so, try to wait for it to
             // download.
@@ -416,7 +423,6 @@ namespace Flotsam.RegionModules.AssetCache
                 m_RequestsForInprogress++;
             }
 #endif
-
             return asset;
         }
 
@@ -428,9 +434,15 @@ namespace Flotsam.RegionModules.AssetCache
 
             if (m_MemoryCacheEnabled)
                 asset = GetFromMemoryCache(id);
-            else if (m_FileCacheEnabled)
+
+            if (asset == null && m_FileCacheEnabled)
+            {
                 asset = GetFromFileCache(id);
 
+                if (m_MemoryCacheEnabled && asset != null)
+                    UpdateMemoryCache(id, asset);
+            }
+
             if (((m_LogLevel >= 1)) && (m_HitRateDisplay != 0) && (m_Requests % m_HitRateDisplay == 0))
             {
                 m_HitRateFile = (double)m_DiskHits / m_Requests * 100.0;
@@ -445,7 +457,6 @@ namespace Flotsam.RegionModules.AssetCache
                 }
 
                 m_log.InfoFormat("[FLOTSAM ASSET CACHE]: {0} unnessesary requests due to requests for assets that are currently downloading.", m_RequestsForInprogress);
-                
             }
 
             return asset;
@@ -459,7 +470,7 @@ namespace Flotsam.RegionModules.AssetCache
         public void Expire(string id)
         {
             if (m_LogLevel >= 2)
-                m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Expiring Asset {0}.", id);
+                m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Expiring Asset {0}", id);
 
             try
             {
@@ -477,7 +488,9 @@ namespace Flotsam.RegionModules.AssetCache
             }
             catch (Exception e)
             {
-                LogException(e);
+                m_log.ErrorFormat(
+                    "[FLOTSAM ASSET CACHE]: Failed to expire cached file {0}.  Exception {1} {2}",
+                    id, e.Message, e.StackTrace);
             }
         }
 
@@ -597,31 +610,59 @@ namespace Flotsam.RegionModules.AssetCache
 
             try
             {
-                if (!Directory.Exists(directory))
+                try
                 {
-                    Directory.CreateDirectory(directory);
+                    if (!Directory.Exists(directory))
+                    {
+                        Directory.CreateDirectory(directory);
+                    }
+    
+                    stream = File.Open(tempname, FileMode.Create);
+                    BinaryFormatter bformatter = new BinaryFormatter();
+                    bformatter.Serialize(stream, asset);
                 }
+                catch (IOException e)
+                {
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Failed to write asset {0} to temporary location {1} (final {2}) on cache in {3}.  Exception {4} {5}.",
+                        asset.ID, tempname, filename, directory, e.Message, e.StackTrace);
 
-                stream = File.Open(tempname, FileMode.Create);
-                BinaryFormatter bformatter = new BinaryFormatter();
-                bformatter.Serialize(stream, asset);
-                stream.Close();
-
-                // Now that it's written, rename it so that it can be found.
-                File.Move(tempname, filename);
+                    return;
+                }
+                finally
+                {
+                    if (stream != null)
+                        stream.Close();
+                }
 
-                if (m_LogLevel >= 2)
-                    m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Cache Stored :: {0}", asset.ID);
-            }
-            catch (Exception e)
-            {
-                LogException(e);
+                try
+                {
+                    // Now that it's written, rename it so that it can be found.
+                    //
+    //                File.Copy(tempname, filename, true);
+    //                File.Delete(tempname);
+                    //
+                    // For a brief period, this was done as a separate copy and then temporary file delete operation to
+                    // avoid an IOException caused by move if some competing thread had already written the file.
+                    // However, this causes exceptions on Windows when other threads attempt to read a file
+                    // which is still being copied.  So instead, go back to moving the file and swallow any IOException.
+                    //
+                    // This situation occurs fairly rarely anyway.  We assume in this that moves are atomic on the
+                    // filesystem.
+                    File.Move(tempname, filename);
+    
+                    if (m_LogLevel >= 2)
+                        m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Cache Stored :: {0}", asset.ID);
+                }
+                catch (IOException)
+                {
+                    // If we see an IOException here it's likely that some other competing thread has written the
+                    // cache file first, so ignore.  Other IOException errors (e.g. filesystem full) should be
+                    // signally by the earlier temporary file writing code.
+                }
             }
             finally
             {
-                if (stream != null)
-                    stream.Close();
-
                 // Even if the write fails with an exception, we need to make sure
                 // that we release the lock on that file, otherwise it'll never get
                 // cached
@@ -635,22 +676,9 @@ namespace Flotsam.RegionModules.AssetCache
                         waitEvent.Set();
                     }
 #else
-                    if (m_CurrentlyWriting.Contains(filename))
-                    {
-                        m_CurrentlyWriting.Remove(filename);
-                    }
+                    m_CurrentlyWriting.Remove(filename);
 #endif
                 }
-
-            }
-        }
-
-        private static void LogException(Exception e)
-        {
-            string[] text = e.ToString().Split(new char[] { '\n' });
-            foreach (string t in text)
-            {
-                m_log.ErrorFormat("[FLOTSAM ASSET CACHE]: {0} ", t);
             }
         }
 
@@ -706,8 +734,7 @@ namespace Flotsam.RegionModules.AssetCache
                 s.ForEachSOG(delegate(SceneObjectGroup e)
                 {
                     gatherer.GatherAssetUuids(e, assets);
-                }
-                );
+                });
             }
 
             foreach (UUID assetID in assets.Keys)
@@ -740,7 +767,9 @@ namespace Flotsam.RegionModules.AssetCache
                 }
                 catch (Exception e)
                 {
-                    LogException(e);
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Couldn't clear asset cache directory {0} from {1}.  Exception {2} {3}",
+                        dir, m_CacheDirectory, e.Message, e.StackTrace);
                 }
             }
 
@@ -752,7 +781,9 @@ namespace Flotsam.RegionModules.AssetCache
                 }
                 catch (Exception e)
                 {
-                    LogException(e);
+                    m_log.ErrorFormat(
+                        "[FLOTSAM ASSET CACHE]: Couldn't clear asset cache file {0} from {1}.  Exception {1} {2}",
+                        file, m_CacheDirectory, e.Message, e.StackTrace);
                 }
             }
         }
@@ -778,7 +809,7 @@ namespace Flotsam.RegionModules.AssetCache
     
                             foreach (string s in Directory.GetFiles(m_CacheDirectory, "*.fac"))
                             {
-                                m_log.Info("[FLOTSAM ASSET CACHE]: Deep Scans were performed on the following regions:");
+                                m_log.Info("[FLOTSAM ASSET CACHE]: Deep scans have previously been performed on the following regions:");
     
                                 string RegionID = s.Remove(0,s.IndexOf("_")).Replace(".fac","");
                                 DateTime RegionDeepScanTMStamp = File.GetLastWriteTime(s);
@@ -849,7 +880,6 @@ namespace Flotsam.RegionModules.AssetCache
                         Util.FireAndForget(delegate {
                             int assetsCached = CacheScenes();
                             m_log.InfoFormat("[FLOTSAM ASSET CACHE]: Completed Scene Caching, {0} assets found.", assetsCached);
-
                         });
 
                         break;
@@ -904,7 +934,6 @@ namespace Flotsam.RegionModules.AssetCache
 
         #region IAssetService Members
 
-
         public AssetMetadata GetMetadata(string id)
         {
             AssetBase asset = Get(id);
@@ -934,7 +963,6 @@ namespace Flotsam.RegionModules.AssetCache
             Cache(asset);
 
             return asset.ID;
-
         }
 
         public bool UpdateContent(string id, byte[] data)
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 63b0c31..2ff1920 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -65,18 +65,18 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
             config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true");
 
             m_cache = new FlotsamAssetCache();
-            m_scene = SceneSetupHelpers.SetupScene();
-            SceneSetupHelpers.SetupSceneModules(m_scene, config, m_cache);
+            m_scene = SceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, config, m_cache);
         }
 
         [Test]
         public void TestCacheAsset()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
             AssetBase asset = AssetHelpers.CreateAsset();
-            asset.ID = TestHelper.ParseTail(0x1).ToString();
+            asset.ID = TestHelpers.ParseTail(0x1).ToString();
 
             // Check we don't get anything before the asset is put in the cache
             AssetBase retrievedAsset = m_cache.Get(asset.ID.ToString());
@@ -93,11 +93,11 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
         [Test]
         public void TestExpireAsset()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
             AssetBase asset = AssetHelpers.CreateAsset();
-            asset.ID = TestHelper.ParseTail(0x2).ToString();
+            asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
             m_cache.Store(asset);
 
@@ -110,11 +110,11 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
         [Test]
         public void TestClearCache()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
             AssetBase asset = AssetHelpers.CreateAsset();
-            asset.ID = TestHelper.ParseTail(0x2).ToString();
+            asset.ID = TestHelpers.ParseTail(0x2).ToString();
 
             m_cache.Store(asset);