From 715a5f6bc1fae986168798d5e8865c42eec82588 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@icloud.com>
Date: Tue, 7 Mar 2023 16:28:21 +0800
Subject: [PATCH] fix(baremetal): not update hypervisor host's status

---
 pkg/baremetal/cronjobs.go |  4 ++++
 pkg/baremetal/manager.go  | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkg/baremetal/cronjobs.go b/pkg/baremetal/cronjobs.go
index 9699b33cc2..2e3e21e9cb 100644
--- a/pkg/baremetal/cronjobs.go
+++ b/pkg/baremetal/cronjobs.go
@@ -92,6 +92,10 @@ func (job *SStatusProbeJob) Name() string {
 }
 
 func (job *SStatusProbeJob) Do(ctx context.Context, now time.Time) error {
+	if job.baremetal.IsHypervisorHost() {
+		log.Infof("baremetal %q is host, skipping status probe", job.baremetal.GetName())
+		return nil
+	}
 	bStatus := job.baremetal.GetStatus()
 	if bStatus == api.BAREMETAL_READY || bStatus == api.BAREMETAL_RUNNING || bStatus == api.BAREMETAL_UNKNOWN {
 		ps, err := job.baremetal.GetPowerStatus()
diff --git a/pkg/baremetal/manager.go b/pkg/baremetal/manager.go
index da23175de8..6ac1efc071 100644
--- a/pkg/baremetal/manager.go
+++ b/pkg/baremetal/manager.go
@@ -173,7 +173,9 @@ func (m *SBaremetalManager) InitBaremetal(bmId string, update bool) error {
 	if update {
 		bmObj := bmInstance.(*SBaremetalInstance)
 		if !sets.NewString(INIT, PREPARE, UNKNOWN).Has(bmObj.GetStatus()) {
-			bmObj.SyncStatusBackground()
+			if !bmObj.IsHypervisorHost() {
+				bmObj.SyncStatusBackground()
+			}
 		}
 	}
 	return nil
@@ -532,10 +534,7 @@ func newBaremetalInstance(man *SBaremetalManager, desc jsonutils.JSONObject) (*S
 	bm.cronJobs = []IBaremetalCronJob{
 		NewLogFetchJob(bm, time.Duration(o.Options.LogFetchIntervalSeconds)*time.Second),
 		NewSendMetricsJob(bm, time.Duration(o.Options.SendMetricsIntervalSeconds)*time.Second),
-	}
-	hostType, _ := bm.desc.GetString("host_type")
-	if !utils.IsInStringArray(hostType, []string{api.HOST_TYPE_KVM, api.HOST_TYPE_HYPERVISOR}) {
-		bm.cronJobs = append(bm.cronJobs, NewStatusProbeJob(bm, time.Duration(o.Options.StatusProbeIntervalSeconds)*time.Second))
+		NewStatusProbeJob(bm, time.Duration(o.Options.StatusProbeIntervalSeconds)*time.Second),
 	}
 	err := os.MkdirAll(bm.GetDir(), 0755)
 	if err != nil {
@@ -549,6 +548,11 @@ func newBaremetalInstance(man *SBaremetalManager, desc jsonutils.JSONObject) (*S
 	return bm, nil
 }
 
+func (b *SBaremetalInstance) IsHypervisorHost() bool {
+	hostType, _ := b.desc.GetString("host_type")
+	return utils.IsInStringArray(hostType, []string{api.HOST_TYPE_KVM, api.HOST_TYPE_HYPERVISOR})
+}
+
 func (b *SBaremetalInstance) GetDHCPServerIP() (net.IP, error) {
 	return b.manager.Agent.GetDHCPServerIP()
 }