Skip to content

fix: panic in async execution flow #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2025
Merged

fix: panic in async execution flow #6643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/cluster/ClusterService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,8 @@ func (impl *ClusterServiceImpl) updateConnectionStatusForVirtualCluster(respMap
func (impl *ClusterServiceImpl) ConnectClustersInBatch(clusters []*bean.ClusterBean, clusterExistInDb bool) {
var wg sync.WaitGroup
respMap := &sync.Map{}
for idx, cluster := range clusters {
for idx := range clusters {
cluster := clusters[idx]
if cluster.IsVirtualCluster {
impl.updateConnectionStatusForVirtualCluster(respMap, cluster.Id, cluster.ClusterName)
continue
Expand Down
9 changes: 5 additions & 4 deletions pkg/k8s/K8sCommonService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,17 +404,18 @@ func (impl *K8sCommonServiceImpl) getManifestsByBatch(ctx context.Context, reque
var wg sync.WaitGroup
for j := 0; j < batchSize; j++ {
wg.Add(1)
runnableFunc := func(j int) {
runnableFunc := func(index int) {
resp := bean5.BatchResourceResponse{}
response, err := impl.GetResource(ctx, &requests[i+j])
response, err := impl.GetResource(ctx, &requests[index])
if response != nil {
resp.ManifestResponse = response.ManifestResponse
}
resp.Err = err
res[i+j] = resp
res[index] = resp
wg.Done()
}
impl.asyncRunnable.Execute(func() { runnableFunc(j) })
index := i + j
impl.asyncRunnable.Execute(func() { runnableFunc(index) })
}
wg.Wait()
i += batchSize
Expand Down