forked from etcd-io/etcd
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce Kubernetes interface to etcd client
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
- Loading branch information
Showing
3 changed files
with
226 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| package clientv3 | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| pb "go.etcd.io/etcd/api/v3/etcdserverpb" | ||
| "go.etcd.io/etcd/api/v3/mvccpb" | ||
| ) | ||
|
|
||
| func NewKubernetes(c *Client) Kubernetes { | ||
| return &kubernetes{kv: RetryKVClient(c), watcher: newWatchFromWatchClient(pb.NewWatchClient(c.conn), c)} | ||
| } | ||
|
|
||
| type Kubernetes interface { | ||
| Get(ctx context.Context, key string, opts GetOptions) (KubernetesGetResponse, error) | ||
| List(ctx context.Context, prefix string, opts ListOptions) (KubernetesListResponse, error) | ||
| Count(ctx context.Context, prefix string) (int64, error) | ||
| OptimisticPut(ctx context.Context, key string, value []byte, opts PutOptions) (KubernetesPutResponse, error) | ||
| OptimisticDelete(ctx context.Context, key string, opts DeleteOptions) (KubernetesDeleteResponse, error) | ||
| Watch(ctx context.Context, key string, opts WatchOptions) (WatchID, WatchChan) | ||
| RequestProgress(ctx context.Context, id WatchID) error | ||
| } | ||
|
|
||
| type WatchID string | ||
|
|
||
| type GetOptions struct { | ||
| Revision int64 | ||
| } | ||
|
|
||
| type ListOptions struct { | ||
| Revision int64 | ||
| Limit int64 | ||
| Continue string | ||
| } | ||
|
|
||
| type WatchOptions struct { | ||
| ID WatchID | ||
| Revision int64 | ||
| Prefix bool | ||
| ProgressNotify bool | ||
| } | ||
|
|
||
| type PutOptions struct { | ||
| ExpectedRevision int64 | ||
| LeaseID LeaseID | ||
| } | ||
|
|
||
| type DeleteOptions struct { | ||
| ExpectedRevision int64 | ||
| } | ||
|
|
||
| type KubernetesGetResponse struct { | ||
| KV *mvccpb.KeyValue | ||
| Revision int64 | ||
| } | ||
|
|
||
| type KubernetesListResponse struct { | ||
| KVs []*mvccpb.KeyValue | ||
| Count int64 | ||
| Revision int64 | ||
| } | ||
|
|
||
| type KubernetesPutResponse struct { | ||
| KV *mvccpb.KeyValue | ||
| Succeeded bool | ||
| Revision int64 | ||
| } | ||
|
|
||
| type KubernetesDeleteResponse struct { | ||
| KV *mvccpb.KeyValue | ||
| Succeeded bool | ||
| Revision int64 | ||
| } | ||
|
|
||
| type kubernetes struct { | ||
| kv pb.KVClient | ||
| watcher *watcher | ||
| } | ||
|
|
||
| func (k kubernetes) Get(ctx context.Context, key string, opts GetOptions) (resp KubernetesGetResponse, err error) { | ||
| rangeResp, err := k.kv.Range(ctx, &pb.RangeRequest{ | ||
| Key: []byte(key), | ||
| Revision: opts.Revision, | ||
| Limit: 1, | ||
| }) | ||
| if err != nil { | ||
| return resp, toErr(ctx, err) | ||
| } | ||
| resp.Revision = rangeResp.Header.Revision | ||
| if len(rangeResp.Kvs) == 1 { | ||
| resp.KV = rangeResp.Kvs[0] | ||
| } | ||
| return resp, nil | ||
| } | ||
|
|
||
| func (k kubernetes) List(ctx context.Context, prefix string, opts ListOptions) (resp KubernetesListResponse, err error) { | ||
| rangeStart := prefix + opts.Continue | ||
| rangeEnd := GetPrefixRangeEnd(prefix) | ||
|
|
||
| rangeResp, err := k.kv.Range(ctx, &pb.RangeRequest{ | ||
| Key: []byte(rangeStart), | ||
| RangeEnd: []byte(rangeEnd), | ||
| Limit: opts.Limit, | ||
| Revision: opts.Revision, | ||
| }) | ||
| if err != nil { | ||
| return resp, toErr(ctx, err) | ||
| } | ||
| resp.KVs = rangeResp.Kvs | ||
| resp.Count = rangeResp.Count | ||
| resp.Revision = rangeResp.Header.Revision | ||
| return resp, nil | ||
| } | ||
|
|
||
| func (k kubernetes) Count(ctx context.Context, prefix string) (int64, error) { | ||
| resp, err := k.kv.Range(ctx, &pb.RangeRequest{ | ||
| Key: []byte(prefix), | ||
| RangeEnd: []byte(GetPrefixRangeEnd(prefix)), | ||
| CountOnly: true, | ||
| }) | ||
| if err != nil { | ||
| return 0, toErr(ctx, err) | ||
| } | ||
| return resp.Count, nil | ||
| } | ||
|
|
||
| func (k kubernetes) OptimisticPut(ctx context.Context, key string, value []byte, opts PutOptions) (resp KubernetesPutResponse, err error) { | ||
| put := &pb.RequestOp{Request: &pb.RequestOp_RequestPut{&pb.PutRequest{Key: []byte(key), Value: value, Lease: int64(opts.LeaseID)}}} | ||
|
|
||
| txnResp, err := k.optimisticTxn(ctx, key, opts.ExpectedRevision, put) | ||
| if err != nil { | ||
| return resp, toErr(ctx, err) | ||
| } | ||
| resp.Succeeded = txnResp.Succeeded | ||
| resp.Revision = txnResp.Header.Revision | ||
| if !txnResp.Succeeded { | ||
| resp.KV = kvFromTxnResponse(txnResp.Responses[0]) | ||
| } | ||
| return resp, nil | ||
| } | ||
|
|
||
| func (k kubernetes) OptimisticDelete(ctx context.Context, key string, opts DeleteOptions) (resp KubernetesDeleteResponse, err error) { | ||
| del := &pb.RequestOp{Request: &pb.RequestOp_RequestDeleteRange{&pb.DeleteRangeRequest{Key: []byte(key)}}} | ||
|
|
||
| txnResp, err := k.optimisticTxn(ctx, key, opts.ExpectedRevision, del) | ||
| if err != nil { | ||
| return resp, toErr(ctx, err) | ||
| } | ||
| resp.Succeeded = txnResp.Succeeded | ||
| resp.Revision = txnResp.Header.Revision | ||
| if !txnResp.Succeeded { | ||
| resp.KV = kvFromTxnResponse(txnResp.Responses[0]) | ||
| } | ||
| return resp, nil | ||
| } | ||
|
|
||
| func (k kubernetes) optimisticTxn(ctx context.Context, key string, expectRevision int64, onSuccess *pb.RequestOp) (*pb.TxnResponse, error) { | ||
| txn := &pb.TxnRequest{ | ||
| Compare: []*pb.Compare{ | ||
| { | ||
| Key: []byte(key), | ||
| TargetUnion: &pb.Compare_ModRevision{ModRevision: expectRevision}, | ||
| Result: pb.Compare_EQUAL, | ||
| }, | ||
| }, | ||
| Success: []*pb.RequestOp{onSuccess}, | ||
| Failure: []*pb.RequestOp{ | ||
| {Request: &pb.RequestOp_RequestRange{RequestRange: &pb.RangeRequest{Key: []byte(key), Limit: 1}}}, | ||
| }, | ||
| } | ||
| return k.kv.Txn(ctx, txn) | ||
| } | ||
|
|
||
| func kvFromTxnResponse(resp *pb.ResponseOp) *mvccpb.KeyValue { | ||
| getResponse := resp.GetResponseRange() | ||
| if len(getResponse.Kvs) == 1 { | ||
| return getResponse.Kvs[0] | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (k kubernetes) Watch(ctx context.Context, key string, opts WatchOptions) (WatchID, WatchChan) { | ||
| if opts.ID == "" { | ||
| opts.ID = WatchID(streamKeyFromCtx(ctx)) | ||
| } | ||
| ops := []OpOption{ | ||
| WithRev(opts.Revision), WithPrevKV(), | ||
| } | ||
|
|
||
| if opts.Prefix { | ||
| ops = append(ops, WithPrefix()) | ||
| } | ||
| if opts.ProgressNotify { | ||
| ops = append(ops, WithProgressNotify()) | ||
| } | ||
| return opts.ID, k.watcher.watch(ctx, string(opts.ID), key, ops...) | ||
| } | ||
|
|
||
| func (k kubernetes) RequestProgress(ctx context.Context, id WatchID) error { | ||
| return k.watcher.requestProgress(ctx, string(id)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters