MaxRetryCountをConfigで設定できるようにした refs #48

gcpug · Oct 5, 2019 · 35897a5 · 35897a5
1 parent 243e82b
commit 35897a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/datastore_export_api.go b/datastore_export_api.go
@@ -24,6 +24,7 @@ type DatastoreExportRequest struct {
 	OutputGCSFilePath string   `json:"outputGCSFilePath"`
 	BQLoadProjectID   string   `json:"bqLoadProjectId"`
 	BQLoadDatasetID   string   `json:"bqLoadDatasetId"`
+	MaxRetryCount     int      `json:"maxRetryCount"`
 }
 
 type DatastoreExportResponse struct {
@@ -124,7 +125,7 @@ func HandleDatastoreExportAPI(w http.ResponseWriter, r *http.Request) {
 }
 
 func (api *DatastoreExportAPI) StartDS2BQJob(ctx context.Context, ds2bqJobID string, body string, form *DatastoreExportRequest, namespaceIDs []string, kinds []string, ef *datastore.EntityFilter) (string, error) {
-	_, err := api.DSExportJobStore.Create(ctx, ds2bqJobID, body, form.ProjectID, namespaceIDs, kinds)
+	_, err := api.DSExportJobStore.Create(ctx, ds2bqJobID, body, form.ProjectID, namespaceIDs, kinds, form.MaxRetryCount)
 	if err != nil {
 		return "", fmt.Errorf("failed DSExportJobStore.Create() ds2bqJobID=%v.err=%+v", ds2bqJobID, err)
 	}

diff --git a/datastore_export_job_check_api.go b/datastore_export_job_check_api.go
@@ -120,7 +120,7 @@ func (api *DatastoreExportJobCheckAPI) Check(ctx context.Context, form *Datastor
 			return failure.New(StatusInternalServerError, failure.Messagef("failed DSExportJobStore.Get. DS2BQJobID=%v,err=%v\n", form.DS2BQJobID, err))
 		}
 		job.RetryCount++
-		if job.RetryCount > 3 { // TODO MaxRetryCountを設定できるようにする
+		if job.RetryCount > job.MaxRetryCount {
 			return nil
 		}
 

diff --git a/dsexport_job_store.go b/dsexport_job_store.go
@@ -40,6 +40,7 @@ type DSExportJob struct {
 	ExportKinds              []string `datastore:",noindex"`
 	StatusCheckCount         int
 	Status                   DSExportJobStatus
+	MaxRetryCount            int
 	RetryCount               int
 	ChangeStatusAt           time.Time
 	DSExportResponseMessages []string `datastore:",noindex"` // DatastoreExportJobID-_-ResponseMessagesが格納される
@@ -89,7 +90,7 @@ func (store *DSExportJobStore) NewKey(ctx context.Context, ds2bqJobID string) da
 	return store.ds.NameKey("DSExportJob", ds2bqJobID, nil)
 }
 
-func (store *DSExportJobStore) Create(ctx context.Context, ds2bqJobID string, body string, exportProjectID string, namespaceIDs []string, kinds []string) (*DSExportJob, error) {
+func (store *DSExportJobStore) Create(ctx context.Context, ds2bqJobID string, body string, exportProjectID string, namespaceIDs []string, kinds []string, maxRetryCount int) (*DSExportJob, error) {
 	e := DSExportJob{
 		ID:                       ds2bqJobID,
 		DSExportJobIDs:           []string{},
@@ -100,6 +101,7 @@ func (store *DSExportJobStore) Create(ctx context.Context, ds2bqJobID string, bo
 		ExportKinds:              kinds,
 		ChangeStatusAt:           time.Now(),
 		DSExportResponseMessages: []string{},
+		MaxRetryCount:            maxRetryCount,
 	}
 	_, err := store.ds.Put(ctx, store.NewKey(ctx, ds2bqJobID), &e)
 	if err != nil {