Bump to 'etcd' v3.2.7.

This commit is contained in:
Bruno Miguel Custodio 2017-09-08 10:18:12 +01:00
parent 52c97e9fc9
commit 8afb8248d5
No known key found for this signature in database
GPG Key ID: 84CDD9E18A1A6B2C
6 changed files with 905 additions and 346 deletions

View File

@ -193,11 +193,12 @@ func (rs readSet) add(keys []string, txnresp *v3.TxnResponse) {
} }
} }
// first returns the store revision from the first fetch
func (rs readSet) first() int64 { func (rs readSet) first() int64 {
ret := int64(math.MaxInt64 - 1) ret := int64(math.MaxInt64 - 1)
for _, resp := range rs { for _, resp := range rs {
if len(resp.Kvs) > 0 && resp.Kvs[0].ModRevision < ret { if rev := resp.Header.Revision; rev < ret {
ret = resp.Kvs[0].ModRevision ret = rev
} }
} }
return ret return ret

View File

@ -66,6 +66,7 @@ var (
ErrGRPCTimeoutDueToLeaderFail = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out, possibly due to previous leader failure") ErrGRPCTimeoutDueToLeaderFail = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out, possibly due to previous leader failure")
ErrGRPCTimeoutDueToConnectionLost = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out, possibly due to connection lost") ErrGRPCTimeoutDueToConnectionLost = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out, possibly due to connection lost")
ErrGRPCUnhealthy = grpc.Errorf(codes.Unavailable, "etcdserver: unhealthy cluster") ErrGRPCUnhealthy = grpc.Errorf(codes.Unavailable, "etcdserver: unhealthy cluster")
ErrGRPCCorrupt = grpc.Errorf(codes.DataLoss, "etcdserver: corrupt cluster")
errStringToError = map[string]error{ errStringToError = map[string]error{
grpc.ErrorDesc(ErrGRPCEmptyKey): ErrGRPCEmptyKey, grpc.ErrorDesc(ErrGRPCEmptyKey): ErrGRPCEmptyKey,
@ -114,6 +115,7 @@ var (
grpc.ErrorDesc(ErrGRPCTimeoutDueToLeaderFail): ErrGRPCTimeoutDueToLeaderFail, grpc.ErrorDesc(ErrGRPCTimeoutDueToLeaderFail): ErrGRPCTimeoutDueToLeaderFail,
grpc.ErrorDesc(ErrGRPCTimeoutDueToConnectionLost): ErrGRPCTimeoutDueToConnectionLost, grpc.ErrorDesc(ErrGRPCTimeoutDueToConnectionLost): ErrGRPCTimeoutDueToConnectionLost,
grpc.ErrorDesc(ErrGRPCUnhealthy): ErrGRPCUnhealthy, grpc.ErrorDesc(ErrGRPCUnhealthy): ErrGRPCUnhealthy,
grpc.ErrorDesc(ErrGRPCCorrupt): ErrGRPCCorrupt,
} }
// client-side error // client-side error
@ -162,6 +164,7 @@ var (
ErrTimeoutDueToLeaderFail = Error(ErrGRPCTimeoutDueToLeaderFail) ErrTimeoutDueToLeaderFail = Error(ErrGRPCTimeoutDueToLeaderFail)
ErrTimeoutDueToConnectionLost = Error(ErrGRPCTimeoutDueToConnectionLost) ErrTimeoutDueToConnectionLost = Error(ErrGRPCTimeoutDueToConnectionLost)
ErrUnhealthy = Error(ErrGRPCUnhealthy) ErrUnhealthy = Error(ErrGRPCUnhealthy)
ErrCorrupt = Error(ErrGRPCCorrupt)
) )
// EtcdError defines gRPC server errors. // EtcdError defines gRPC server errors.

View File

@ -49,6 +49,9 @@
LeaseKeepAliveResponse LeaseKeepAliveResponse
LeaseTimeToLiveRequest LeaseTimeToLiveRequest
LeaseTimeToLiveResponse LeaseTimeToLiveResponse
LeaseLeasesRequest
LeaseStatus
LeaseLeasesResponse
Member Member
MemberAddRequest MemberAddRequest
MemberAddResponse MemberAddResponse

File diff suppressed because it is too large Load Diff

View File

@ -112,7 +112,13 @@ service Lease {
}; };
} }
// TODO(xiangli) List all existing Leases? // LeaseLeases lists all existing leases.
rpc LeaseLeases(LeaseLeasesRequest) returns (LeaseLeasesResponse) {
option (google.api.http) = {
post: "/v3alpha/kv/lease/leases"
body: "*"
};
}
} }
service Cluster { service Cluster {
@ -184,7 +190,7 @@ service Maintenance {
}; };
} }
// HashKV computes the hash of all MVCC keys up to a given revision. // HashKV computes the hash of all MVCC keys up to a given revision.
rpc HashKV(HashKVRequest) returns (HashKVResponse) { rpc HashKV(HashKVRequest) returns (HashKVResponse) {
option (google.api.http) = { option (google.api.http) = {
post: "/v3alpha/maintenance/hash" post: "/v3alpha/maintenance/hash"
@ -511,6 +517,7 @@ message Compare {
CREATE = 1; CREATE = 1;
MOD = 2; MOD = 2;
VALUE= 3; VALUE= 3;
LEASE = 4;
} }
// result is logical comparison operation for this comparison. // result is logical comparison operation for this comparison.
CompareResult result = 1; CompareResult result = 1;
@ -527,10 +534,14 @@ message Compare {
int64 mod_revision = 6; int64 mod_revision = 6;
// value is the value of the given key, in bytes. // value is the value of the given key, in bytes.
bytes value = 7; bytes value = 7;
// lease is the lease id of the given key.
int64 lease = 8;
// leave room for more target_union field tags, jump to 64
} }
// range_end compares the given target to all keys in the range [key, range_end). // range_end compares the given target to all keys in the range [key, range_end).
// See RangeRequest for more details on key ranges. // See RangeRequest for more details on key ranges.
bytes range_end = 8; bytes range_end = 64;
// TODO: fill out with most of the rest of RangeRequest fields when needed. // TODO: fill out with most of the rest of RangeRequest fields when needed.
} }
@ -752,6 +763,19 @@ message LeaseTimeToLiveResponse {
repeated bytes keys = 5; repeated bytes keys = 5;
} }
message LeaseLeasesRequest {
}
message LeaseStatus {
int64 ID = 1;
// TODO: int64 TTL = 2;
}
message LeaseLeasesResponse {
ResponseHeader header = 1;
repeated LeaseStatus leases = 2;
}
message Member { message Member {
// ID is the member ID for this member. // ID is the member ID for this member.
uint64 ID = 1; uint64 ID = 1;
@ -828,6 +852,7 @@ message MoveLeaderResponse {
enum AlarmType { enum AlarmType {
NONE = 0; // default, used to query if any alarm is active NONE = 0; // default, used to query if any alarm is active
NOSPACE = 1; // space quota is exhausted NOSPACE = 1; // space quota is exhausted
CORRUPT = 2; // kv store corruption detected
} }
message AlarmRequest { message AlarmRequest {

42
vendor/vendor.json vendored
View File

@ -912,6 +912,12 @@
"revision": "c914be64f07d9998f52bf0d598ec26d457168c0f", "revision": "c914be64f07d9998f52bf0d598ec26d457168c0f",
"revisionTime": "2016-11-06T04:23:43Z" "revisionTime": "2016-11-06T04:23:43Z"
}, },
{
"checksumSHA1": "7BC2/27NId9xaPDB5w3nWN2mn9A=",
"path": "github.com/coreos/etcd/auth/authpb",
"revision": "6930e471ed55ef89641a658b9fcb777295d5055b",
"revisionTime": "2017-09-08T03:04:28Z"
},
{ {
"checksumSHA1": "vHgur8rFMm8ewYO5tqJXXXE/XnA=", "checksumSHA1": "vHgur8rFMm8ewYO5tqJXXXE/XnA=",
"comment": "v2.3.0-alpha.0-652-ge552791", "comment": "v2.3.0-alpha.0-652-ge552791",
@ -921,18 +927,36 @@
{ {
"checksumSHA1": "sUY/zcJDOG367WcDYCPRyreB4sI=", "checksumSHA1": "sUY/zcJDOG367WcDYCPRyreB4sI=",
"path": "github.com/coreos/etcd/clientv3", "path": "github.com/coreos/etcd/clientv3",
"revision": "c31bec0f29facff13f7c3e3d948e55dd6689ed42", "revision": "bb66589f8cf18960c7f3d56b1b83753caeed9c7a",
"revisionTime": "2017-07-19T15:37:30Z", "revisionTime": "2017-09-01T16:15:15Z",
"version": "v3.2.4", "version": "v3.2.7",
"versionExact": "v3.2.4" "versionExact": "v3.2.7"
}, },
{ {
"checksumSHA1": "HWGjJoAdeVaq4dqkSKF6iYQj1aY=", "checksumSHA1": "YuRZDQchOMiceil5cZ2+7NWeRKE=",
"path": "github.com/coreos/etcd/clientv3/concurrency", "path": "github.com/coreos/etcd/clientv3/concurrency",
"revision": "c31bec0f29facff13f7c3e3d948e55dd6689ed42", "revision": "bb66589f8cf18960c7f3d56b1b83753caeed9c7a",
"revisionTime": "2017-07-19T15:37:30Z", "revisionTime": "2017-09-01T16:15:15Z",
"version": "v3.2.4", "version": "v3.2.7",
"versionExact": "v3.2.4" "versionExact": "v3.2.7"
},
{
"checksumSHA1": "P9fegjOukUL4pPOCCY5K7/DQmTM=",
"path": "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes",
"revision": "6930e471ed55ef89641a658b9fcb777295d5055b",
"revisionTime": "2017-09-08T03:04:28Z"
},
{
"checksumSHA1": "c0ltvGUOnk8qaEshFwc0PDH5nbc=",
"path": "github.com/coreos/etcd/etcdserver/etcdserverpb",
"revision": "6930e471ed55ef89641a658b9fcb777295d5055b",
"revisionTime": "2017-09-08T03:04:28Z"
},
{
"checksumSHA1": "JAkX9DfIBrSe0vUa07xl5cikxVQ=",
"path": "github.com/coreos/etcd/mvcc/mvccpb",
"revision": "6930e471ed55ef89641a658b9fcb777295d5055b",
"revisionTime": "2017-09-08T03:04:28Z"
}, },
{ {
"checksumSHA1": "mKIXx1kDwmVmdIpZ3pJtRBuUKso=", "checksumSHA1": "mKIXx1kDwmVmdIpZ3pJtRBuUKso=",