From ccd7eeef1ad5f4eaf2fedbfcfd6142c1b0c7803b Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 16 Apr 2018 12:25:35 +0200
Subject: [PATCH] agent/cache-types/ca-leaf: proper result for timeout, race on
 setting CA

---
 agent/cache-types/connect_ca_leaf.go | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/agent/cache-types/connect_ca_leaf.go b/agent/cache-types/connect_ca_leaf.go
index d90bc19bb..70d5e3c24 100644
--- a/agent/cache-types/connect_ca_leaf.go
+++ b/agent/cache-types/connect_ca_leaf.go
@@ -77,8 +77,11 @@ func (c *ConnectCALeaf) Fetch(opts cache.FetchOptions, req cache.Request) (cache
 	// Block on the events that wake us up.
 	select {
 	case <-timeoutCh:
-		// TODO: what is the right error for a timeout?
-		return result, fmt.Errorf("timeout")
+		// On a timeout, we just return the empty result and no error.
+		// It isn't an error to timeout, its just the limit of time the
+		// caching system wants us to block for. By returning an empty result
+		// the caching system will ignore.
+		return result, nil
 
 	case err := <-newRootCACh:
 		// A new root CA triggers us to refresh the leaf certificate.
@@ -122,6 +125,7 @@ func (c *ConnectCALeaf) Fetch(opts cache.FetchOptions, req cache.Request) (cache
 		if c.issuedCerts == nil {
 			c.issuedCerts = make(map[string]*structs.IssuedCert)
 		}
+
 		c.issuedCerts[reqReal.Service] = &reply
 		lastCert = &reply
 	}
@@ -156,8 +160,24 @@ func (c *ConnectCALeaf) waitNewRootCA(ch chan<- error, timeout time.Duration) {
 		return
 	}
 
-	// Set the new index
-	atomic.StoreUint64(&c.caIndex, roots.QueryMeta.Index)
+	// We do a loop here because there can be multiple waitNewRootCA calls
+	// happening simultaneously. Each Fetch kicks off one call. These are
+	// multiplexed through Cache.Get which should ensure we only ever
+	// actually make a single RPC call. However, there is a race to set
+	// the caIndex field so do a basic CAS loop here.
+	for {
+		// We only set our index if its newer than what is previously set.
+		old := atomic.LoadUint64(&c.caIndex)
+		if old == roots.Index || old > roots.Index {
+			break
+		}
+
+		// Set the new index atomically. If the caIndex value changed
+		// in the meantime, retry.
+		if atomic.CompareAndSwapUint64(&c.caIndex, old, roots.Index) {
+			break
+		}
+	}
 
 	// Trigger the channel since we updated.
 	ch <- nil