1 parent
5d13c5ecfc
commit
4329ec51db
20 files changed
+181
-12
No files matched your search
@@ -35,10 +35,14 @@ function transferRequest(transferId: string, tables = ["users"]): TransferReques
|
||||
targetSchema: "public",
|
||||
tables,
|
||||
createTable: true,
|
||||
content: "structureAndData",
|
||||
objects: [],
|
||||
mode: "append",
|
||||
targetTableNameCase: "preserve",
|
||||
quoteTargetColumnNames: true,
|
||||
batchSize: 1000,
|
||||
dropTargetBeforeCreate: false,
|
||||
dropTargetConfirmed: false,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -138,16 +142,46 @@ describe("data transfer task duration", () => {
|
||||
it("records an immediate start failure as a terminal duration", async () => {
|
||||
vi.mocked(api.startTransfer).mockRejectedValueOnce(new Error("start failed"));
|
||||
const tracker = useExportTracker();
|
||||
const onStarted = vi.fn();
|
||||
now = 10_000;
|
||||
const task = tracker.startDataTransferTask(transferRequest("start-failure"), "users");
|
||||
const task = tracker.startDataTransferTask(transferRequest("start-failure"), "users", { onStarted });
|
||||
now = 10_025;
|
||||
|
||||
await vi.waitFor(() => expect(task.status).toBe("Error"));
|
||||
|
||||
expect(onStarted).not.toHaveBeenCalled();
|
||||
expect(task.finishedAt! - task.startedAt!).toBe(25);
|
||||
expect(task.errorMessage).toBe("start failed");
|
||||
});
|
||||
|
||||
it.each([
|
||||
["append", { content: "structureAndData", mode: "append", createTable: true, dropTargetBeforeCreate: false }],
|
||||
["rebuild", { content: "structureAndData", mode: "append", createTable: true, dropTargetBeforeCreate: true }],
|
||||
["data-only", { content: "dataOnly", mode: "append", createTable: false, dropTargetBeforeCreate: false }],
|
||||
] as const)("launches one %s task and acknowledges its accepted submission once", async (_flow, overrides) => {
|
||||
let finishTransfer!: () => void;
|
||||
vi.mocked(api.startTransfer).mockImplementationOnce((_request, _onProgress, onStarted) => {
|
||||
onStarted?.();
|
||||
onStarted?.();
|
||||
return new Promise<void>((resolve) => {
|
||||
finishTransfer = resolve;
|
||||
});
|
||||
});
|
||||
const tracker = useExportTracker();
|
||||
const onStarted = vi.fn();
|
||||
const request = { ...transferRequest(`start-${_flow}`), ...overrides };
|
||||
|
||||
const task = tracker.startDataTransferTask(request, _flow, { onStarted });
|
||||
|
||||
expect(task.status).toBe("Running");
|
||||
expect(api.startTransfer).toHaveBeenCalledTimes(1);
|
||||
expect(vi.mocked(api.startTransfer).mock.calls[0]?.[0]).toMatchObject(overrides);
|
||||
expect(onStarted).toHaveBeenCalledTimes(1);
|
||||
|
||||
finishTransfer();
|
||||
await Promise.resolve();
|
||||
});
|
||||
|
||||
it("freezes an overlapping transfer failure without starting another request", async () => {
|
||||
let resolveFirst!: () => void;
|
||||
vi.mocked(api.startTransfer).mockImplementationOnce(() => new Promise<void>((resolve) => (resolveFirst = resolve)));
|
||||
@@ -155,11 +189,13 @@ describe("data transfer task duration", () => {
|
||||
now = 100;
|
||||
tracker.startDataTransferTask(transferRequest("active"), "active");
|
||||
now = 130;
|
||||
const overlapping = tracker.startDataTransferTask(transferRequest("overlap"), "overlap");
|
||||
const onStarted = vi.fn();
|
||||
const overlapping = tracker.startDataTransferTask(transferRequest("overlap"), "overlap", { onStarted });
|
||||
|
||||
expect(overlapping.status).toBe("Error");
|
||||
expect(overlapping.finishedAt! - overlapping.startedAt!).toBe(0);
|
||||
expect(api.startTransfer).toHaveBeenCalledTimes(1);
|
||||
expect(onStarted).not.toHaveBeenCalled();
|
||||
|
||||
resolveFirst();
|
||||
await Promise.resolve();
|
||||
|
||||
@@ -582,6 +582,7 @@ export function useExportTracker() {
|
||||
request: api.TransferRequest,
|
||||
label: string,
|
||||
options: {
|
||||
onStarted?: () => void;
|
||||
onDone?: () => void | Promise<void>;
|
||||
formatOverlapError?: (tables: string[]) => string;
|
||||
} = {},
|
||||
@@ -607,13 +608,23 @@ export function useExportTracker() {
|
||||
|
||||
activeTransferRuns.add(request.transferId);
|
||||
let terminalStatus: api.TransferProgress["status"] | null = null;
|
||||
let startAcknowledged = false;
|
||||
const acknowledgeStart = () => {
|
||||
if (startAcknowledged) return;
|
||||
startAcknowledged = true;
|
||||
options.onStarted?.();
|
||||
};
|
||||
|
||||
void (async () => {
|
||||
try {
|
||||
await api.startTransfer(request, (progress) => {
|
||||
terminalStatus = isTerminalTransferProgress(progress) ? progress.status : terminalStatus;
|
||||
updateDataTransferTask(progress.transferId, progress);
|
||||
});
|
||||
await api.startTransfer(
|
||||
request,
|
||||
(progress) => {
|
||||
terminalStatus = isTerminalTransferProgress(progress) ? progress.status : terminalStatus;
|
||||
updateDataTransferTask(progress.transferId, progress);
|
||||
},
|
||||
acknowledgeStart,
|
||||
);
|
||||
|
||||
if (terminalStatus === "done" && task.status === "Done") {
|
||||
await options.onDone?.();
|
||||
|
||||
Reference in new issue
Block a user