This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 048649d3515e6cfd298da65f6512df3744b16dbc Merge: 789e2699406 717ce981d4d Author: Daan Hoogland <[email protected]> AuthorDate: Tue Jan 28 14:34:19 2025 +0100 Merge release branch 4.20 to main * 4.20: server: investigate pending HA work when executing in new MS session (#10167) extra null guard (#10264) .../java/com/cloud/ha/HighAvailabilityManager.java | 21 ++++-- .../com/cloud/agent/manager/AgentManagerImpl.java | 6 +- .../resources/META-INF/db/schema-42000to42010.sql | 3 + server/src/main/java/com/cloud/ha/HaWorkVO.java | 15 ++++- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 74 ++++++++++++++++++---- .../java/com/cloud/ha/dao/HighAvailabilityDao.java | 2 + .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 30 ++++++++- .../com/cloud/resource/ResourceManagerImpl.java | 30 ++++----- .../ha/provider/host/HAAbstractHostProvider.java | 2 +- .../cloud/ha/HighAvailabilityManagerImplTest.java | 66 +++++++++++++++++-- .../cloud/ha/dao/HighAvailabilityDaoImplTest.java | 59 ++++++++++++++++- 11 files changed, 262 insertions(+), 46 deletions(-)
