locks for fingerprint reads/writes

hashicorp · Jan 30, 2018 · e8aaa93 · e8aaa93
1 parent ae889b4
commit e8aaa93
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/client/client.go b/client/client.go
@@ -956,7 +956,9 @@ func (c *Client) fingerprint() error {
 
 		request := &cstructs.FingerprintRequest{Config: c.config, Node: c.config.Node}
 		var response cstructs.FingerprintResponse
+		c.configLock.Lock()
 		err = f.Fingerprint(request, &response)
+		c.configLock.Unlock()
 		if err != nil {
 			return err
 		}
@@ -988,7 +990,9 @@ func (c *Client) fingerprintPeriodic(name string, f fingerprint.Fingerprint, d t
 		case <-time.After(d):
 			request := &cstructs.FingerprintRequest{Config: c.config, Node: c.config.Node}
 			var response cstructs.FingerprintResponse
+			c.configLock.Lock()
 			err := f.Fingerprint(request, &response)
+			c.configLock.Unlock()
 
 			if err != nil {
 				c.logger.Printf("[DEBUG] client: periodic fingerprinting for %v failed: %v", name, err)
@@ -1036,9 +1040,11 @@ func (c *Client) setupDrivers() error {
 
 		request := &cstructs.FingerprintRequest{Config: c.config, Node: c.config.Node}
 		var response cstructs.FingerprintResponse
+		c.configLock.Lock()
 		if err := d.Fingerprint(request, &response); err != nil {
 			return err
 		}
+		c.configLock.Unlock()
 
 		c.updateNodeFromFingerprint(&response)