jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed relilability issues in running health checks

Browse Source 
Summary: Run doctor checks remained pending when the socket disonnected during a check. This

Reviewed By: aigoncharov

Differential Revision: D32984539

fbshipit-source-id: 277005e78803afaaa220cc5ca7fdc9cca6254453
This commit is contained in:
Michel Weststrate
2021-12-13 05:46:42 -08:00
committed by Facebook GitHub Bot
parent 6f9983eb42
commit 0510786dec
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/flipper-server-core/src/utils/runHealthchecks.tsx
View File

@@ -42,6 +42,8 @@ export async function getHealthChecks(
}); });
} }
let envInfoPromise: Promise<FlipperDoctor.EnvironmentInfo> | undefined;
export async function runHealthcheck( export async function runHealthcheck(
options: FlipperDoctor.HealthcheckSettings, options: FlipperDoctor.HealthcheckSettings,
categoryName: keyof FlipperDoctor.Healthchecks, categoryName: keyof FlipperDoctor.Healthchecks,
@@ -60,7 +62,10 @@ export async function runHealthcheck(
throw new Error('Unknown healthcheck: ' + ruleName); throw new Error('Unknown healthcheck: ' + ruleName);
} }
const environmentInfo = await getEnvInfo(); if (!envInfoPromise) {
envInfoPromise = getEnvInfo();
}
const environmentInfo = await envInfoPromise;
const checkResult = await check.run!(environmentInfo, options.settings); const checkResult = await check.run!(environmentInfo, options.settings);
return checkResult.hasProblem && check.isRequired return checkResult.hasProblem && check.isRequired
? { ? {

6
desktop/flipper-ui-browser/src/flipperServerConnection.tsx
View File

@@ -12,7 +12,7 @@ import {FlipperServer} from 'flipper-common';
import {io, Socket} from 'socket.io-client'; import {io, Socket} from 'socket.io-client';
const CONNECTION_TIMEOUT = 30 * 1000; const CONNECTION_TIMEOUT = 30 * 1000;
const EXEC_TIMOUT = 30 * 10 * 1000; const EXEC_TIMOUT = 30 * 1000;
export function createFlipperServer(): Promise<FlipperServer> { export function createFlipperServer(): Promise<FlipperServer> {
// TODO: polish this all! // TODO: polish this all!
@@ -54,6 +54,10 @@ export function createFlipperServer(): Promise<FlipperServer> {
window?.flipperShowError?.('WebSocket connection lost'); window?.flipperShowError?.('WebSocket connection lost');
console.warn('Socket to Flipper server disconnected'); console.warn('Socket to Flipper server disconnected');
connected = false; connected = false;
pendingRequests.forEach((r) =>
r.reject(new Error('FLIPPER_SERVER_SOCKET_CONNECT_LOST')),
);
pendingRequests.clear();
}); });
socket.on('exec-response', (id: number, data: any) => { socket.on('exec-response', (id: number, data: any) => {

2
desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
View File

@@ -59,7 +59,7 @@ export function connectFlipperServerToStore(
{'' + err} {'' + err}
</> </>
) : ( ) : (
<>Failed to start Flipper server: ${err.message}</> <>Failed to start Flipper server: {err.message ?? err}</>
), ),
duration: null, duration: null,
}); });

13
desktop/flipper-ui-core/src/utils/runHealthchecks.tsx
View File

@@ -50,12 +50,21 @@ async function launchHealthchecks(options: HealthcheckOptions): Promise<void> {
continue; continue;
} }
for (const h of category.healthchecks) { for (const h of category.healthchecks) {
const checkResult = await flipperServer.exec( const checkResult: FlipperDoctor.HealthcheckResult = await flipperServer
.exec(
'doctor-run-healthcheck', 'doctor-run-healthcheck',
{settings: options.settings}, {settings: options.settings},
categoryKey as keyof FlipperDoctor.Healthchecks, categoryKey as keyof FlipperDoctor.Healthchecks,
h.key, h.key,
); )
.catch((e) => {
console.error('Failed to run doctor check', e);
return {
status: 'FAILED',
isAcknowledged: false,
message: 'Failed to run doctor check: ' + e,
};
});
const metricName = `doctor:${h.key.replace('.', ':')}.healthcheck`; // e.g. "doctor:ios:xcode-select.healthcheck" const metricName = `doctor:${h.key.replace('.', ':')}.healthcheck`; // e.g. "doctor:ios:xcode-select.healthcheck"
if (checkResult.status !== 'SUCCESS') { if (checkResult.status !== 'SUCCESS') {
hasProblems = true; hasProblems = true;