Fix logging data race

aws · Aug 28, 2022 · a060984 · a060984
1 parent 03d0b8a
commit a060984
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/agent/ecscni/plugin_linux.go b/agent/ecscni/plugin_linux.go
@@ -78,7 +78,10 @@ func (client *cniClient) setupNS(ctx context.Context, cfg *Config) (*current.Res
 			cfg.ContainerID)
 	}
 
-	seelog.Debugf("[ECSCNI] Completed setting up the container namespace: %v", bridgeResult)
+	// Use fmt.Sprintf to force a synchrounous read of 'bridgeResult'. If we use seelog.Debugf("...%v", bridgeResult)
+	// seelog asynchronously reads/evaluates bridgeResult, and could cause data race because there's an immediate
+	// write on bridgeResult (from bridgeResult.GetAsVersion())
+	seelog.Debugf("[ECSCNI] Completed setting up the container namespace: %s", fmt.Sprintf("%v", bridgeResult))
 
 	if _, err := bridgeResult.GetAsVersion(currentCNISpec); err != nil {
 		seelog.Warnf("[ECSCNI] Unable to convert result to spec version %s; error: %v; result is of version: %s",
@@ -89,7 +92,8 @@ func (client *cniClient) setupNS(ctx context.Context, cfg *Config) (*current.Res
 	curResult, ok := bridgeResult.(*current.Result)
 	if !ok {
 		return nil, errors.Errorf(
-			"cni setup: unable to convert result to expected version '%v'", bridgeResult)
+			"cni setup: unable to convert result to expected version '%s'",
+			fmt.Sprintf("%v", bridgeResult))
 	}
 
 	return curResult, nil