This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 22bf8fd5d14559fa34f9e6f8acdaa33c8edbe165
Merge: 69998f7c40f 12513e18fa3
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Mon Sep 22 16:31:01 2025 +0200
Merge remote-tracking branch 'apache/4.20'
.../server/ManagementServerHostStatsEntry.java | 2 +-
.../main/java/com/cloud/server/StatsCollector.java | 19 ++--
.../java/com/cloud/server/StatsCollectorTest.java | 112 +++++++++++++++++++++
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 2 +-
5 files changed, 126 insertions(+), 11 deletions(-)
diff --cc server/src/main/java/com/cloud/server/StatsCollector.java
index 70c95bdc70e,7e83d452bb9..a0d9c09c306
--- a/server/src/main/java/com/cloud/server/StatsCollector.java
+++ b/server/src/main/java/com/cloud/server/StatsCollector.java
@@@ -756,10 -759,10 +759,10 @@@ public class StatsCollector extends Man
try {
mshost = managementServerHostDao.findByMsid(msid);
// get local data
- hostStatsEntry = getDataFrom(mshost);
- managementServerHostStats.put(mshost.getUuid(),
hostStatsEntry);
+ msHostStatsEntry = getDataFrom(mshost);
+ managementServerHostStats.put(mshost.getUuid(),
msHostStatsEntry);
// send to other hosts
- clusterManager.publishStatus(gson.toJson(msHostStatsEntry));
-
clusterManager.publishStatus(msStatsGson.toJson(hostStatsEntry));
++
clusterManager.publishStatus(msStatsGson.toJson(msHostStatsEntry));
} catch (Throwable t) {
// pokemon catch to make sure the thread stays running
logger.error("Error trying to retrieve management server host
statistics", t);
