Merge pull request #70 from fasaxc/fix-update-type

Fix two issues that resulted in incorrect updateTypes
projectcalico · Nov 7, 2017 · 742dc8a · 742dc8a
2 parents 5f55c67 + caae1fb
commit 742dc8a
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 125 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -36,11 +36,10 @@ import:
 - package: github.com/mipearson/rfw
 - package: github.com/prometheus/client_golang
   version: ^0.9.0-pre1
-- package: github.com/gavv/monotime
 - package: github.com/onsi/ginkgo
   version: f40a49d81e5c12e90400620b6242fb29a8e7c9
 - package: github.com/Workiva/go-datastructures
-  version: ^1.0.39
+  version: af7475fb23e7561c87e7c1d17c12f46d732379bb
   subpackages:
   - trie/ctrie
 - package: golang.org/x/text

diff --git a/pkg/snapcache/cache.go b/pkg/snapcache/cache.go
@@ -358,7 +358,12 @@ func (c *Cache) publishBreadcrumb() {
 				counterUpdatesSkipped.Inc()
 				continue
 			}
-			c.kvs.Insert(keyAsBytes, newUpd)
+			// Since the purpose of the snapshot is to hold the initial set of updates to send to Felix at start-of-day,
+			// all the updates that it stores should have type UpdateTypeKVNew since they're all new to Felix. Copy
+			// the KV and adjust it before storing it in the snapshot.
+			updToStore := newUpd
+			updToStore.UpdateType = api.UpdateTypeKVNew
+			c.kvs.Insert(keyAsBytes, updToStore)
 		}
 
 		// Record the update in the new Breadcrumb so that clients following the chain of