From 2826f713d449404fa3908472bb49f4d6515ad048 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 21:25:26 +0100 Subject: stop creating caches on all standalone regions on a single instance ( why are shared modules been created on every scene?? ) --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 4 ++-- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 58bd4ea..47792a2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; private IGridService m_GridService; - private RegionInfoCache m_RegionInfoCache = null; + static private RegionInfoCache m_RegionInfoCache = null; private bool m_Enabled; @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private bool InitialiseService(IConfigSource source, RegionInfoCache ric) { - if(ric == null) + if(ric == null && m_RegionInfoCache == null) m_RegionInfoCache = new RegionInfoCache(); else m_RegionInfoCache = ric; diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 21f7567..077eb97 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private IGridService m_LocalGridService; private IGridService m_RemoteGridService; - private RegionInfoCache m_RegionInfoCache = new RegionInfoCache(); + static private RegionInfoCache m_RegionInfoCache; public RemoteGridServicesConnector() { @@ -122,6 +122,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return false; } + if(m_RegionInfoCache == null) + m_RegionInfoCache = new RegionInfoCache(); + return true; } -- cgit v1.1 From 4599b3ecfdde9cf6e5d2b87da9824c114a9822a0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 22:05:55 +0100 Subject: test jenkins for error line number --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 9 ++++----- OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 8 +++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 47792a2..3900e7b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -85,9 +85,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid { string name = moduleConfig.GetString("GridServices", ""); if (name == Name) - { - - if(InitialiseService(source,null)) + { + if(InitialiseService(source, null)) m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); } } @@ -151,7 +150,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); - scene.EventManager.OnRegionUp += OnRegionUp; +// scene.EventManager.OnRegionUp += OnRegionUp; } public void RemoveRegion(Scene scene) @@ -160,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); - scene.EventManager.OnRegionUp -= OnRegionUp; + // scene.EventManager.OnRegionUp -= OnRegionUp; } public void RegionLoaded(Scene scene) diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index bdf217c..f8485e0 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs @@ -156,6 +156,9 @@ namespace OpenSim.Tests.Common TestScene testScene = new TestScene( regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); + testScene.RegionInfo.EstateSettings = new EstateSettings(); + testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random(); + INonSharedRegionModule godsModule = new GodsModule(); godsModule.Initialise(new IniConfigSource()); godsModule.AddRegion(testScene); @@ -197,13 +200,12 @@ namespace OpenSim.Tests.Common m_presenceService.RegionLoaded(testScene); testScene.AddRegionModule(m_presenceService.Name, m_presenceService); - testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random(); + testScene.SetModuleInterfaces(); testScene.LandChannel = new TestLandChannel(testScene); testScene.LoadWorldMap(); - - testScene.RegionInfo.EstateSettings = new EstateSettings(); + testScene.LoginsEnabled = true; testScene.RegisterRegionWithGrid(); -- cgit v1.1 From 7ae421163591e7e3fec8a33791e42d9468b77791 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 22:19:25 +0100 Subject: test jenkins for the null object --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 3900e7b..55f4380 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -149,8 +149,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); - m_RegionInfoCache.CacheLocal(new GridRegion(scene.RegionInfo)); -// scene.EventManager.OnRegionUp += OnRegionUp; + GridRegion r = new GridRegion(scene.RegionInfo); + + m_RegionInfoCache.CacheLocal(r); + + scene.EventManager.OnRegionUp += OnRegionUp; } public void RemoveRegion(Scene scene) @@ -159,7 +162,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; m_RegionInfoCache.Remove(scene.RegionInfo.ScopeID, scene.RegionInfo.RegionID); - // scene.EventManager.OnRegionUp -= OnRegionUp; + scene.EventManager.OnRegionUp -= OnRegionUp; } public void RegionLoaded(Scene scene) -- cgit v1.1 From f4385dcd926450535367c302829197c3a16f3d84 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 22:26:31 +0100 Subject: do not set m_RegionInfoCache null on each LocalGridServicesConnector construction --- .../CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 55f4380..70dc7a3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; private IGridService m_GridService; - static private RegionInfoCache m_RegionInfoCache = null; + static private RegionInfoCache m_RegionInfoCache; private bool m_Enabled; -- cgit v1.1 From 7b55348360dcd879ee53c93cc983ed1d0224a604 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 22:44:41 +0100 Subject: still on jenkins --- .../Grid/LocalGridServiceConnector.cs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 70dc7a3..22e3ecc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -148,12 +148,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; scene.RegisterModuleInterface(this); - - GridRegion r = new GridRegion(scene.RegionInfo); - - m_RegionInfoCache.CacheLocal(r); - - scene.EventManager.OnRegionUp += OnRegionUp; } public void RemoveRegion(Scene scene) @@ -167,6 +161,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void RegionLoaded(Scene scene) { + if (!m_Enabled) + return; + + GridRegion r = new GridRegion(scene.RegionInfo); + + // tests seem not to init this correctly, so brute force + if( m_RegionInfoCache == null) + m_RegionInfoCache = new RegionInfoCache(); + + m_RegionInfoCache.CacheLocal(r); + + scene.EventManager.OnRegionUp += OnRegionUp; } #endregion -- cgit v1.1 From 78d9312fc82c7b4a8342eaa128553b95e59e24f9 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 23:23:28 +0100 Subject: move some code back to AddRegion because some tests dont issue RegionLoaded --- .../Grid/LocalGridServiceConnector.cs | 31 +++++++++++++--------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 22e3ecc..bf211ce 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -60,9 +60,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid m_log.DebugFormat("{0} LocalGridServicesConnector no parms.", LogHeader); } - public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache) + public LocalGridServicesConnector(IConfigSource source) { m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader); + InitialiseService(source, null); + } + + public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache) + { + m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly witj cache.", LogHeader); InitialiseService(source, regionInfoCache); } @@ -148,6 +154,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; scene.RegisterModuleInterface(this); + + + + // tests seem not to init this correctly, so brute force + if( m_RegionInfoCache == null) + m_RegionInfoCache = new RegionInfoCache(); + + GridRegion r = new GridRegion(scene.RegionInfo); + m_RegionInfoCache.CacheLocal(r); + + scene.EventManager.OnRegionUp += OnRegionUp; } public void RemoveRegion(Scene scene) @@ -161,18 +178,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void RegionLoaded(Scene scene) { - if (!m_Enabled) - return; - - GridRegion r = new GridRegion(scene.RegionInfo); - - // tests seem not to init this correctly, so brute force - if( m_RegionInfoCache == null) - m_RegionInfoCache = new RegionInfoCache(); - - m_RegionInfoCache.CacheLocal(r); - - scene.EventManager.OnRegionUp += OnRegionUp; } #endregion -- cgit v1.1 From 0509badcc164a3850935682e452ce99491d0f006 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 30 Jul 2016 23:56:54 +0100 Subject: another try on jenkins --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 8 +++----- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index bf211ce..95a4f66 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private static string LogHeader = "[LOCAL GRID SERVICE CONNECTOR]"; private IGridService m_GridService; - static private RegionInfoCache m_RegionInfoCache; + private RegionInfoCache m_RegionInfoCache; private bool m_Enabled; @@ -155,11 +155,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); - - // tests seem not to init this correctly, so brute force - if( m_RegionInfoCache == null) - m_RegionInfoCache = new RegionInfoCache(); +// if( m_RegionInfoCache == null) +// m_RegionInfoCache = new RegionInfoCache(); GridRegion r = new GridRegion(scene.RegionInfo); m_RegionInfoCache.CacheLocal(r); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 077eb97..96ff4b3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private IGridService m_LocalGridService; private IGridService m_RemoteGridService; - static private RegionInfoCache m_RegionInfoCache; + private RegionInfoCache m_RegionInfoCache; public RemoteGridServicesConnector() { -- cgit v1.1 From db7f1aaa2f77c4bc8e8c4571892feaa254813acd Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 31 Jul 2016 00:03:48 +0100 Subject: cleanup to go break something else --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 95a4f66..d38ac9b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -155,10 +155,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); - // tests seem not to init this correctly, so brute force -// if( m_RegionInfoCache == null) -// m_RegionInfoCache = new RegionInfoCache(); - GridRegion r = new GridRegion(scene.RegionInfo); m_RegionInfoCache.CacheLocal(r); -- cgit v1.1