ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(llama-cpp): keep failed cleanup terminal

Browse Source
This commit is contained in:
Vincent Koc
2026-08-04 22:57:59 +08:00
parent 6788bf51da
commit 889cd316c7
2 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/llama-cpp/src/inference-provider.test.ts
+5 -7
View File
@@ -947,17 +947,15 @@ describe("llama.cpp inference provider", () => {
mocks.contextDispose.mockRejectedValueOnce(new Error("context cleanup failed"));
const firstDisposal = inferenceRuntime.dispose();
await expect(firstDisposal).rejects.toThrow(
"llama.cpp runtime cleanup failed: Error: context cleanup failed",
);
expect(mocks.modelDispose).toHaveBeenCalledOnce();
expect(mocks.llamaDispose).toHaveBeenCalledOnce();
await expect(firstDisposal).rejects.toThrow("context cleanup failed");
expect(mocks.modelDispose).not.toHaveBeenCalled();
expect(mocks.llamaDispose).not.toHaveBeenCalled();
const repeatedDisposal = inferenceRuntime.dispose();
expect(repeatedDisposal).toBe(firstDisposal);
await expect(repeatedDisposal).rejects.toThrow("context cleanup failed");
expect(mocks.contextDispose).toHaveBeenCalledOnce();
expect(mocks.modelDispose).toHaveBeenCalledOnce();
expect(mocks.llamaDispose).toHaveBeenCalledOnce();
expect(mocks.modelDispose).not.toHaveBeenCalled();
expect(mocks.llamaDispose).not.toHaveBeenCalled();
});
it.each([
extensions/llama-cpp/src/inference-provider.ts
+2 -20
View File
@@ -312,32 +312,14 @@ function disposeLlamaCppInferenceRuntime(state: LlamaCppInferenceRuntimeState):
// Plugin services stop once, and node-llama-cpp disposers mark themselves
// disposed before awaiting cleanup. The first disposal attempt is authoritative.
state.disposePromise = serialize(state, async () => {
const errors: unknown[] = [];
const attemptDispose = async (dispose: () => Promise<void>) => {
try {
await dispose();
} catch (error) {
errors.push(error);
}
};
if (state.loadedModel) {
const previous = state.loadedModel;
await attemptDispose(() => previous.context.dispose());
await attemptDispose(() => previous.model.dispose());
if (state.loadedModel === previous) {
state.loadedModel = undefined;
}
}
await disposeLoadedModel(state);
if (state.llamaInstance) {
const previous = state.llamaInstance;
await attemptDispose(() => previous.dispose());
await previous.dispose();
if (state.llamaInstance === previous) {
state.llamaInstance = undefined;
}
}
if (errors.length > 0) {
throw new AggregateError(errors, `llama.cpp runtime cleanup failed: ${String(errors[0])}`);
}
}).finally(() => {
state.lifecycle = "closed";
});