Skip to content

Fix to separete the milestones for .pipe/ and app config #3760

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

Merged
knanao merged 1 commit into from
Jun 21, 2022
Merged

Fix to separete the milestones for .pipe/ and app config #3760

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions pkg/app/piped/eventwatcher/eventwatcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,13 @@ type watcher struct {

// All cloned repository will be placed under this.
workingDir string
// Maximum timestamp of the last Event read.
// Maximum timestamp of the last Event read from .pipe/.
// A map from repo-id to the UNIX timestamp that has been read.
milestoneMap sync.Map

// Maximum timestamp of the last Event read from the application config.
// A map from repo-id to the UNIX timestamp that has been read.
executionMilestoneMap sync.Map
// Cache for the last scanned commit and event watcher configs for each application.
lastScannedConfig sync.Map
}
Expand Down Expand Up @@ -317,7 +321,7 @@ func (w *watcher) execute(ctx context.Context, repo git.Repo, repoID string, eve

var milestone int64
firstRead := true
if v, ok := w.milestoneMap.Load(repoID); ok {
if v, ok := w.executionMilestoneMap.Load(repoID); ok {
milestone = v.(int64)
firstRead = false
}
Expand Down Expand Up @@ -429,7 +433,7 @@ func (w *watcher) execute(ctx context.Context, repo git.Repo, repoID string, eve
if _, err := w.apiClient.ReportEventStatuses(ctx, &pipedservice.ReportEventStatusesRequest{Events: handledEvents}); err != nil {
return fmt.Errorf("failed to report event statuses: %w", err)
}
w.milestoneMap.Store(repoID, maxTimestamp)
w.executionMilestoneMap.Store(repoID, maxTimestamp)
return nil
}

Expand All @@ -450,7 +454,7 @@ func (w *watcher) execute(ctx context.Context, repo git.Repo, repoID string, eve
if _, err := w.apiClient.ReportEventStatuses(ctx, &pipedservice.ReportEventStatusesRequest{Events: handledEvents}); err != nil {
return fmt.Errorf("failed to report event statuses: %w", err)
}
w.milestoneMap.Store(repoID, maxTimestamp)
w.executionMilestoneMap.Store(repoID, maxTimestamp)
return fmt.Errorf("failed to push commits: %w", err)
}

Expand Down