Add registration retries

Matt Loring · Matt Loring · commit b1027d2273f8 · 2016-05-18T12:17:42.000-07:00
diff --git a/config.js b/config.js
@@ -70,7 +70,8 @@ module.exports = {
 
     // These configuration options are for internal experimentation only.
     internal: {
-      registerDelayOnFetcherErrorSec: 300 // 5 minutes.
+      registerDelayOnFetcherErrorSec: 300, // 5 minutes.
+      maxRegistrationRetryDelay: 40
     }
   }
 };
diff --git a/lib/debuglet.js b/lib/debuglet.js
@@ -142,8 +142,8 @@ Debuglet.prototype.scheduleRegistration_ = function(seconds) {
 
   function onError(err) {
     that.logger_.error('Failed to re-register debuggee: ' + err);
-    that.logger_.error('Disabling gcloud debuglet');
-    that.stop(); // fatal error
+    that.scheduleRegistration_(Math.min((seconds + 1) * 2,
+      that.config_.internal.maxRegistrationRetryDelay));
   }
 
   setTimeout(function() {
diff --git a/test/standalone/test-debuglet.js b/test/standalone/test-debuglet.js
@@ -92,6 +92,31 @@ describe(__filename, function(){
     debuglet.start();
   });
 
+  it('should retry on failed registration', function(done) {
+    this.timeout(10000);
+    process.env.GCLOUD_PROJECT='11020304f2934';
+
+    var scope = nock(API)
+      .post(REGISTER_PATH)
+      .reply(404)
+      .post(REGISTER_PATH)
+      .reply(509)
+      .post(REGISTER_PATH)
+      .reply(200, {
+        debuggee: {
+          id: DEBUGGEE_ID
+        }
+      });
+
+    debuglet.once('registered', function(id) {
+      assert(id === DEBUGGEE_ID);
+      scope.done();
+      done();
+    });
+
+    debuglet.start();
+  });
+
   it('should error if a package.json doesn\'t exist');
 
   it('should register successfully otherwise', function(done) {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ module.exports = {`
`70`	`70`
`71`	`71`	`// These configuration options are for internal experimentation only.`
`72`	`72`	`internal: {`
`73`		`- registerDelayOnFetcherErrorSec: 300 // 5 minutes.`
	`73`	`+ registerDelayOnFetcherErrorSec: 300, // 5 minutes.`
	`74`	`+ maxRegistrationRetryDelay: 40`
`74`	`75`	`}`
`75`	`76`	`}`
`76`	`77`	`};`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ Debuglet.prototype.scheduleRegistration_ = function(seconds) {`
`142`	`142`
`143`	`143`	`function onError(err) {`
`144`	`144`	`that.logger_.error('Failed to re-register debuggee: ' + err);`
`145`		`- that.logger_.error('Disabling gcloud debuglet');`
`146`		`- that.stop(); // fatal error`
	`145`	`+ that.scheduleRegistration_(Math.min((seconds + 1) * 2,`
	`146`	`+ that.config_.internal.maxRegistrationRetryDelay));`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`setTimeout(function() {`