notes from walk through

client/client.go

@@ -1006,6 +1006,14 @@ func (c *Client) updateNodeFromFingerprint(response *cstructs.FingerprintRespons
 		c.config.Node.Resources.Merge(response.Resources)
 	}
 
+	// XXX --------------
+	// All drivers only expose DriverInfo
+	// This becomes a separate setter. So we have:
+	// * updateNodeFromFingerprinters
+	// * updateNodeFromDriver(fingerprint, health *DriverInfo)
+	///  TODO is anything updating the Node.Attributes based on updating
+	//        driverinfos
+
 	for name, newVal := range response.Drivers {
 		oldVal := c.config.Node.Drivers[name]
 		if oldVal == nil && newVal != nil {
@@ -1021,6 +1029,35 @@ func (c *Client) updateNodeFromFingerprint(response *cstructs.FingerprintRespons
 	return c.config.Node
 }
 
+/* Model for converging the periodic fingerprinting and health checking:
+
+func watcher(driver Driver) {
+   p := driver.Periodic()
+   healthChecker driver.HealthChecker()
+   hDur := healthChecker.Periodic()
+
+   var t1, t2 time.Timer
+
+   if healthChecker {
+      t2 = time.NewTimer(hDur)
+   }
+
+   for {
+     select {
+     case shutdown:
+     case periodicFingerprint <- t1.C:
+		 // Do stuff
+		 t1.Reset(its duration)
+     case healthCheck <- t2.C: // Nil: never fire
+		 // Do stuff
+		 newHealth := driver.HealthCheck()
+		 updateNodeFromDriver(nil, newHealth)
+		 t2.Reset(its duration)
+     }
+   }
+}
+*/
+
 // updateNodeFromHealthCheck receives a health check response and updates the
 // node accordingly
 func (c *Client) updateNodeFromHealthCheck(response *cstructs.HealthCheckResponse) *structs.Node {

client/fingerprint_manager.go

@@ -68,6 +68,7 @@ func (fm *FingerprintManager) runFingerprint(f fingerprint.Fingerprint, period t
 	}
 }
 
+// XXX Do we need this for now
 // runHealthCheck runs each health check individually on an ongoing basis
 func (fm *FingerprintManager) runHealthCheck(hc fingerprint.HealthCheck, period time.Duration, name string) {
 	fm.logger.Printf("[DEBUG] client.fingerprint_manager: healthchecking %s every %v", name, period)
@@ -294,6 +295,7 @@ func (fm *FingerprintManager) setupFingerprinters(fingerprints []string) error {
 			go fm.runFingerprint(f, period, name)
 		}
 
+		// XXX This code path doesn't exist right now
 		if hc, ok := f.(fingerprint.HealthCheck); ok {
 			req := &cstructs.HealthCheckIntervalRequest{}
 			var resp cstructs.HealthCheckIntervalResponse