Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Data copier fix #1328

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Data copier fix #1328

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
154e8ec
First changelist description
aksingh737 Apr 21, 2023
1ab1f67
Merge remote-tracking branch 'origin/master' into master-dtp
aksingh737 Sep 6, 2023
13fcba5
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Sep 7, 2023
7dd9fc8
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Sep 29, 2023
debf243
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Oct 24, 2023
36bfb5f
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Nov 15, 2023
09bb4d9
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Nov 27, 2023
9be9ff9
Fixes upload time bug. Upload time wasn't being populated
aksingh737 Nov 28, 2023
df1de36
Merge branch 'master' of https://github.com/google/data-transfer-project
aksingh737 Nov 28, 2023
7671b3e
Merge branch 'master' of github.com:aksingh737/data-transfer-project …
aksingh737 Nov 28, 2023
330465f
remove unused code
aksingh737 Nov 28, 2023
ec8d12f
remove en secrets
aksingh737 Nov 28, 2023
b70332d
remove useless changelist
aksingh737 Nov 28, 2023
5dc41e7
Merge pull request #1 from aksingh737/uploadTimeBug
aksingh737 Nov 28, 2023
d450001
adressed the comments on the changelist
aksingh737 Nov 29, 2023
b1feaa9
Merge pull request #2 from aksingh737/uploadTimeBug
aksingh737 Nov 29, 2023
c66c0ae
fix tests
aksingh737 Nov 29, 2023
67fe6f9
Merge pull request #3 from aksingh737/uploadTimeBug
aksingh737 Nov 29, 2023
ff50623
Merge remote-tracking branch 'origin/master'
aksingh737 Jan 3, 2024
d355dae
Merge remote-tracking branch 'origin/master'
aksingh737 Jan 9, 2024
85735b2
Fix NullPointerException that was being caused by accessing null Port…
aksingh737 Jan 9, 2024
03a07ec
Fail transfer instantly if a job cannot be fetched
aksingh737 Jan 11, 2024
dfb219e
Fail transfer instantly if a job cannot be fetched. Undid the old change
aksingh737 Jan 11, 2024
2b68c83
Added static checkNotNull and rephrased the error message to log job id
aksingh737 Jan 12, 2024
28ba72d
Merge branch 'master' into dataCopierFix
aksingh737 Jan 12, 2024
a609c7d
Merge branch 'google:master' into dataCopierFix
aksingh737 Feb 1, 2024
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
2 changes: 2 additions & 0 deletions ...n/java/org/datatransferproject/transfer/copier/PortabilityAbstractInMemoryDataCopier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.datatransferproject.transfer.copier;

import com.google.cloud.datastore.DatastoreException;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Stopwatch;
import com.google.inject.Provider;
import java.io.IOException;
Expand Down Expand Up @@ -125,6 +126,7 @@ protected ExportResult<?> copyIteration(
DataModel exportedData = exportResult.getExportedData();
if (exportedData != null) {
PortabilityJob job = jobStore.findJob(jobId);
checkNotNull(job, "Transfer job not found from jobStore, mid-way through copy iteration, for the job ID \"%s\"", jobId.toString());
TransferMode transferMode =
job.transferMode() == null ? TransferMode.DATA_TRANSFER : job.transferMode();
switch (transferMode) {
Expand Down
Loading