Merge branch 'fix/envfiles-deadlock' of https://github.com/Instamojo/…

…amazon-ecs-agent into Instamojo-fix/envfiles-deadlock
aws · Aug 18, 2020 · d5a486e · d5a486e
2 parents 5c7d3c1 + dfc86d9
commit d5a486e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/agent/taskresource/envFiles/envfile.go b/agent/taskresource/envFiles/envfile.go
@@ -108,13 +108,13 @@ func (envfile *EnvironmentFileResource) Initialize(resourceFields *taskresource.
 	taskKnownStatus status.TaskStatus,
 	taskDesiredStatus status.TaskStatus) {
 	envfile.lock.Lock()
-	defer envfile.lock.Unlock()
 
 	envfile.initStatusToTransition()
 	envfile.credentialsManager = resourceFields.CredentialsManager
 	envfile.s3ClientCreator = factory.NewS3ClientCreator()
 	envfile.ioutil = ioutilwrapper.NewIOUtil()
 	envfile.bufio = bufiowrapper.NewBufio()
+	envfile.lock.Unlock()
 
 	// if task isn't in 'created' status and desired status is 'running',
 	// reset the resource status to 'NONE' so we always retrieve the data