From 21712ae810dd1ac68557feea6594aadd79f2a0e6 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Tue, 24 Oct 2017 15:36:43 -0700 Subject: [PATCH 1/2] Change the update retry to back off to the standard update check interval This means that the supervisor will be less aggressive in the case of the api experiencing issues, stopping it from compounding the issue if the api is being overloaded Change-type: patch --- src/application.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/application.coffee b/src/application.coffee index b8b83ff5..6ac6d64e 100644 --- a/src/application.coffee +++ b/src/application.coffee @@ -830,7 +830,7 @@ application.update = update = (force, scheduled = false) -> if updateStatus.state in [ UPDATE_REQUIRED, UPDATE_SCHEDULED ] console.log('Updating failed, but there is already another update scheduled immediately: ', err) return - delayTime = Math.min((2 ** updateStatus.failed) * 500, 30000) + delayTime = Math.min((2 ** updateStatus.failed) * 500, config.appUpdatePollInterval) # If there was an error then schedule another attempt briefly in the future. console.log('Scheduling another update attempt due to failure: ', delayTime, err) setTimeout(update, delayTime, force, true) From dd485b06f705bba7736e2a71d642046c89447795 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Wed, 25 Oct 2017 03:11:32 +0000 Subject: [PATCH 2/2] v6.3.7 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d49318b5..bfa4744e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +## v6.3.7 - 2017-10-25 + +* Change the update retry to back off to the standard update check interval #515 [Pagan Gazzard] + ## v6.3.6 - 2017-10-24 * Ensure preloaded apps are properly loaded by setting their internal markedForDeletion to false, and run apps that have it set to null #510 [Pablo Carranza Velez] diff --git a/package.json b/package.json index 7c234b45..87c10b62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "resin-supervisor", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", - "version": "6.3.6", + "version": "6.3.7", "license": "Apache-2.0", "repository": { "type": "git",