SUMO-100899 fix file already closed, and flaky UT

zillow-oc · Dec 11, 2018 · fbb7bfa · fbb7bfa
1 parent a4856a1
commit fbb7bfa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/logger.go b/logger.go
@@ -9,6 +9,8 @@ import (
   "io/ioutil"
   "math"
   "net/http"
+  "os"
+  "strings"
   "time"
 
   "github.com/docker/docker/api/types/plugins/logdriver"
@@ -57,7 +59,7 @@ func (sumoLogger *sumoLogger) consumeLogsFromFile() {
   var log logdriver.LogEntry
   for {
     if err := dec.ReadMsg(&log); err != nil {
-      if err == io.EOF {
+      if err == io.EOF || err == os.ErrClosed || strings.Contains(err.Error(), "file already closed") {
         sumoLogger.inputFile.Close()
         close(sumoLogger.logQueue)
         return

diff --git a/logger_test.go b/logger_test.go
@@ -121,7 +121,7 @@ func TestBatchLogs(t *testing.T) {
   t.Run("batchSize=200 bytes, testLogCount=1", func(t *testing.T) {
     testBatchSize := 200
     testLogQueue := make(chan *sumoLog, 100 * defaultQueueSizeItems)
-    testLogBatchQueue := make(chan *sumoLogBatch, defaultQueueSizeItems)
+    testLogBatchQueue := make(chan *sumoLogBatch, 10 * defaultQueueSizeItems)
     testSumoLogger := &sumoLogger{
       httpSourceUrl: testHttpSourceUrl,
       logQueue: testLogQueue,
@@ -140,8 +140,8 @@ func TestBatchLogs(t *testing.T) {
 
   t.Run("batchSize=200 bytes, testLogCount=100000", func(t *testing.T) {
     testBatchSize := 200
-    testLogQueue := make(chan *sumoLog, 100 * defaultQueueSizeItems)
-    testLogBatchQueue := make(chan *sumoLogBatch, defaultQueueSizeItems)
+    testLogQueue := make(chan *sumoLog, 1000 * defaultQueueSizeItems)
+    testLogBatchQueue := make(chan *sumoLogBatch, 100 * defaultQueueSizeItems)
     testSumoLogger := &sumoLogger{
       httpSourceUrl: testHttpSourceUrl,
       logQueue: testLogQueue,
@@ -169,7 +169,7 @@ func TestBatchLogs(t *testing.T) {
   t.Run("batchSize=2000000 bytes, testLogCount=1", func(t *testing.T) {
     testBatchSize := 2000000
     testLogQueue := make(chan *sumoLog, 100 * defaultQueueSizeItems)
-    testLogBatchQueue := make(chan *sumoLogBatch, defaultQueueSizeItems)
+    testLogBatchQueue := make(chan *sumoLogBatch, 10 * defaultQueueSizeItems)
     testSumoLogger := &sumoLogger{
       httpSourceUrl: testHttpSourceUrl,
       logQueue: testLogQueue,
@@ -189,7 +189,7 @@ func TestBatchLogs(t *testing.T) {
   t.Run("batchSize=2000000 bytes, testLogCount=1000000", func(t *testing.T) {
     testBatchSize := 2000000
     testLogQueue := make(chan *sumoLog, 100 * defaultQueueSizeItems)
-    testLogBatchQueue := make(chan *sumoLogBatch, defaultQueueSizeItems)
+    testLogBatchQueue := make(chan *sumoLogBatch, 10 * defaultQueueSizeItems)
     testSumoLogger := &sumoLogger{
       httpSourceUrl: testHttpSourceUrl,
       logQueue: testLogQueue,