opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): probing multiple container status (#24529)

Browse Source
This commit is contained in:
Zexi Li
2026-03-24 10:27:06 +08:00
committed by GitHub
parent ab7210c6b6
commit 7c26ab8db3
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pod.go
+12 -6
View File
@@ -123,7 +123,7 @@ type PodInstance interface {
StartContainer(ctx context.Context, userCred mcclient.TokenCredential, ctrId string, input *hostapi.ContainerCreateInput) (jsonutils.JSONObject, error)
StartLocalContainer(ctx context.Context, userCred mcclient.TokenCredential, ctrId string) (jsonutils.JSONObject, error)
DeleteContainer(ctx context.Context, cred mcclient.TokenCredential, id string) (jsonutils.JSONObject, error)
SyncStatus(reason string)
SyncStatus(reason string, ctrId string)
SyncContainerStatus(ctx context.Context, cred mcclient.TokenCredential, ctrId string) (jsonutils.JSONObject, error)
StopContainer(ctx context.Context, userCred mcclient.TokenCredential, ctrId string, input *hostapi.ContainerStopInput) (jsonutils.JSONObject, error)
GetContainerStatus(ctx context.Context, ctrId string) (string, *runtime.Status, error)
@@ -303,7 +303,7 @@ func (s *sPodGuestInstance) ImportServer(pendingDelete bool) {
log.Errorf("start local pod err %s", err.Error())
}
} else {
s.SyncStatus("sync status after host started")
s.SyncStatus("sync status after host started", "")
s.getProbeManager().AddPod(s)
}
}
@@ -438,7 +438,10 @@ func (s *sPodGuestInstance) GetUploadStatus(ctx context.Context, reason string)
}, nil
}
func (s *sPodGuestInstance) UploadStatus(ctx context.Context, reason string) error {
// UploadStatus uploads the status of the pod and the specified container to the server
// If uploadCtrId is not empty, only the status of the specified container will be uploaded
// If uploadCtrId is empty, all containers' status will be uploaded
func (s *sPodGuestInstance) UploadStatus(ctx context.Context, reason string, uploadCtrId string) error {
/*resp, err := s.GetUploadStatus(ctx, reason)
if err != nil {
return errors.Wrapf(err, "get upload status of pod: %s", reason)
@@ -464,6 +467,9 @@ func (s *sPodGuestInstance) UploadStatus(ctx context.Context, reason string) err
}
containerStatuses := make(map[string]*statusman.ContainerStatus)
for ctrId, cStatus := range resp.Containers {
if uploadCtrId != "" && ctrId != uploadCtrId {
continue
}
containerStatuses[ctrId] = &statusman.ContainerStatus{
Status: cStatus.Status,
RestartCount: cStatus.RestartCount,
@@ -489,8 +495,8 @@ func (s *sPodGuestInstance) PostUploadStatus(resp *computeapi.HostUploadGuestSta
}
}
func (s *sPodGuestInstance) SyncStatus(reason string) {
if err := s.UploadStatus(context.Background(), reason); err != nil {
func (s *sPodGuestInstance) SyncStatus(reason string, ctrId string) {
if err := s.UploadStatus(context.Background(), reason, ctrId); err != nil {
log.Warningf("upload status failed, reason: %s, err: %v", reason, err)
}
}
@@ -975,7 +981,7 @@ func (t *localDirtyPodStartTask) Run() {
}
}
}
t.pod.SyncStatus("sync status after dirty pod start locally")
t.pod.SyncStatus("sync status after dirty pod start locally", "")
}
func (t *localDirtyPodStartTask) Dump() string {
pkg/hostman/guestman/pod_helper.go
+1 -1
View File
@@ -230,7 +230,7 @@ func (t *localPodRestartTask) Run() {
log.Errorf("start container %s err: %s", ctr.Id, err.Error())
}
}
t.pod.SyncStatus("sync status after pod and containers restart locally")
t.pod.SyncStatus("sync status after pod and containers restart locally", "")
}
func (t *localPodRestartTask) Dump() string {
pkg/hostman/guestman/pod_sync_loop.go
+11 -2
View File
@@ -165,7 +165,12 @@ func (m *SGuestManager) syncContainerLoopIteration(plegCh chan *pleg.PodLifecycl
if ctrId == podMan.GetCRIId() {
log.Infof("pod %s(%s) is started", podMan.GetId(), ctrId)
} else {
podMan.SyncStatus("pod container started")
ctrObj, _ := podMan.GetContainerByCRIId(ctrId)
if ctrObj != nil {
podMan.SyncStatus(fmt.Sprintf("pod container started: %s(%s)", ctrObj.Name, ctrObj.Id), ctrObj.Id)
} else {
podMan.SyncStatus("pod container started", "")
}
}
}
if e.Type == pleg.ContainerRemoved {
@@ -213,13 +218,17 @@ func (m *SGuestManager) syncContainerLoopIteration(plegCh chan *pleg.PodLifecycl
}
log.Infof("sync pod %s container %s status: %s", e.Id, ctrCriId, reason)
// 如果是 primary container 退出，就退出其他容器
syncCtrId := ""
if ctrObj != nil && !isInternalStopped && podMan.IsPrimaryContainer(ctrObj.Id) && ccStatus == computeapi.CONTAINER_STATUS_EXITED {
reason = fmt.Sprintf("stop all containers when primary container %s exited", ctrObj.Name)
if err := podMan.StopAll(context.Background()); err != nil {
log.Errorf("stop all pod containers error: %s", err.Error())
}
}
podMan.SyncStatus(reason)
if ctrObj != nil && !isInternalStopped && !podMan.IsPrimaryContainer(ctrObj.Id) {
syncCtrId = ctrObj.Id
}
podMan.SyncStatus(reason, syncCtrId)
} else {
log.Infof("pod container exited: %s", jsonutils.Marshal(e))
}