This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7df3bba5c91c82cce41bf6b3b5b71b1c175b402a Merge: c1991d1 750a63a Author: Alex Heneveld <[email protected]> AuthorDate: Tue Sep 14 22:56:11 2021 +0100 This closes #1257 .../brooklyn/api/mgmt/rebind/RebindManager.java | 3 + .../rebind/mementos/BrooklynMementoPersister.java | 2 + .../catalog/internal/CatalogInitialization.java | 101 ++- .../core/catalog/internal/CatalogUtils.java | 8 +- .../brooklyn/core/entity/AbstractEntity.java | 34 +- .../org/apache/brooklyn/core/entity/Entities.java | 9 +- .../internal/EntityTransientCopyInternal.java | 4 +- .../core/entity/lifecycle/ServiceStateLogic.java | 11 +- .../brooklyn/core/feed/AttributePollHandler.java | 27 +- .../core/mgmt/ha/HighAvailabilityManagerImpl.java | 56 +- .../mgmt/internal/BrooklynGarbageCollector.java | 49 +- .../mgmt/internal/EntityManagementSupport.java | 10 +- .../core/mgmt/internal/LocalLocationManager.java | 7 +- .../mgmt/internal/LocalSubscriptionManager.java | 13 +- .../internal/NonDeploymentManagementContext.java | 5 + .../BrooklynMementoPersisterToObjectStore.java | 75 +- .../mgmt/rebind/RebindExceptionHandlerImpl.java | 35 + .../brooklyn/core/mgmt/rebind/RebindIteration.java | 592 +++++++------- .../core/mgmt/rebind/RebindManagerImpl.java | 88 ++- .../mgmt/rebind/dto/BasicManagedBundleMemento.java | 7 + .../brooklyn/core/typereg/BasicManagedBundle.java | 1 + .../util/core/task/BasicExecutionContext.java | 55 +- .../util/core/task/BasicExecutionManager.java | 873 +++++++++++++-------- .../apache/brooklyn/util/core/task/BasicTask.java | 3 +- .../brooklyn/util/core/task/ScheduledTask.java | 7 + .../mgmt/internal/EntityExecutionManagerTest.java | 23 +- .../core/mgmt/rebind/ManagementPlaneIdTest.java | 6 +- .../brooklyn/core/mgmt/rebind/RebindOptions.java | 6 + .../core/mgmt/rebind/RebindTestFixture.java | 6 +- .../brooklyn/core/mgmt/rebind/RebindTestUtils.java | 11 +- .../util/core/task/ScheduledExecutionTest.java | 248 ++++-- .../BrooklynLauncherRebindCatalogOsgiTest.java | 4 +- .../policy/failover/ElectPrimaryPolicy.java | 2 +- .../policy/failover/PrimaryRunningEnricher.java | 5 + .../rest/util/MultiSessionAttributeAdapter.java | 27 +- .../feed/windows/WinRmCommandSensorTest.java | 21 +- .../WindowsPerformanceCounterSensorsTest.java | 6 +- .../brooklyn/util/exceptions/Exceptions.java | 2 +- .../exceptions/RuntimeInterruptedException.java | 12 +- 39 files changed, 1586 insertions(+), 868 deletions(-)
