public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix concurrency issue (#742) 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2023-03-15 15:42:16 +08:00 committed by GitHub
parent 2d9f83c1de
commit 063ba86447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/state/state.go
View File

@ -1098,7 +1098,9 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
releases := releasesNeedCharts(selected) releases := releasesNeedCharts(selected)
temp := make(map[PrepareChartKey]string, len(releases)) var prepareChartInfoMutex sync.Mutex
prepareChartInfo := make(map[PrepareChartKey]string, len(releases))
errs := []error{} errs := []error{}
@ -1302,11 +1304,15 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
return return
} }
temp[PrepareChartKey{ func() {
Namespace: downloadRes.releaseNamespace, prepareChartInfoMutex.Lock()
KubeContext: downloadRes.releaseContext, defer prepareChartInfoMutex.Unlock()
Name: downloadRes.releaseName, prepareChartInfo[PrepareChartKey{
}] = downloadRes.chartPath Namespace: downloadRes.releaseNamespace,
KubeContext: downloadRes.releaseContext,
Name: downloadRes.releaseName,
}] = downloadRes.chartPath
}()
if downloadRes.buildDeps { if downloadRes.buildDeps {
builds = append(builds, downloadRes) builds = append(builds, downloadRes)
@ -1325,7 +1331,7 @@ func (st *HelmState) PrepareCharts(helm helmexec.Interface, dir string, concurre
} }
} }
return temp, nil return prepareChartInfo, nil
} }
// nolint: unparam // nolint: unparam