From c7058cb3e69a9b7cdacefb37dc1b69a8cdf5c384 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Mon, 30 Jun 2025 19:09:30 +0800 Subject: [PATCH] fix: Optimize container image repo restart detection logic (#9347) Refs #8978 --- agent/app/api/v2/image_repo.go | 8 +- agent/app/dto/image_repo.go | 8 +- agent/app/service/image_repo.go | 112 +++++++++++------- frontend/src/api/interface/container.ts | 3 - frontend/src/api/modules/container.ts | 4 +- frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/ja.ts | 1 + frontend/src/lang/modules/ko.ts | 1 + frontend/src/lang/modules/ms.ts | 1 + frontend/src/lang/modules/pt-br.ts | 1 + frontend/src/lang/modules/ru.ts | 1 + frontend/src/lang/modules/zh-Hant.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + frontend/src/views/container/repo/index.vue | 30 ++++- .../views/container/repo/operator/index.vue | 60 +++++++--- 15 files changed, 159 insertions(+), 74 deletions(-) diff --git a/agent/app/api/v2/image_repo.go b/agent/app/api/v2/image_repo.go index 5d8b79bb2..73ed02063 100644 --- a/agent/app/api/v2/image_repo.go +++ b/agent/app/api/v2/image_repo.go @@ -98,20 +98,20 @@ func (b *BaseApi) CreateRepo(c *gin.Context) { // @Tags Container Image-repo // @Summary Delete image repo // @Accept json -// @Param request body dto.ImageRepoDelete true "request" +// @Param request body dto.OperateByID true "request" // @Produce json // @Success 200 // @Security ApiKeyAuth // @Security Timestamp // @Router /containers/repo/del [post] -// @x-panel-log {"bodyKeys":["ids"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"ids","isList":true,"db":"image_repos","output_column":"name","output_value":"names"}],"formatZH":"删除镜像仓库 [names]","formatEN":"delete image repo [names]"} +// @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"image_repos","output_column":"name","output_value":"name"}],"formatZH":"删除镜像仓库 [name]","formatEN":"delete image repo [name]"} func (b *BaseApi) DeleteRepo(c *gin.Context) { - var req dto.ImageRepoDelete + var req dto.OperateByID if err := helper.CheckBindAndValidate(&req, c); err != nil { return } - if err := imageRepoService.BatchDelete(req); err != nil { + if err := imageRepoService.Delete(req); err != nil { helper.InternalServer(c, err) return } diff --git a/agent/app/dto/image_repo.go b/agent/app/dto/image_repo.go index ea5275106..a6bea3f70 100644 --- a/agent/app/dto/image_repo.go +++ b/agent/app/dto/image_repo.go @@ -6,8 +6,8 @@ type ImageRepoCreate struct { Name string `json:"name" validate:"required"` DownloadUrl string `json:"downloadUrl"` Protocol string `json:"protocol"` - Username string `json:"username" validate:"max=256"` - Password string `json:"password" validate:"max=256"` + Username string `json:"username"` + Password string `json:"password"` Auth bool `json:"auth"` } @@ -15,8 +15,8 @@ type ImageRepoUpdate struct { ID uint `json:"id"` DownloadUrl string `json:"downloadUrl"` Protocol string `json:"protocol"` - Username string `json:"username" validate:"max=256"` - Password string `json:"password" validate:"max=256"` + Username string `json:"username"` + Password string `json:"password"` Auth bool `json:"auth"` } diff --git a/agent/app/service/image_repo.go b/agent/app/service/image_repo.go index 7486af997..76aaa6ca5 100644 --- a/agent/app/service/image_repo.go +++ b/agent/app/service/image_repo.go @@ -28,7 +28,7 @@ type IImageRepoService interface { Login(req dto.OperateByID) error Create(req dto.ImageRepoCreate) error Update(req dto.ImageRepoUpdate) error - BatchDelete(req dto.ImageRepoDelete) error + Delete(req dto.OperateByID) error } func NewIImageRepoService() IImageRepoService { @@ -91,28 +91,7 @@ func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error { if err := u.handleRegistries(req.DownloadUrl, "", "create"); err != nil { return fmt.Errorf("create registry %s failed, err: %v", req.DownloadUrl, err) } - if err := restartDocker(); err != nil { - return err - } - ticker := time.NewTicker(3 * time.Second) - defer ticker.Stop() - ctx, cancel := context.WithTimeout(context.Background(), time.Second*20) - if err := func() error { - for range ticker.C { - select { - case <-ctx.Done(): - cancel() - return errors.New("the docker service cannot be restarted") - default: - stdout, err := cmd.RunDefaultWithStdoutBashC("systemctl is-active docker") - if string(stdout) == "active\n" && err == nil { - global.LOG.Info("docker restart with new conf successful!") - return nil - } - } - } - return nil - }(); err != nil { + if err := stopBeforeUpdateRepo(); err != nil { return err } } @@ -131,15 +110,32 @@ func (u *ImageRepoService) Create(req dto.ImageRepoCreate) error { return imageRepoRepo.Create(&imageRepo) } -func (u *ImageRepoService) BatchDelete(req dto.ImageRepoDelete) error { - for _, id := range req.Ids { - if id == 1 { - return errors.New("The default value cannot be edit !") - } +func (u *ImageRepoService) Delete(req dto.OperateByID) error { + if req.ID == 1 { + return errors.New("The default value cannot be edit !") } - if err := imageRepoRepo.Delete(repo.WithByIDs(req.Ids)); err != nil { + itemRepo, _ := imageRepoRepo.Get(repo.WithByID(req.ID)) + if itemRepo.ID == 0 { + return buserr.New("ErrRecordNotFound") + } + if itemRepo.Auth { + _, _ = cmd.NewCommandMgr().RunWithStdout("docker", "logout", "-i", itemRepo.DownloadUrl) + } + if itemRepo.Protocol == "https" { + return imageRepoRepo.Delete(repo.WithByID(req.ID)) + } + if err := u.handleRegistries("", itemRepo.DownloadUrl, "delete"); err != nil { + return fmt.Errorf("delete registry %s failed, err: %v", itemRepo.DownloadUrl, err) + } + if err := validateDockerConfig(); err != nil { return err } + if err := imageRepoRepo.Delete(repo.WithByID(req.ID)); err != nil { + return err + } + go func() { + _ = restartDocker() + }() return nil } @@ -154,38 +150,37 @@ func (u *ImageRepoService) Update(req dto.ImageRepoUpdate) error { if err != nil { return err } + needRestart := false if repo.Protocol == "http" && req.Protocol == "https" { if err := u.handleRegistries("", repo.DownloadUrl, "delete"); err != nil { return fmt.Errorf("delete registry %s failed, err: %v", repo.DownloadUrl, err) } + needRestart = true } if repo.Protocol == "http" && req.Protocol == "http" { if err := u.handleRegistries(req.DownloadUrl, repo.DownloadUrl, "update"); err != nil { return fmt.Errorf("update registry %s => %s failed, err: %v", repo.DownloadUrl, req.DownloadUrl, err) } + needRestart = repo.DownloadUrl == req.DownloadUrl } if repo.Protocol == "https" && req.Protocol == "http" { if err := u.handleRegistries(req.DownloadUrl, "", "create"); err != nil { return fmt.Errorf("create registry %s failed, err: %v", req.DownloadUrl, err) } + needRestart = true } - if repo.Auth != req.Auth || repo.DownloadUrl != req.DownloadUrl { - if repo.Auth { - cmdMgr := cmd.NewCommandMgr() - _, _ = cmdMgr.RunWithStdout("docker", "logout", "-i", repo.DownloadUrl) - } - if req.Auth { - if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil { - return err - } + if needRestart { + if err := stopBeforeUpdateRepo(); err != nil { + return err } } - - if err := validateDockerConfig(); err != nil { - return err + if repo.Auth { + _, _ = cmd.NewCommandMgr().RunWithStdout("docker", "logout", "-i", repo.DownloadUrl) } - if err := restartDocker(); err != nil { - return err + if req.Auth { + if err := u.CheckConn(req.DownloadUrl, req.Username, req.Password); err != nil { + return err + } } upMap := make(map[string]interface{}) @@ -260,3 +255,34 @@ func (u *ImageRepoService) handleRegistries(newHost, delHost, handle string) err } return nil } + +func stopBeforeUpdateRepo() error { + if err := validateDockerConfig(); err != nil { + return err + } + if err := restartDocker(); err != nil { + return err + } + ticker := time.NewTicker(3 * time.Second) + defer ticker.Stop() + ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) + if err := func() error { + for range ticker.C { + select { + case <-ctx.Done(): + cancel() + return errors.New("the docker service cannot be restarted") + default: + stdout, err := cmd.RunDefaultWithStdoutBashC("systemctl is-active docker") + if string(stdout) == "active\n" && err == nil { + global.LOG.Info("docker restart with new conf successful!") + return nil + } + } + } + return nil + }(); err != nil { + return err + } + return nil +} diff --git a/frontend/src/api/interface/container.ts b/frontend/src/api/interface/container.ts index 7b328ca41..b931c17a5 100644 --- a/frontend/src/api/interface/container.ts +++ b/frontend/src/api/interface/container.ts @@ -246,9 +246,6 @@ export namespace Container { password: string; auth: boolean; } - export interface RepoDelete { - ids: Array; - } export interface RepoInfo { id: number; createdAt: Date; diff --git a/frontend/src/api/modules/container.ts b/frontend/src/api/modules/container.ts index f5e25b95a..d5e4da17a 100644 --- a/frontend/src/api/modules/container.ts +++ b/frontend/src/api/modules/container.ts @@ -141,8 +141,8 @@ export const createImageRepo = (params: Container.RepoCreate) => { export const updateImageRepo = (params: Container.RepoUpdate) => { return http.post(`/containers/repo/update`, params, TimeoutEnum.T_40S); }; -export const deleteImageRepo = (params: Container.RepoDelete) => { - return http.post(`/containers/repo/del`, params, TimeoutEnum.T_40S); +export const deleteImageRepo = (id: Number) => { + return http.post(`/containers/repo/del`, { id: id }, TimeoutEnum.T_40S); }; // composeTemplate diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 172479a0f..5c758a2bf 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -886,6 +886,7 @@ const message = { repo: 'Container registry | Container registries', createRepo: 'Add', + httpRepoHelper: 'Operating an HTTP-type repository requires restarting the Docker service.', httpRepo: 'Choosing HTTP protocol requires restarting the Docker service to add it into insecure registries.', delInsecure: 'Deletion of credit', delInsecureHelper: diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index e64d58f47..3b229dbd0 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -861,6 +861,7 @@ const message = { repo: 'レジストリ', createRepo: '追加', + httpRepoHelper: 'HTTPタイプのリポジトリを操作するにはDockerサービスの再起動が必要です。', httpRepo: 'HTTPプロトコルを選択するには、Dockerサービスを再起動して不安定なレジストリに追加する必要があります。', delInsecure: 'クレジットの削除', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 83c3c5d4c..4ea60dc7a 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -852,6 +852,7 @@ const message = { repo: '레지스트리', createRepo: '추가', + httpRepoHelper: 'HTTP 타입 저장소 작업 시 Docker 서비스 재시작이 필요합니다.', httpRepo: 'HTTP 프로토콜을 선택하면 Docker 서비스를 재시작하여 불안정한 레지스트리에 추가해야 합니다.', delInsecure: '신뢰할 수 없는 항목 삭제', delInsecureHelper: diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 2369f1281..a1baa9dcf 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -878,6 +878,7 @@ const message = { repo: 'Pendaftaran', createRepo: 'Tambah', + httpRepoHelper: 'Mengoperasikan repositori jenis HTTP memerlukan mulakan semula perkhidmatan Docker.', httpRepo: 'Memilih protokol HTTP memerlukan memulakan semula perkhidmatan Docker untuk menambahkannya ke pendaftaran tidak selamat.', delInsecure: 'Padamkan pendaftaran tidak selamat', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 35b4d3a53..8130b1247 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -872,6 +872,7 @@ const message = { repo: 'Registries', createRepo: 'Adicionar', + httpRepoHelper: 'Operar um repositório do tipo HTTP requer reinicialização do serviço Docker.', httpRepo: 'Escolher o protocolo HTTP requer reiniciar o serviço Docker para adicioná-lo a registries inseguros.', delInsecure: 'Remover da lista de segurança', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index 2e26a2844..66b7ed7a1 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -874,6 +874,7 @@ const message = { repo: 'Реестры', createRepo: 'Добавить', + httpRepoHelper: 'Работа с репозиторием HTTP-типа требует перезапуска службы Docker.', httpRepo: 'Выбор HTTP протокола требует перезапуска службы Docker для добавления в небезопасные реестры.', delInsecure: 'Удаление учетных данных', delInsecureHelper: 'Это перезапустит службу Docker для удаления из небезопасных реестров. Хотите продолжить?', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index f576e103b..2b43fa468 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -854,6 +854,7 @@ const message = { repo: '倉庫', createRepo: '添加倉庫', + httpRepoHelper: '操作 HTTP 類型倉庫需要重啟 Docker 服務。', downloadUrl: '下載地址', imageRepo: '鏡像倉庫', repoHelper: '是否包含鏡像倉庫/組織/項目?', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index cc7212920..f1bbe8db5 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -852,6 +852,7 @@ const message = { repo: '仓库', createRepo: '添加仓库', + httpRepoHelper: '操作 http 类型仓库需要重启 Docker 服务。', downloadUrl: '下载地址', imageRepo: '镜像仓库', repoHelper: '是否包含镜像仓库/组织/项目?', diff --git a/frontend/src/views/container/repo/index.vue b/frontend/src/views/container/repo/index.vue index 862e46fe3..8ff8cf091 100644 --- a/frontend/src/views/container/repo/index.vue +++ b/frontend/src/views/container/repo/index.vue @@ -52,8 +52,9 @@ - + + @@ -78,6 +79,8 @@ const paginationConfig = reactive({ const searchName = ref(); const opRef = ref(); +const confirmDialog = ref(); +const currentRepo = ref(); const isActive = ref(); const isExist = ref(); @@ -118,7 +121,16 @@ const onOpenDialog = async ( }; const onDelete = async (row: Container.RepoInfo) => { - let ids = [row.id]; + currentRepo.value = row.id; + if (row.protocol === 'http') { + let params = { + header: i18n.global.t('container.repo'), + operationInfo: i18n.global.t('container.httpRepoHelper'), + submitInputInfo: i18n.global.t('database.restartNow'), + }; + confirmDialog.value!.acceptParams(params); + return; + } opRef.value.acceptParams({ title: i18n.global.t('commons.button.delete'), names: [row.name], @@ -126,11 +138,21 @@ const onDelete = async (row: Container.RepoInfo) => { i18n.global.t('container.repo'), i18n.global.t('commons.button.delete'), ]), - api: deleteImageRepo, - params: { ids: ids }, }); }; +const submitDelete = async () => { + loading.value = true; + await deleteImageRepo(currentRepo.value) + .then(() => { + loading.value = false; + search(); + }) + .catch(() => { + loading.value = false; + }); +}; + const onCheckConn = async (row: Container.RepoInfo) => { loading.value = true; await checkRepoStatus(row.id) diff --git a/frontend/src/views/container/repo/operator/index.vue b/frontend/src/views/container/repo/operator/index.vue index c5e1adff8..5da60cfc3 100644 --- a/frontend/src/views/container/repo/operator/index.vue +++ b/frontend/src/views/container/repo/operator/index.vue @@ -70,6 +70,8 @@ + +