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

Thank you, coyled, for a patch to change Flotsamcache path generation 

to avoid directory overflow.
trunk
Melanie Thielker 2009-07-29 17:21:36 +00:00
parent cabda86615
commit cbeebc209d
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ namespace Flotsam.RegionModules.AssetCache
/// WaitOnInprogressTimeout = 3000 /// WaitOnInprogressTimeout = 3000
/// ///
/// ; Number of tiers to use for cache directories (current valid range 1 to 3) /// ; Number of tiers to use for cache directories (current valid range 1 to 3)
/// CacheDirectoryTiers = 2 /// CacheDirectoryTiers = 1
/// ///
/// ; Number of letters per path tier, 1 will create 16 directories per tier, 2 - 256, 3 - 4096 and 4 - 65K /// ; Number of letters per path tier, 1 will create 16 directories per tier, 2 - 256, 3 - 4096 and 4 - 65K
/// CacheDirectoryTierLength = 3 /// CacheDirectoryTierLength = 3
@ -148,7 +148,7 @@ namespace Flotsam.RegionModules.AssetCache
private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.Zero; private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.Zero;
private static int m_CacheDirectoryTiers = 1; private static int m_CacheDirectoryTiers = 1;
private static int m_CacheDirectoryTierLen = 4; private static int m_CacheDirectoryTierLen = 3;
private static int m_CacheWarnAt = 30000; 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();
@ -228,7 +228,7 @@ namespace Flotsam.RegionModules.AssetCache
m_CacheDirectoryTiers = 3; m_CacheDirectoryTiers = 3;
} }
m_CacheDirectoryTierLen = assetConfig.GetInt("CacheDirectoryTierLen", 1); m_CacheDirectoryTierLen = assetConfig.GetInt("CacheDirectoryTierLength", 3);
if (m_CacheDirectoryTierLen < 1) if (m_CacheDirectoryTierLen < 1)
{ {
m_CacheDirectoryTierLen = 1; m_CacheDirectoryTierLen = 1;
@ -507,7 +507,7 @@ namespace Flotsam.RegionModules.AssetCache
string path = m_CacheDirectory; string path = m_CacheDirectory;
for (int p = 1; p <= m_CacheDirectoryTiers; p++) for (int p = 1; p <= m_CacheDirectoryTiers; p++)
{ {
string pathPart = id.Substring(id.Length - (p * m_CacheDirectoryTierLen), m_CacheDirectoryTierLen); string pathPart = id.Substring((p - 1) * m_CacheDirectoryTierLen, m_CacheDirectoryTierLen);
path = Path.Combine(path, pathPart); path = Path.Combine(path, pathPart);
} }

11
bin/config-include/FlotsamCache.ini.example
View File

@ -37,3 +37,14 @@
; long (in miliseconds) to block a request thread while trying to complete ; long (in miliseconds) to block a request thread while trying to complete
; an existing write to disk. ; an existing write to disk.
; WaitOnInprogressTimeout = 3000 ; WaitOnInprogressTimeout = 3000
; Number of tiers to use for cache directories (current valid
; range 1 to 3)
;CacheDirectoryTiers = 1
; 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