Skip to content

Commit d8751e8

Browse files
authored
fix: exclude initialization time from upload time calculation (#4052)
<!-- Thanks for sending a pull request (PR)! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: [Contributing to Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md) 2. Ensure you have added or run the appropriate tests for your PR 3. If the PR is work in progress, mark it a draft on GitHub. 4. Please write your PR title to summarize what this PR proposes, we are following Conventional Commits style for PR titles as well. 5. Be sure to keep the PR description updated to reflect all changes. --> ### What changes were proposed in this PR? <!-- Please clarify what changes you are proposing. The purpose of this section is to outline the changes. Here are some tips for you: 1. If you propose a new API, clarify the use case for a new API. 2. If you fix a bug, you can clarify why it is a bug. 3. If it is a refactoring, clarify what has been changed. 3. It would be helpful to include a before-and-after comparison using screenshots or GIFs. 4. Please consider writing useful notes for better and faster reviews. --> This PR changes the upload time calculation to only include actual uploading time, excluding initialization time. **New behavior:** When resources and network are limited: - File A and B initialize simultaneously. File B's initialization takes longer. - When File B starts uploading, its timer starts at 0s and tracks only its upload duration. https://github.com/user-attachments/assets/6dc3af4f-d7e6-408e-9ce9-011e104ef294 ### Any related issues, documentation, discussions? <!-- Please use this section to link other resources if not mentioned already. 1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves #1234` or `Closes #1234`. If it is only related, simply mention the issue number. 2. If there is design documentation, please add the link. 3. If there is a discussion in the mailing list, please add the link. --> Fixes #4051 ### How was this PR tested? <!-- If tests were added, say they were added here. Or simply mention that if the PR is tested with existing test cases. Make sure to include/update test cases that check the changes thoroughly including negative and positive cases if possible. If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future. If tests were not added, please describe why they were not added and/or why it was difficult to add. --> Passed automated tests, manually tested with large uploads ### Was this PR authored or co-authored using generative AI tooling? <!-- If generative AI tooling has been used in the process of authoring this PR, please include the phrase: 'Generated-by: ' followed by the name of the tool and its version. If no, write 'No'. Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details. --> No
1 parent b89273d commit d8751e8

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

frontend/src/app/dashboard/service/user/dataset/dataset.service.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,20 @@ export class DatasetService {
157157
const partProgress = new Map<number, number>();
158158

159159
// Progress tracking state
160-
const startTime = Date.now();
160+
let startTime: number | null = null;
161161
const speedSamples: number[] = [];
162162
let lastETA = 0;
163163
let lastUpdateTime = 0;
164164

165165
// Calculate stats with smoothing
166+
const getTotalTime = () => (startTime ? (Date.now() - startTime) / 1000 : 0);
166167
const calculateStats = (totalUploaded: number) => {
168+
if (startTime === null) {
169+
startTime = Date.now();
170+
}
171+
167172
const now = Date.now();
168-
const elapsed = (now - startTime) / 1000;
173+
const elapsed = getTotalTime();
169174

170175
// Throttle updates to every 1s
171176
const shouldUpdate = now - lastUpdateTime >= 1000;
@@ -324,7 +329,6 @@ export class DatasetService {
324329
)
325330
),
326331
tap(() => {
327-
const finalTotalTime = (Date.now() - startTime) / 1000;
328332
observer.next({
329333
filePath,
330334
percentage: 100,
@@ -333,13 +337,12 @@ export class DatasetService {
333337
physicalAddress: physicalAddress,
334338
uploadSpeed: 0,
335339
estimatedTimeRemaining: 0,
336-
totalTime: finalTotalTime,
340+
totalTime: getTotalTime(),
337341
});
338342
observer.complete();
339343
}),
340344
catchError((error: unknown) => {
341345
// If an error occurred, abort the upload
342-
const currentTotalTime = (Date.now() - startTime) / 1000;
343346
observer.next({
344347
filePath,
345348
percentage: Math.round((uploadedParts.length / partCount) * 100),
@@ -348,7 +351,7 @@ export class DatasetService {
348351
physicalAddress: physicalAddress,
349352
uploadSpeed: 0,
350353
estimatedTimeRemaining: 0,
351-
totalTime: currentTotalTime,
354+
totalTime: getTotalTime(),
352355
});
353356

354357
return this.finalizeMultipartUpload(

0 commit comments

Comments
 (0)