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

Fix recent asset request timeout issue by commenting out (for now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest() 

For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53
Since this hasn't been operational for a long time and in release candidate phase, commenting it out for now though will need to revisit this.
Relates to http://opensimulator.org/mantis/view.php?id=7165
bullet-2.82
Justin Clark-Casey (justincc) 2014-05-14 00:11:07 +01:00
parent 4569c595bf
commit c23d37a509
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -117,8 +117,16 @@ namespace OpenSim.Services.Connectors
if (asset == null) if (asset == null)
{ {
asset = SynchronousRestObjectRequester. // XXX: Commented out for now since this has either never been properly operational or not for some time
MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency); // as m_maxAssetRequestConcurrency was being passed as the timeout, not a concurrency limiting option.
// Wasn't noticed before because timeout wasn't actually used.
// Not attempting concurrency setting for now as this omission was discovered in release candidate
// phase for OpenSimulator 0.8. Need to revisit afterwards.
// asset
// = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>(
// "GET", uri, 0, m_maxAssetRequestConcurrency);
asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0);
if (m_Cache != null) if (m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
@ -148,8 +156,7 @@ namespace OpenSim.Services.Connectors
string uri = m_ServerURI + "/assets/" + id + "/metadata"; string uri = m_ServerURI + "/assets/" + id + "/metadata";
AssetMetadata asset = SynchronousRestObjectRequester. AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0);
MakeRequest<int, AssetMetadata>("GET", uri, 0);
return asset; return asset;
} }
@ -290,8 +297,7 @@ namespace OpenSim.Services.Connectors
string newID; string newID;
try try
{ {
newID = SynchronousRestObjectRequester. newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset);
MakeRequest<AssetBase, string>("POST", uri, asset);
} }
catch (Exception e) catch (Exception e)
{ {
@ -337,8 +343,7 @@ namespace OpenSim.Services.Connectors
string uri = m_ServerURI + "/assets/" + id; string uri = m_ServerURI + "/assets/" + id;
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset))
MakeRequest<AssetBase, bool>("POST", uri, asset))
{ {
if (m_Cache != null) if (m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
@ -352,8 +357,7 @@ namespace OpenSim.Services.Connectors
{ {
string uri = m_ServerURI + "/assets/" + id; string uri = m_ServerURI + "/assets/" + id;
if (SynchronousRestObjectRequester. if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0))
MakeRequest<int, bool>("DELETE", uri, 0))
{ {
if (m_Cache != null) if (m_Cache != null)
m_Cache.Expire(id); m_Cache.Expire(id);