OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you, mcortez, for a patch to correct a folder bloat issue in the 

Flotsam Asset Cache.
Fixes mantis #3950
trunk
Melanie Thielker 2009-07-28 17:20:51 +00:00
parent a1786d4c39
commit b008865110
1 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -92,6 +92,15 @@ namespace Flotsam.RegionModules.AssetCache
/// ; long (in miliseconds) to block a request thread while trying to complete /// ; long (in miliseconds) to block a request thread while trying to complete
/// ; writing to disk. /// ; writing to disk.
/// WaitOnInprogressTimeout = 3000 /// WaitOnInprogressTimeout = 3000
///
/// ; Number of tiers to use for cache directories (current valid range 1 to 3)
/// CacheDirectoryTiers = 2
///
/// ; Number of letters per path tier, 1 will create 16 directories per tier, 2 - 256, 3 - 4096 and 4 - 65K
/// CacheDirectoryTierLength = 3
///
/// ; Warning level for cache directory size
/// CacheWarnAt = 30000
/// ------- /// -------
/// </summary> /// </summary>
@ -138,6 +147,10 @@ namespace Flotsam.RegionModules.AssetCache
private TimeSpan m_FileExpiration = TimeSpan.Zero; private TimeSpan m_FileExpiration = TimeSpan.Zero;
private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.Zero; private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.Zero;
private static int m_CacheDirectoryTiers = 1;
private static int m_CacheDirectoryTierLen = 4;
private static int m_CacheWarnAt = 30000;
private System.Timers.Timer m_CachCleanTimer = new System.Timers.Timer(); private System.Timers.Timer m_CachCleanTimer = new System.Timers.Timer();
public FlotsamAssetCache() public FlotsamAssetCache()
@ -204,6 +217,28 @@ namespace Flotsam.RegionModules.AssetCache
{ {
m_CachCleanTimer.Enabled = false; m_CachCleanTimer.Enabled = false;
} }
m_CacheDirectoryTiers = assetConfig.GetInt("CacheDirectoryTiers", 1);
if (m_CacheDirectoryTiers < 1)
{
m_CacheDirectoryTiers = 1;
}
else if (m_CacheDirectoryTiers > 3)
{
m_CacheDirectoryTiers = 3;
}
m_CacheDirectoryTierLen = assetConfig.GetInt("CacheDirectoryTierLen", 1);
if (m_CacheDirectoryTierLen < 1)
{
m_CacheDirectoryTierLen = 1;
}
else if (m_CacheDirectoryTierLen > 4)
{
m_CacheDirectoryTierLen = 4;
}
m_CacheWarnAt = assetConfig.GetInt("CacheWarnAt", 30000);
} }
} }
} }
@ -447,6 +482,17 @@ namespace Flotsam.RegionModules.AssetCache
File.Delete(file); File.Delete(file);
} }
} }
int dirSize = Directory.GetFiles(dir).Length;
if ( dirSize == 0)
{
Directory.Delete(dir);
}
else if (dirSize >= m_CacheWarnAt)
{
m_log.WarnFormat("[ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}. Suggest increasing tiers, tier length, or reducing cache expiration", dir, dirSize);
}
} }
} }
@ -458,9 +504,14 @@ namespace Flotsam.RegionModules.AssetCache
id = id.Replace(c, '_'); id = id.Replace(c, '_');
} }
string p = id.Substring(id.Length - 4); string path = m_CacheDirectory;
p = Path.Combine(p, id); for (int p = 1; p <= m_CacheDirectoryTiers; p++)
return Path.Combine(m_CacheDirectory, p); {
string pathPart = id.Substring(id.Length - (p * m_CacheDirectoryTierLen), m_CacheDirectoryTierLen);
path = Path.Combine(path, pathPart);
}
return Path.Combine(path, id);
} }
private void WriteFileCache(string filename, AssetBase asset) private void WriteFileCache(string filename, AssetBase asset)