Fixed a race condition that can cause agent panici

aws · Feb 10, 2017 · e66feed · e66feed
1 parent 89930da
commit e66feed
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/agent/engine/image/types.go b/agent/engine/image/types.go
@@ -14,6 +14,7 @@
 package image
 
 import (
+	"encoding/json"
 	"fmt"
 	"sync"
 	"time"
@@ -98,3 +99,18 @@ func (imageState *ImageState) RemoveContainerReference(container *api.Container)
 	}
 	return fmt.Errorf("Container reference is not found in the image state container: %s", container.String())
 }
+
+func (imageState *ImageState) MarshalJSON() ([]byte, error) {
+	imageState.updateLock.Lock()
+	defer imageState.updateLock.Unlock()
+
+	return json.Marshal(&struct {
+		Image      *Image
+		PulledAt   time.Time
+		LastUsedAt time.Time
+	}{
+		Image:      imageState.Image,
+		PulledAt:   imageState.PulledAt,
+		LastUsedAt: imageState.LastUsedAt,
+	})
+}