a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

etcd: allow specifying a revision for a get

This commit is contained in:
Simone Gotti 2019-03-29 11:37:22 +01:00
parent 1e41e3ad33
commit 21447fc59d
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/etcd/etcd.go
View File

@ -161,9 +161,13 @@ func (s *Store) Put(ctx context.Context, key string, value []byte, options *Writ
return resp, FromEtcdError(err) return resp, FromEtcdError(err)
} }
func (s *Store) Get(ctx context.Context, key string) (*etcdclientv3.GetResponse, error) { func (s *Store) Get(ctx context.Context, key string, revision int64) (*etcdclientv3.GetResponse, error) {
resp, err := s.c.Get(ctx, key) opts := []etcdclientv3.OpOption{}
if revision != 0 {
opts = append(opts, etcdclientv3.WithRev(revision))
}
resp, err := s.c.Get(ctx, key, opts...)
if err != nil { if err != nil {
return resp, FromEtcdError(err) return resp, FromEtcdError(err)
} }

4
internal/sequence/sequence.go
View File

@ -68,7 +68,7 @@ func (s *Sequence) EqualEpoch(s2 *Sequence) bool {
} }
func CurSequence(ctx context.Context, e *etcd.Store, key string) (*Sequence, bool, error) { func CurSequence(ctx context.Context, e *etcd.Store, key string) (*Sequence, bool, error) {
resp, err := e.Get(ctx, key) resp, err := e.Get(ctx, key, 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return nil, false, err return nil, false, err
} }
@ -87,7 +87,7 @@ func CurSequence(ctx context.Context, e *etcd.Store, key string) (*Sequence, boo
} }
func IncSequence(ctx context.Context, e *etcd.Store, key string) (*Sequence, error) { func IncSequence(ctx context.Context, e *etcd.Store, key string) (*Sequence, error) {
resp, err := e.Get(ctx, key) resp, err := e.Get(ctx, key, 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return nil, err return nil, err
} }

6
internal/services/runservice/scheduler/store/store.go
View File

@ -249,7 +249,7 @@ func LTSGenIndexes(lts *objectstorage.ObjStorage, r *types.Run) []string {
} }
func GetExecutor(ctx context.Context, e *etcd.Store, executorID string) (*types.Executor, error) { func GetExecutor(ctx context.Context, e *etcd.Store, executorID string) (*types.Executor, error) {
resp, err := e.Get(ctx, common.EtcdExecutorKey(executorID)) resp, err := e.Get(ctx, common.EtcdExecutorKey(executorID), 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -304,7 +304,7 @@ func DeleteExecutor(ctx context.Context, e *etcd.Store, executorID string) error
} }
func GetExecutorTask(ctx context.Context, e *etcd.Store, etID string) (*types.ExecutorTask, error) { func GetExecutorTask(ctx context.Context, e *etcd.Store, etID string) (*types.ExecutorTask, error) {
resp, err := e.Get(ctx, common.EtcdTaskKey(etID)) resp, err := e.Get(ctx, common.EtcdTaskKey(etID), 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -422,7 +422,7 @@ func GetExecutorTasksForRun(ctx context.Context, e *etcd.Store, runID string) ([
} }
func GetRun(ctx context.Context, e *etcd.Store, runID string) (*types.Run, int64, error) { func GetRun(ctx context.Context, e *etcd.Store, runID string) (*types.Run, int64, error) {
resp, err := e.Get(ctx, common.EtcdRunKey(runID)) resp, err := e.Get(ctx, common.EtcdRunKey(runID), 0)
if err != nil { if err != nil {
return nil, 0, err return nil, 0, err
} }

6
internal/testutil/utils.go
View File

@ -297,7 +297,7 @@ type TestEtcd struct {
func (te *TestEtcd) Compact() error { func (te *TestEtcd) Compact() error {
ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout) ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout)
defer cancel() defer cancel()
resp, err := te.Get(ctx, "anykey") resp, err := te.Get(ctx, "anykey", 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return err return err
} }
@ -311,7 +311,7 @@ func (te *TestEtcd) WaitUp(timeout time.Duration) error {
for time.Now().Add(-timeout).Before(start) { for time.Now().Add(-timeout).Before(start) {
ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout) ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout)
defer cancel() defer cancel()
_, err := te.Get(ctx, "anykey") _, err := te.Get(ctx, "anykey", 0)
if err != nil && err == etcd.ErrKeyNotFound { if err != nil && err == etcd.ErrKeyNotFound {
return nil return nil
} }
@ -329,7 +329,7 @@ func (te *TestEtcd) WaitDown(timeout time.Duration) error {
for time.Now().Add(-timeout).Before(start) { for time.Now().Add(-timeout).Before(start) {
ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout) ctx, cancel := context.WithTimeout(context.Background(), etcdTimeout)
defer cancel() defer cancel()
_, err := te.Get(ctx, "anykey") _, err := te.Get(ctx, "anykey", 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return nil return nil
} }

6
internal/wal/wal.go
View File

@ -466,7 +466,7 @@ func (w *WalManager) FirstAvailableWalData(ctx context.Context) (*WalData, int64
} }
func (w *WalManager) LastCommittedStorageWal(ctx context.Context) (string, int64, error) { func (w *WalManager) LastCommittedStorageWal(ctx context.Context) (string, int64, error) {
resp, err := w.e.Get(ctx, etcdLastCommittedStorageWalSeqKey) resp, err := w.e.Get(ctx, etcdLastCommittedStorageWalSeqKey, 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return "", 0, err return "", 0, err
} }
@ -587,7 +587,7 @@ func (w *WalManager) WriteWalAdditionalOps(ctx context.Context, actions []*Actio
return nil, err return nil, err
} }
resp, err := w.e.Get(ctx, etcdWalsDataKey) resp, err := w.e.Get(ctx, etcdWalsDataKey, 0)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -1121,7 +1121,7 @@ func (w *WalManager) InitEtcd(ctx context.Context) error {
return etcd.FromEtcdError(err) return etcd.FromEtcdError(err)
} }
_, err := w.e.Get(ctx, etcdWalsDataKey) _, err := w.e.Get(ctx, etcdWalsDataKey, 0)
if err != nil && err != etcd.ErrKeyNotFound { if err != nil && err != etcd.ErrKeyNotFound {
return err return err
} }