Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/src/integrations/puppetdb/CircuitBreaker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ export class CircuitBreaker {
// Service has recovered, close the circuit
this.reset();
this.transitionTo("closed");
} else if (this.state === "closed") {
// Only consecutive failures trip the breaker; a success clears the streak
this.failureCount = 0;
}
}

Expand Down
10 changes: 6 additions & 4 deletions backend/src/integrations/puppetdb/PuppetDBService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,9 @@ export class PuppetDBService
const envGroups = this.createEnvironmentGroups(envResult as PuppetDBNode[]);
groups.push(...envGroups);
}
} catch {
this.log("Failed to query nodes for environment grouping", "warn");
} catch (error) {
const detail = error instanceof Error ? error.message : String(error);
this.log(`Failed to query nodes for environment grouping: ${detail}`, "warn");
}

// Query 2: Group by OS family (from facts)
Expand All @@ -673,8 +674,9 @@ export class PuppetDBService
const osGroups = this.createOSFamilyGroups(osResult as { certname: string; "os.family": string }[]);
groups.push(...osGroups);
}
} catch {
this.log("Failed to query nodes for OS family grouping", "warn");
} catch (error) {
const detail = error instanceof Error ? error.message : String(error);
this.log(`Failed to query nodes for OS family grouping: ${detail}`, "warn");
}

// Cache the result
Expand Down
79 changes: 79 additions & 0 deletions backend/test/unit/integrations/CircuitBreaker.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/**
* Unit tests for CircuitBreaker
*
* Covers consecutive-failure semantics while closed (issue #59).
*/

import { describe, it, expect, beforeEach } from "vitest";
import {
CircuitBreaker,
CircuitBreakerOpenError,
} from "../../../src/integrations/puppetdb/CircuitBreaker";

describe("CircuitBreaker", () => {
let breaker: CircuitBreaker;

beforeEach(() => {
breaker = new CircuitBreaker({
failureThreshold: 3,
resetTimeout: 1000,
});
});

describe("failure counting while closed", () => {
it("opens after consecutive failures reach the threshold", async () => {
const fail = async (): Promise<never> => {
throw new Error("boom");
};

await expect(breaker.execute(fail)).rejects.toThrow("boom");
await expect(breaker.execute(fail)).rejects.toThrow("boom");
expect(breaker.getState()).toBe("closed");

await expect(breaker.execute(fail)).rejects.toThrow("boom");
expect(breaker.getState()).toBe("open");
expect(breaker.getStats().failureCount).toBe(3);
});

it("resets failureCount on success while closed so sparse failures do not trip", async () => {
const fail = async (): Promise<never> => {
throw new Error("boom");
};
const succeed = async (): Promise<string> => "ok";

// Two failures, then a success (still under threshold)
await expect(breaker.execute(fail)).rejects.toThrow("boom");
await expect(breaker.execute(fail)).rejects.toThrow("boom");
expect(breaker.getStats().failureCount).toBe(2);

await expect(breaker.execute(succeed)).resolves.toBe("ok");
expect(breaker.getState()).toBe("closed");
expect(breaker.getStats().failureCount).toBe(0);

// Two more failures after the success must not open the circuit
// (would have been 4 cumulative without the reset)
await expect(breaker.execute(fail)).rejects.toThrow("boom");
await expect(breaker.execute(fail)).rejects.toThrow("boom");
expect(breaker.getState()).toBe("closed");
expect(breaker.getStats().failureCount).toBe(2);

// A third consecutive failure does open it
await expect(breaker.execute(fail)).rejects.toThrow("boom");
expect(breaker.getState()).toBe("open");
});

it("rejects requests while open", async () => {
const fail = async (): Promise<never> => {
throw new Error("boom");
};

for (let i = 0; i < 3; i++) {
await expect(breaker.execute(fail)).rejects.toThrow("boom");
}

await expect(breaker.execute(async () => "ok")).rejects.toThrow(
CircuitBreakerOpenError,
);
});
});
});
Loading