starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-09-22 08:00:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(container): extend disk usage stats timeout (#13695)

Browse Source
This commit is contained in:
ssongliu
2026-09-03 15:31:12 +08:00
committed by GitHub
parent c09833cbde
commit 6fb389b2ed
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/api/v2/container.go
+1 -1
View File
@@ -439,7 +439,7 @@ func (b *BaseApi) ContainerItemStats(c *gin.Context) {
return
}
data, err := containerService.ContainerItemStats(req)
data, err := containerService.ContainerItemStats(c.Request.Context(), req)
if err != nil {
helper.InternalServer(c, err)
return
agent/app/service/container.go
+5 -5
View File
@@ -81,7 +81,7 @@ type IContainerService interface {
ContainerUpgrade(req dto.ContainerUpgrade) error
ContainerInfo(req dto.OperationWithName) (*dto.ContainerOperate, error)
ContainerListStats() ([]dto.ContainerListStats, error)
ContainerItemStats(req dto.OperationWithName) (dto.ContainerItemStats, error)
ContainerItemStats(ctx context.Context, req dto.OperationWithName) (dto.ContainerItemStats, error)
LoadResourceLimit() (*dto.ResourceLimit, error)
ContainerRename(req dto.ContainerRename) error
ContainerCommit(req dto.ContainerCommit) error
@@ -248,15 +248,15 @@ func (u *ContainerService) LoadStatus() (dto.ContainerStatus, error) {
}
return data, nil
}
func (u *ContainerService) ContainerItemStats(req dto.OperationWithName) (dto.ContainerItemStats, error) {
func (u *ContainerService) ContainerItemStats(ctx context.Context, req dto.OperationWithName) (dto.ContainerItemStats, error) {
var data dto.ContainerItemStats
client, err := docker.NewDockerClient()
if err != nil {
return data, err
}
defer client.Close()
if req.Name != "system" {
defer client.Close()
containerInfo, _, err := client.ContainerInspectWithRaw(context.Background(), req.Name, true)
containerInfo, _, err := client.ContainerInspectWithRaw(ctx, req.Name, true)
if err != nil {
return data, err
}
@@ -265,7 +265,7 @@ func (u *ContainerService) ContainerItemStats(req dto.OperationWithName) (dto.Co
return data, nil
}
usage, err := client.DiskUsage(context.Background(), types.DiskUsageOptions{})
usage, err := client.DiskUsage(ctx, types.DiskUsageOptions{})
if err != nil {
return data, err
}
frontend/src/api/modules/container.ts
+2 -1
View File
@@ -82,10 +82,11 @@ export const cleanContainerLog = (containerName: string, operateNode?: string) =
return http.post(`/containers/clean/log${params}`, { name: containerName }, TimeoutEnum.T_60S);
};
export const containerItemStats = (containerID: string, currentNode?: string) => {
const timeout = containerID === 'system' ? TimeoutEnum.T_5M : TimeoutEnum.T_60S;
return http.post<Container.ContainerItemStats>(
`/containers/item/stats`,
{ name: containerID },
TimeoutEnum.T_60S,
timeout,
currentNode ? { CurrentNode: currentNode } : undefined,
);
};