MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: handle race in server setup global CI/CD variable (#14579)

This commit is contained in:
Harshavardhana 2022-03-18 18:21:09 -07:00 committed by GitHub
parent 7bd9f821dd
commit 01ee49045e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/common-main.go
View File

@ -100,12 +100,16 @@ func init() {
PersistOnFailure: false, PersistOnFailure: false,
} }
globalIsCICD = env.Get("MINIO_CI_CD", "") != "" || env.Get("CI", "") != ""
containers := IsKubernetes() || IsDocker() || IsBOSH() || IsDCOS() || IsPCFTile()
// Call to refresh will refresh names in cache. If you pass true, it will also // Call to refresh will refresh names in cache. If you pass true, it will also
// remove cached names not looked up since the last call to Refresh. It is a good idea // remove cached names not looked up since the last call to Refresh. It is a good idea
// to call this method on a regular interval. // to call this method on a regular interval.
go func() { go func() {
var t *time.Ticker var t *time.Ticker
if IsKubernetes() || IsDocker() || IsBOSH() || IsDCOS() || IsPCFTile() { if containers {
t = time.NewTicker(1 * time.Minute) t = time.NewTicker(1 * time.Minute)
} else { } else {
t = time.NewTicker(10 * time.Minute) t = time.NewTicker(10 * time.Minute)
@ -664,8 +668,6 @@ func handleCommonEnvVars() {
globalRootDiskThreshold = size globalRootDiskThreshold = size
} }
globalIsCICD = env.Get("MINIO_CI_CD", "") != "" || env.Get("CI", "") != ""
domains := env.Get(config.EnvDomain, "") domains := env.Get(config.EnvDomain, "")
if len(domains) != 0 { if len(domains) != 0 {
for _, domainName := range strings.Split(domains, config.ValueSeparator) { for _, domainName := range strings.Split(domains, config.ValueSeparator) {