Merge pull request #267 from cybozu-go/check-error-in-etcd-watch

Fix to check error of etcd watch response

CHANGELOG.md

@@ -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

models/etcd/watch_stateful.go

@@ -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,
 			})

models/etcd/watch_stateless.go

@@ -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)