projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 13937-keepstore-prometheus
[arvados.git]
/
lib
/
cloud
/
azure
/
azure.go
diff --git
a/lib/cloud/azure/azure.go
b/lib/cloud/azure/azure.go
index b88962714e709765f1c93e0a6a88dbcf860aabaa..d19e4bef2372ff87dfb13e26db1ffddb9726bdca 100644
(file)
--- a/
lib/cloud/azure/azure.go
+++ b/
lib/cloud/azure/azure.go
@@
-220,12
+220,14
@@
func newAzureInstanceSet(config json.RawMessage, dispatcherID cloud.InstanceSetI
return nil, err
}
return nil, err
}
- ap := azureInstanceSet{logger: logger}
- err = ap.setup(azcfg, string(dispatcherID))
+ az := azureInstanceSet{logger: logger}
+ az.ctx, az.stopFunc = context.WithCancel(context.Background())
+ err = az.setup(azcfg, string(dispatcherID))
if err != nil {
if err != nil {
+ az.stopFunc()
return nil, err
}
return nil, err
}
- return &a
p
, nil
+ return &a
z
, nil
}
func (az *azureInstanceSet) setup(azcfg azureInstanceSetConfig, dispatcherID string) (err error) {
}
func (az *azureInstanceSet) setup(azcfg azureInstanceSetConfig, dispatcherID string) (err error) {
@@
-276,7
+278,6
@@
func (az *azureInstanceSet) setup(azcfg azureInstanceSetConfig, dispatcherID str
az.dispatcherID = dispatcherID
az.namePrefix = fmt.Sprintf("compute-%s-", az.dispatcherID)
az.dispatcherID = dispatcherID
az.namePrefix = fmt.Sprintf("compute-%s-", az.dispatcherID)
- az.ctx, az.stopFunc = context.WithCancel(context.Background())
go func() {
az.stopWg.Add(1)
defer az.stopWg.Done()
go func() {
az.stopWg.Add(1)
defer az.stopWg.Done()