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

Jump to bottom

Fix to check error of etcd watch response #267

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Fix to check error of etcd watch response #267

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed

- Fix to check error of etcd watch response in [#267](https://github.com/cybozu-go/sabakan/pull/267)

## [2.13.2] - 2023-02-24

### Changed
Expand Down
7 changes: 6 additions & 1 deletion models/etcd/watch_stateful.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,12 @@ RETRY:
env.Stop()

for resp := range rch {
if resp.CompactRevision != 0 {
err := resp.Err()
if err != nil {
if resp.CompactRevision == 0 {
return err
}

log.Warn("database has been compacted; re-initializing", map[string]interface{}{
"compactedrev": resp.CompactRevision,
})
Expand Down
3 changes: 3 additions & 0 deletions models/etcd/watch_stateless.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ func (d *driver) startStatelessWatcher(ctx context.Context, ch, indexCh chan<- s
clientv3.WithRev(rev+1),
)
for wresp := range rch {
if err := wresp.Err(); err != nil {
return err
}
for _, ev := range wresp.Events {
var err error
key := string(ev.Kv.Key)
Expand Down