From 2d2414adcfcf50ba1398f889c0ca301b3409e317 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 13 Jun 2016 18:04:28 -0700 Subject: [PATCH 1/5] Add a few more debug messages to diagnose problems in OSGrid's proxy use --- OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 5d672c38c7..48571e39cb 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs @@ -63,13 +63,18 @@ namespace OpenSim.Server.Handlers.Login public XmlRpcResponse HandleXMLRPCLogin(XmlRpcRequest request, IPEndPoint remoteClient) { + m_log.DebugFormat("[TEST]: HandleXMLRPCLogin from {0}", remoteClient.ToString()); Hashtable requestData = (Hashtable)request.Params[0]; if (m_Proxy && request.Params[3] != null) { + m_log.DebugFormat("[TEST]: Proxy ! {0}", request.Params[3]); IPEndPoint ep = Util.GetClientIPFromXFF((string)request.Params[3]); if (ep != null) + { // Bang! remoteClient = ep; + m_log.DebugFormat("[TEST]: IP is {0}", remoteClient.ToString()); + } } if (requestData != null) From b5f29e93f6345987c0b9b8d6496b489e7336039b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 13 Jun 2016 20:35:40 -0700 Subject: [PATCH 2/5] More debug to diagnose osgrid --- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 +- OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 5811ed93ca..79345efde1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -1111,7 +1111,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void RequestInventoryFile(IClientAPI client, IXfer xferManager) { - + m_log.DebugFormat("[XXX]: RequestInventoryFile"); lock (m_inventoryFileLock) { string filename = "inventory_" + UUID.Random().ToString() + ".tmp"; diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 86fda36e81..3c9570c5c5 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs @@ -70,6 +70,7 @@ namespace OpenSim.Server.Handlers.Grid sr.Close(); body = body.Trim(); + m_log.DebugFormat("[TEST]: ProcessRequest client IP is {0}", httpRequest.RemoteIPEndPoint.ToString()); //m_log.DebugFormat("[XXX]: query String: {0}", body); try From 1e9a94463345a7f7d0efb6957a9e176b758dc692 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 13 Jun 2016 20:39:52 -0700 Subject: [PATCH 3/5] Revert "More debug to diagnose osgrid" This reverts commit b5f29e93f6345987c0b9b8d6496b489e7336039b. --- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 +- OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 79345efde1..5811ed93ca 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -1111,7 +1111,7 @@ namespace OpenSim.Region.Framework.Scenes /// public void RequestInventoryFile(IClientAPI client, IXfer xferManager) { - m_log.DebugFormat("[XXX]: RequestInventoryFile"); + lock (m_inventoryFileLock) { string filename = "inventory_" + UUID.Random().ToString() + ".tmp"; diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 3c9570c5c5..86fda36e81 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs @@ -70,7 +70,6 @@ namespace OpenSim.Server.Handlers.Grid sr.Close(); body = body.Trim(); - m_log.DebugFormat("[TEST]: ProcessRequest client IP is {0}", httpRequest.RemoteIPEndPoint.ToString()); //m_log.DebugFormat("[XXX]: query String: {0}", body); try From 4be4e98525c47f55fb113901b01b5c1d9695a9fd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 13 Jun 2016 20:40:47 -0700 Subject: [PATCH 4/5] Revert "Add a few more debug messages to diagnose problems in OSGrid's proxy use" This reverts commit 2d2414adcfcf50ba1398f889c0ca301b3409e317. --- OpenSim/Server/Handlers/Login/LLLoginHandlers.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs index 48571e39cb..5d672c38c7 100644 --- a/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs +++ b/OpenSim/Server/Handlers/Login/LLLoginHandlers.cs @@ -63,18 +63,13 @@ namespace OpenSim.Server.Handlers.Login public XmlRpcResponse HandleXMLRPCLogin(XmlRpcRequest request, IPEndPoint remoteClient) { - m_log.DebugFormat("[TEST]: HandleXMLRPCLogin from {0}", remoteClient.ToString()); Hashtable requestData = (Hashtable)request.Params[0]; if (m_Proxy && request.Params[3] != null) { - m_log.DebugFormat("[TEST]: Proxy ! {0}", request.Params[3]); IPEndPoint ep = Util.GetClientIPFromXFF((string)request.Params[3]); if (ep != null) - { // Bang! remoteClient = ep; - m_log.DebugFormat("[TEST]: IP is {0}", remoteClient.ToString()); - } } if (requestData != null) From e0a82a82de6fbd62cbcf7a18f5d9b398109948fd Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 14 Jun 2016 08:58:37 -0700 Subject: [PATCH 5/5] "reverting" the keep alive changes brought in from avination, to check if that's what's making osgrid fail. This is not really reverting, it's more manually resetting some places (not all) where keep alive is set. --- OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 5 ++--- OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index cd14212d21..20bdf17320 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -461,7 +461,7 @@ namespace OpenSim.Framework.Servers.HttpServer } OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context); - resp.ReuseContext = false; + resp.ReuseContext = true; HandleRequest(req, resp); // !!!HACK ALERT!!! @@ -1270,8 +1270,7 @@ namespace OpenSim.Framework.Servers.HttpServer requestStream.Close(); //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); - // response.KeepAlive = true; - response.KeepAlive = false; + response.KeepAlive = true; OSD llsdRequest = null; OSD llsdResponse = null; diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index 17e9dc20ee..ccf9c9149d 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs @@ -322,10 +322,6 @@ namespace OpenSim.Framework.Servers.HttpServer { _httpResponse.Body.Flush(); - // disable this till they are safe to use - _httpResponse.Connection = ConnectionType.Close; - _httpResponse.Chunked = false; - _httpResponse.Send(); }