aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-14 00:11:07 +0100
committerJustin Clark-Casey (justincc)2014-05-14 00:11:07 +0100
commitc23d37a509bc6ca7bdcba91a61dfd9fb4014639e (patch)
treecae2b954bfdbbdd119e69a09a1a6d31c1259685e
parentFix behaviour change in recent commit bbc1dc6 so that SynchronousRestObjectRe... (diff)
downloadopensim-SC_OLD-c23d37a509bc6ca7bdcba91a61dfd9fb4014639e.zip
opensim-SC_OLD-c23d37a509bc6ca7bdcba91a61dfd9fb4014639e.tar.gz
opensim-SC_OLD-c23d37a509bc6ca7bdcba91a61dfd9fb4014639e.tar.bz2
opensim-SC_OLD-c23d37a509bc6ca7bdcba91a61dfd9fb4014639e.tar.xz
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
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs24
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index ee047e0..2ba8e04 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -117,8 +117,16 @@ namespace OpenSim.Services.Connectors
117 117
118 if (asset == null) 118 if (asset == null)
119 { 119 {
120 asset = SynchronousRestObjectRequester. 120 // XXX: Commented out for now since this has either never been properly operational or not for some time
121 MakeRequest<int, AssetBase>("GET", uri, 0, m_maxAssetRequestConcurrency); 121 // as m_maxAssetRequestConcurrency was being passed as the timeout, not a concurrency limiting option.
122 // Wasn't noticed before because timeout wasn't actually used.
123 // Not attempting concurrency setting for now as this omission was discovered in release candidate
124 // phase for OpenSimulator 0.8. Need to revisit afterwards.
125// asset
126// = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>(
127// "GET", uri, 0, m_maxAssetRequestConcurrency);
128
129 asset = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0);
122 130
123 if (m_Cache != null) 131 if (m_Cache != null)
124 m_Cache.Cache(asset); 132 m_Cache.Cache(asset);
@@ -148,8 +156,7 @@ namespace OpenSim.Services.Connectors
148 156
149 string uri = m_ServerURI + "/assets/" + id + "/metadata"; 157 string uri = m_ServerURI + "/assets/" + id + "/metadata";
150 158
151 AssetMetadata asset = SynchronousRestObjectRequester. 159 AssetMetadata asset = SynchronousRestObjectRequester.MakeRequest<int, AssetMetadata>("GET", uri, 0);
152 MakeRequest<int, AssetMetadata>("GET", uri, 0);
153 return asset; 160 return asset;
154 } 161 }
155 162
@@ -290,8 +297,7 @@ namespace OpenSim.Services.Connectors
290 string newID; 297 string newID;
291 try 298 try
292 { 299 {
293 newID = SynchronousRestObjectRequester. 300 newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset);
294 MakeRequest<AssetBase, string>("POST", uri, asset);
295 } 301 }
296 catch (Exception e) 302 catch (Exception e)
297 { 303 {
@@ -337,8 +343,7 @@ namespace OpenSim.Services.Connectors
337 343
338 string uri = m_ServerURI + "/assets/" + id; 344 string uri = m_ServerURI + "/assets/" + id;
339 345
340 if (SynchronousRestObjectRequester. 346 if (SynchronousRestObjectRequester.MakeRequest<AssetBase, bool>("POST", uri, asset))
341 MakeRequest<AssetBase, bool>("POST", uri, asset))
342 { 347 {
343 if (m_Cache != null) 348 if (m_Cache != null)
344 m_Cache.Cache(asset); 349 m_Cache.Cache(asset);
@@ -352,8 +357,7 @@ namespace OpenSim.Services.Connectors
352 { 357 {
353 string uri = m_ServerURI + "/assets/" + id; 358 string uri = m_ServerURI + "/assets/" + id;
354 359
355 if (SynchronousRestObjectRequester. 360 if (SynchronousRestObjectRequester.MakeRequest<int, bool>("DELETE", uri, 0))
356 MakeRequest<int, bool>("DELETE", uri, 0))
357 { 361 {
358 if (m_Cache != null) 362 if (m_Cache != null)
359 m_Cache.Expire(id); 363 m_Cache.Expire(id);