You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by an...@apache.org on 2019/12/19 15:36:36 UTC

[cloudstack] branch master updated (cf6e616 -> 4b43c26)

This is an automated email from the ASF dual-hosted git repository.

andrijapanic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from cf6e616  Revert "Add missing HA config keys (#3737)" (#3774)
     add 4b43c26  Better tracking host maintanence and handling of migration jobs (#3425)

No new revisions were added by this update.

Summary of changes:
 .../java/com/cloud/resource/ResourceState.java     |  41 ++-
 .../admin/host/PrepareForMaintenanceCmd.java       |  22 +-
 .../java/com/cloud/ha/HighAvailabilityManager.java |   1 +
 .../java/com/cloud/resource/ResourceManager.java   |   7 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |   6 +-
 .../datacenter/entity/api/db/EngineHostVO.java     |  32 +-
 .../src/main/java/com/cloud/host/HostVO.java       |  26 +-
 .../META-INF/db/schema-41300to41400-cleanup.sql    |   1 +
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |  84 ++++-
 .../java/com/cloud/ha/dao/HighAvailabilityDao.java |   2 +
 .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java  |  17 +
 .../com/cloud/resource/ResourceManagerImpl.java    | 208 +++++++----
 .../main/java/com/cloud/server/StatsCollector.java |   6 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java     |  30 +-
 .../cloud/resource/MockResourceManagerImpl.java    |   6 +-
 .../cloud/resource/ResourceManagerImplTest.java    | 248 +++++++++----
 test/integration/smoke/test_host_maintenance.py    | 392 +++++++++++++--------
 ui/scripts/metrics.js                              |   1 +
 ui/scripts/system.js                               |   8 +-
 19 files changed, 779 insertions(+), 359 deletions(-)