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

Change the asset connector to allow connection to different asset servers 

depending on the first two digits of the asset id.
avinationmerge
Melanie 2011-10-06 15:39:21 +02:00
parent 6ab5ca2bda
commit 363a99593d
1 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -51,6 +51,7 @@ namespace OpenSim.Services.Connectors
private int m_retryCounter; private int m_retryCounter;
private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>(); private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
private Timer m_retryTimer; private Timer m_retryTimer;
private Dictionary<string, string> m_UriMap = new Dictionary<string, string>();
public AssetServicesConnector() public AssetServicesConnector()
{ {
} }
@ -91,6 +92,34 @@ namespace OpenSim.Services.Connectors
m_retryTimer = new Timer(); m_retryTimer = new Timer();
m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck); m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
m_retryTimer.Interval = 60000; m_retryTimer.Interval = 60000;
Uri serverUri = new Uri(m_ServerURI);
string groupHost = serverUri.Host;
for (int i = 0 ; i < 256 ; i++)
{
string prefix = i.ToString("x2");
groupHost = assetConfig.GetString("AssetServerHost_"+prefix, groupHost);
m_UriMap[prefix] = groupHost;
//m_log.DebugFormat("[ASSET]: Using {0} for prefix {1}", groupHost, prefix);
}
}
private string MapServer(string id)
{
UriBuilder serverUri = new UriBuilder(m_ServerURI);
string prefix = id.Substring(0, 2).ToLower();
string host = m_UriMap[prefix];
serverUri.Host = host;
// m_log.DebugFormat("[ASSET]: Using {0} for host name for prefix {1}", host, prefix);
return serverUri.Uri.AbsoluteUri;
} }
protected void retryCheck(object source, ElapsedEventArgs e) protected void retryCheck(object source, ElapsedEventArgs e)
@ -145,7 +174,7 @@ namespace OpenSim.Services.Connectors
public AssetBase Get(string id) public AssetBase Get(string id)
{ {
string uri = m_ServerURI + "/assets/" + id; string uri = MapServer(id) + "/assets/" + id;
AssetBase asset = null; AssetBase asset = null;
if (m_Cache != null) if (m_Cache != null)
@ -180,7 +209,7 @@ namespace OpenSim.Services.Connectors
return fullAsset.Metadata; return fullAsset.Metadata;
} }
string uri = m_ServerURI + "/assets/" + id + "/metadata"; string uri = MapServer(id) + "/assets/" + id + "/metadata";
AssetMetadata asset = SynchronousRestObjectRequester. AssetMetadata asset = SynchronousRestObjectRequester.
MakeRequest<int, AssetMetadata>("GET", uri, 0); MakeRequest<int, AssetMetadata>("GET", uri, 0);
@ -197,7 +226,7 @@ namespace OpenSim.Services.Connectors
return fullAsset.Data; return fullAsset.Data;
} }
RestClient rc = new RestClient(m_ServerURI); RestClient rc = new RestClient(MapServer(id));
rc.AddResourcePath("assets"); rc.AddResourcePath("assets");
rc.AddResourcePath(id); rc.AddResourcePath(id);
rc.AddResourcePath("data"); rc.AddResourcePath("data");
@ -222,7 +251,7 @@ namespace OpenSim.Services.Connectors
public bool Get(string id, Object sender, AssetRetrieved handler) public bool Get(string id, Object sender, AssetRetrieved handler)
{ {
string uri = m_ServerURI + "/assets/" + id; string uri = MapServer(id) + "/assets/" + id;
AssetBase asset = null; AssetBase asset = null;
if (m_Cache != null) if (m_Cache != null)
@ -255,6 +284,31 @@ namespace OpenSim.Services.Connectors
public string Store(AssetBase asset) public string Store(AssetBase asset)
{ {
// Have to assign the asset ID here. This isn't likely to
// trigger since current callers don't pass emtpy IDs
// We need the asset ID to route the request to the proper
// cluster member, so we can't have the server assign one.
if (asset.ID == string.Empty)
{
if (asset.FullID == UUID.Zero)
{
asset.FullID = UUID.Random();
}
asset.ID = asset.FullID.ToString();
}
else if (asset.FullID == UUID.Zero)
{
UUID uuid = UUID.Zero;
if (UUID.TryParse(asset.ID, out uuid))
{
asset.FullID = uuid;
}
else
{
asset.FullID = UUID.Random();
}
}
if (m_Cache != null) if (m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
if (asset.Temporary || asset.Local) if (asset.Temporary || asset.Local)
@ -262,7 +316,7 @@ namespace OpenSim.Services.Connectors
return asset.ID; return asset.ID;
} }
string uri = m_ServerURI + "/assets/"; string uri = MapServer(asset.FullID.ToString()) + "/assets/";
string newID = string.Empty; string newID = string.Empty;
try try
@ -339,7 +393,7 @@ namespace OpenSim.Services.Connectors
} }
asset.Data = data; asset.Data = data;
string uri = m_ServerURI + "/assets/" + id; string uri = MapServer(id) + "/assets/" + id;
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.
MakeRequest<AssetBase, bool>("POST", uri, asset)) MakeRequest<AssetBase, bool>("POST", uri, asset))
@ -354,7 +408,7 @@ namespace OpenSim.Services.Connectors
public bool Delete(string id) public bool Delete(string id)
{ {
string uri = m_ServerURI + "/assets/" + id; string uri = MapServer(id) + "/assets/" + id;
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.
MakeRequest<int, bool>("DELETE", uri, 0)) MakeRequest<int, bool>("DELETE", uri, 0))