thread the code name through flipr

uber-archive · Feb 29, 2016 · ed75c32 · ed75c32
1 parent dd40c86
commit ed75c32
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/circuits.js b/circuits.js
@@ -97,7 +97,8 @@ function Circuits(options) {
     this.statsd = options.statsd;
     this.circuitsByServiceName = {};
     this.config = options.config || {};
-    this.shorts = null;
+    this.shorts = options.shorts;
+    this.codeName = options.codeName;
 
     this.stateOptions = new StateOptions(null, {
         timeHeap: options.timeHeap,
@@ -111,6 +112,10 @@ function Circuits(options) {
     this.egressNodes = options.egressNodes;
 }
 
+Circuits.prototype.updateCodeName = function updateCodeName(codeName) {
+    this.codeName = codeName;
+};
+
 Circuits.prototype.updateShorts = function updateShorts(shorts) {
     this.shorts = parseShorts(shorts);
     var keys = Object.keys(this.circuitsByServiceName);
@@ -351,7 +356,7 @@ PeriodicState.prototype.getRequestError = function getRequestError() {
         return null;
     }
 
-    return new ErrorFrame('Unhealthy', 'Service is not healthy');
+    return new ErrorFrame(this.circuit.root.codeName, 'Service is not healthy');
 };
 
 function HealthyState(options) {

diff --git a/clients/index.js b/clients/index.js
@@ -451,6 +451,7 @@ function onRemoteConfigUpdate(changedKeys, forceUpdate) {
     self.updateLazyHandling(hasChanged, forceUpdate);
     self.updateCircuitsEnabled(hasChanged, forceUpdate);
     self.updateCircuitShorts(hasChanged, forceUpdate);
+    self.updateCircuitCodeName(hasChanged, forceUpdate);
     self.updateRateLimitingEnabled(hasChanged, forceUpdate);
     self.updateTotalRpsLimit(hasChanged, forceUpdate);
     self.updateExemptServices(hasChanged, forceUpdate);
@@ -550,6 +551,16 @@ ApplicationClients.prototype.updateCircuitShorts = function updateCircuitShorts(
     }
 };
 
+ApplicationClients.prototype.updateCircuitCodeName =
+function updateCircuitCodeName(hasChanged, forceUpdate) {
+    var self = this;
+    if (forceUpdate || hasChanged['circuits.codeName']) {
+        self.serviceProxy.updateCircuitCodeName(
+            self.remoteConfig.get('circuits.codeName', 'Declined')
+        );
+    }
+};
+
 ApplicationClients.prototype.updateRateLimitingEnabled = function updateRateLimitingEnabled(hasChanged, forceUpdate) {
     var self = this;
     if (forceUpdate || hasChanged['rateLimiting.enabled']) {

diff --git a/service-proxy.js b/service-proxy.js
@@ -80,6 +80,7 @@ function ServiceDispatchHandler(options) {
         '*~hyperbahn~ad': true,
         '*~hyperbahn~relay-ad': true
     };
+    self.circuitsCodeName = 'Declined';
     self.circuits = null;
 
     self.rateLimiter = new RateLimiter({
@@ -1502,10 +1503,22 @@ function initCircuits() {
         random: self.random,
         egressNodes: self.egressNodes,
         config: self.circuitsConfig,
-        shorts: self.circuitShorts
+        shorts: self.circuitShorts,
+        codeName: self.circuitsCodeName
     });
 };
 
+ServiceDispatchHandler.prototype.updateCircuitCodeName =
+function updateCircuitCodeName(codeName) {
+    var self = this;
+
+    self.circuitsCodeName = codeName;
+
+    if (self.circuits) {
+        self.circuits.updateCodeName(codeName);
+    }
+};
+
 ServiceDispatchHandler.prototype.updateCircuitShorts =
 function updateCircuitShorts(shorts) {
     var self = this;

diff --git a/test/lib/relay-network.js b/test/lib/relay-network.js
@@ -181,6 +181,7 @@ RelayNetwork.prototype.setCluster = function setCluster(cluster) {
             rateLimiterEnabled: self.rateLimiterEnabled,
             circuitsConfig: self.circuitsConfig
         });
+        relayChannel.handler.updateCircuitCodeName('Unhealthy');
 
         var hyperbahnChannel = relayChannel.makeSubChannel({
             serviceName: 'hyperbahn'