ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-10 11:31:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #899 from balena-io/delta-apply-timeout

Browse Source 
Set default delta apply timeout of 0
This commit is contained in:
CameronDiver 2019-02-11 10:52:36 +00:00 committed by GitHub
commit c48e37556e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/schema-type.ts
View File

@ -122,7 +122,7 @@ export const schemaTypes = {
}, },
deltaApplyTimeout: { deltaApplyTimeout: {
type: PermissiveNumber, type: PermissiveNumber,
default: NullOrUndefined, default: 0,
}, },
deltaRetryCount: { deltaRetryCount: {
type: PermissiveNumber, type: PermissiveNumber,
@ -232,7 +232,7 @@ export const schemaTypes = {
deltaEndpoint: t.string, deltaEndpoint: t.string,
delta: PermissiveBoolean, delta: PermissiveBoolean,
deltaRequestTimeout: PermissiveNumber, deltaRequestTimeout: PermissiveNumber,
deltaApplyTimeout: t.union([PermissiveNumber, NullOrUndefined]), deltaApplyTimeout: PermissiveNumber,
deltaRetryCount: PermissiveNumber, deltaRetryCount: PermissiveNumber,
deltaRetryInterval: PermissiveNumber, deltaRetryInterval: PermissiveNumber,
deltaVersion: PermissiveNumber, deltaVersion: PermissiveNumber,

2
src/device-config.ts
View File

@ -95,7 +95,7 @@ export class DeviceConfig {
deltaApplyTimeout: { deltaApplyTimeout: {
envVarName: 'SUPERVISOR_DELTA_APPLY_TIMEOUT', envVarName: 'SUPERVISOR_DELTA_APPLY_TIMEOUT',
varType: 'int', varType: 'int',
defaultValue: '', defaultValue: '0',
}, },
deltaRetryCount: { deltaRetryCount: {
envVarName: 'SUPERVISOR_DELTA_RETRY_COUNT', envVarName: 'SUPERVISOR_DELTA_RETRY_COUNT',

9
src/lib/docker-utils.ts
View File

@ -9,9 +9,8 @@ import { SchemaReturn } from '../config/schema-type';
import { envArrayToObject } from './conversions'; import { envArrayToObject } from './conversions';
import { import {
DeltaStillProcessingError, DeltaStillProcessingError,
InternalInconsistencyError,
InvalidNetGatewayError,
ImageAuthenticationError, ImageAuthenticationError,
InvalidNetGatewayError,
} from './errors'; } from './errors';
import { request, requestLib, resumable } from './request'; import { request, requestLib, resumable } from './request';
import { EnvVarObject } from './types'; import { EnvVarObject } from './types';
@ -64,12 +63,6 @@ export class DockerUtils extends DockerToolbelt {
const timeout = deltaOpts.deltaApplyTimeout; const timeout = deltaOpts.deltaApplyTimeout;
if (timeout == null) {
throw new InternalInconsistencyError(
'A delta apply timeout is not set in fetchDeltaWithProgress!',
);
}
const log = (str: string) => const log = (str: string) =>
console.log(`delta(${deltaOpts.deltaSource}): ${str}`); console.log(`delta(${deltaOpts.deltaSource}): ${str}`);

6
test/05-device-state.spec.coffee
View File

@ -16,7 +16,7 @@ DeviceState = require '../src/device-state'
mockedInitialConfig = { mockedInitialConfig = {
'RESIN_SUPERVISOR_CONNECTIVITY_CHECK': 'true' 'RESIN_SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'RESIN_SUPERVISOR_DELTA': 'false' 'RESIN_SUPERVISOR_DELTA': 'false'
'RESIN_SUPERVISOR_DELTA_APPLY_TIMEOUT': '' 'RESIN_SUPERVISOR_DELTA_APPLY_TIMEOUT': '0'
'RESIN_SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000' 'RESIN_SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000'
'RESIN_SUPERVISOR_DELTA_RETRY_COUNT': '30' 'RESIN_SUPERVISOR_DELTA_RETRY_COUNT': '30'
'RESIN_SUPERVISOR_DELTA_RETRY_INTERVAL': '10000' 'RESIN_SUPERVISOR_DELTA_RETRY_INTERVAL': '10000'
@ -35,7 +35,7 @@ testTarget1 = {
'HOST_CONFIG_gpu_mem': '256' 'HOST_CONFIG_gpu_mem': '256'
'SUPERVISOR_CONNECTIVITY_CHECK': 'true' 'SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'SUPERVISOR_DELTA': 'false' 'SUPERVISOR_DELTA': 'false'
'SUPERVISOR_DELTA_APPLY_TIMEOUT': '' 'SUPERVISOR_DELTA_APPLY_TIMEOUT': '0'
'SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000' 'SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000'
'SUPERVISOR_DELTA_RETRY_COUNT': '30' 'SUPERVISOR_DELTA_RETRY_COUNT': '30'
'SUPERVISOR_DELTA_RETRY_INTERVAL': '10000' 'SUPERVISOR_DELTA_RETRY_INTERVAL': '10000'
@ -117,7 +117,7 @@ testTargetWithDefaults2 = {
'HOST_CONFIG_gpu_mem': '512' 'HOST_CONFIG_gpu_mem': '512'
'SUPERVISOR_CONNECTIVITY_CHECK': 'true' 'SUPERVISOR_CONNECTIVITY_CHECK': 'true'
'SUPERVISOR_DELTA': 'false' 'SUPERVISOR_DELTA': 'false'
'SUPERVISOR_DELTA_APPLY_TIMEOUT': '' 'SUPERVISOR_DELTA_APPLY_TIMEOUT': '0'
'SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000' 'SUPERVISOR_DELTA_REQUEST_TIMEOUT': '30000'
'SUPERVISOR_DELTA_RETRY_COUNT': '30' 'SUPERVISOR_DELTA_RETRY_COUNT': '30'
'SUPERVISOR_DELTA_RETRY_INTERVAL': '10000' 'SUPERVISOR_DELTA_RETRY_INTERVAL': '10000'