ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

flotsam: fix full cached file replacement, do default assets caching with replacement on startup

Browse Source
This commit is contained in:
UbitUmarov
2020-10-30 16:25:07 +00:00
parent 4e23806967
commit 9c1c656fe1
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.Asset
{
public string filename;
public AssetBase asset;
public bool replace;
}
private static readonly ILog m_log = LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType);
@@ -212,21 +213,9 @@ namespace OpenSim.Region.CoreModules.Asset
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache status", "fcache status", "Display cache status", HandleConsoleCommand);
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache clear", "fcache clear [file] [memory]", "Remove all assets in the cache. If file or memory is specified then only this cache is cleared.", HandleConsoleCommand);
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache assets", "fcache assets", "Attempt a deep scan and cache of all assets in all scenes", HandleConsoleCommand);
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache expire", "fcache expire <datetime(mm/dd/YYYY)>", "Purge cached assets older then the specified date/time", HandleConsoleCommand);
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache expire", "fcache expire <datetime(mm/dd/YYYY)>", "Purge cached assets older than the specified date/time", HandleConsoleCommand);
if (!string.IsNullOrWhiteSpace(m_assetLoader))
{
IAssetLoader assetLoader = ServerUtils.LoadPlugin<IAssetLoader>(m_assetLoader, new object[] { });
if (assetLoader != null)
{
HashSet<string> ids = new HashSet<string>();
assetLoader.ForEachDefaultXmlAsset(
m_assetLoaderArgs,
delegate (AssetBase a)
{
ids.Add(a.ID);
});
m_defaultAssets = ids;
}
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache cachedefaultassets", "fcache cachedefaultassets", "loads local default assets to cache. This may override grid ones. use with care", HandleConsoleCommand);
MainConsole.Instance.Commands.AddCommand("Assets", true, "fcache deletedefaultassets", "fcache deletedefaultassets", "deletes default local assets from cache so they can be refreshed from grid. use with care", HandleConsoleCommand);
}
@@ -316,6 +305,23 @@ namespace OpenSim.Region.CoreModules.Asset
m_cancelSource = new CancellationTokenSource();
WorkManager.RunInThreadPool(ProcessWrites, null, "FloatsamCacheWriter", false);
}
if(!string.IsNullOrWhiteSpace(m_assetLoader) && scene.RegionInfo.RegionID == m_Scenes[0].RegionInfo.RegionID)
{
IAssetLoader assetLoader = ServerUtils.LoadPlugin<IAssetLoader>(m_assetLoader, new object[] { });
if (assetLoader != null)
{
HashSet<string> ids = new HashSet<string>();
assetLoader.ForEachDefaultXmlAsset(
m_assetLoaderArgs,
delegate (AssetBase a)
{
Cache(a, true);
ids.Add(a.ID);
});
m_defaultAssets = ids;
}
}
}
}
}
@@ -328,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Asset
{
if(m_assetFileWriteQueue.TryTake(out WriteAssetInfo wai,-1, m_cancelSource.Token))
{
WriteFileCache(wai.filename,wai.asset,false);
WriteFileCache(wai.filename,wai.asset,wai.replace);
wai.asset = null;
Thread.Sleep(20);
}
@@ -385,7 +391,8 @@ namespace OpenSim.Region.CoreModules.Asset
WriteAssetInfo wai = new WriteAssetInfo()
{
filename = filename,
asset = asset
asset = asset,
replace = replace
};
if (m_assetFileWriteQueue != null)
@@ -983,8 +990,13 @@ namespace OpenSim.Region.CoreModules.Asset
File.Delete(filename);
File.Move(tempname, filename);
}
catch (IOException)
catch
{
try
{
File.Delete(tempname);
}
catch{ }
// 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.