Merge pull request #56 from amandaleeang/hg-slow-fetch

Gate HGUuidGatherer per-asset Debug logs on WebUtil.DebugLevel

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_regionGlobalX = scene.RegionInfo.WorldLocX;
                 m_regionGlobalY = scene.RegionInfo.WorldLocY;
                 m_regionSizeX = scene.RegionInfo.RegionSizeX;
-                m_regionSizeY = scene.RegionInfo.RegionSizeX;
+                m_regionSizeY = scene.RegionInfo.RegionSizeY;
                 m_regionName = scene.RegionInfo.RegionName;
 
                 m_scene.RegisterModuleInterface<IWorldMapModule>(this);

OpenSim/Region/Framework/Scenes/UuidGatherer.cs

@@ -1337,10 +1337,15 @@ namespace OpenSim.Region.Framework.Scenes
         {
             string IDstr = assetID.ToString();
             AssetBase asset = m_assetService.Get(IDstr, m_assetServerURL, true);
-            if (asset is null)
+            // Per-asset Debug is expensive (sync File+Console). Only when HTTP debug is on:
-                m_log.Debug($"[HGUUIDGatherer]: Failed to fetch asset {IDstr} from {m_assetServerURL}");
+            //   debug http all|out N   (WebUtil.DebugLevel > 0)
-            else
+            if (WebUtil.DebugLevel > 0)
-                m_log.Debug($"[HGUUIDGatherer]: Copied asset {IDstr} from {m_assetServerURL} to local asset server");
+            {
+                if (asset is null)
+                    m_log.Debug($"[HGUUIDGatherer]: Failed to fetch asset {IDstr} from {m_assetServerURL}");
+                else
+                    m_log.Debug($"[HGUUIDGatherer]: Copied asset {IDstr} from {m_assetServerURL} to local asset server");
+            }
 
             return asset;
         }

bin/OpenSimDefaults.ini

@@ -61,6 +61,10 @@
     ; QueueUserWorkItem, SmartThreadPool, and Thread.
     async_call_method = SmartThreadPool
 
+    ; Min threads to allocate on the FireAndForget thread pool
+    ; when running with the SmartThreadPool option above
+    MinPoolThreads = 2
+
     ; Max threads to allocate on the FireAndForget thread pool
     ; when running with the SmartThreadPool option above
     MaxPoolThreads = 300