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

fail export in case export is currently in progress #914

Merged
merged 2 commits into from
Nov 12, 2020
Merged

fail export in case export is currently in progress #914

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
890938c
requie export-path flage on export set config command
guy-har Nov 12, 2020
d71c10f
validate previous state first of all
guy-har Nov 12, 2020
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
6 changes: 6 additions & 0 deletions export/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package export

import (
"context"
"errors"
"fmt"

nanoid "github.com/matoous/go-nanoid"
Expand All @@ -19,6 +20,8 @@ func getExportID(repo, branch, commitRef string) (string, error) {
return fmt.Sprintf("%s-%s-%s-%s", repo, branch, commitRef, nid), nil
}

var ErrExportInProgress = errors.New("export currently in progress")

// ExportBranchStart inserts a start task on branch, sets branch export state to pending.
// It returns an error if an export is already in progress.
func ExportBranchStart(paradeDB parade.Parade, cataloger catalog.Cataloger, repo, branch string) (string, error) {
Expand All @@ -32,6 +35,9 @@ func ExportBranchStart(paradeDB parade.Parade, cataloger catalog.Cataloger, repo
return "", err
}
err = cataloger.ExportState(repo, branch, commitRef, func(oldRef string, state catalog.CatalogBranchExportStatus) (newState catalog.CatalogBranchExportStatus, newMessage *string, err error) {
if state == catalog.ExportStatusInProgress {
return state, nil, ErrExportInProgress
}
config, err := cataloger.GetExportConfigurationForBranch(repo, branch)
if err != nil {
return "", nil, err
Expand Down