From 98248b93656300d24c2214facc968fd36cb2c9dd Mon Sep 17 00:00:00 2001 From: notfelineit Date: Tue, 20 Sep 2022 11:28:03 -0700 Subject: [PATCH] Undo changes to unrelated protos Signed-off-by: notfelineit --- go/vt/proto/query/query.pb.go | 18 ++++++------------ go/vt/proto/topodata/topodata.pb.go | 1 + go/vt/proto/vtrpc/vtrpc.pb.go | 29 +++++++++++++---------------- 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go index b6da31e8183..67328389a72 100644 --- a/go/vt/proto/query/query.pb.go +++ b/go/vt/proto/query/query.pb.go @@ -5069,22 +5069,16 @@ type StreamHealthResponse struct { // // In practice, this field is set to: // a) the last time the RPC tabletmanager.TabletExternallyReparented was - // - // called on this tablet (usually done by an external failover tool e.g. - // Orchestrator). The failover tool can call this as long as we are the - // primary i.e. even ages after the last reparent occurred. - // + // called on this tablet (usually done by an external failover tool e.g. + // Orchestrator). The failover tool can call this as long as we are the + // primary i.e. even ages after the last reparent occurred. // OR // b) the last time an active reparent was executed through a vtctl command - // - // (InitShardPrimary, PlannedReparentShard, EmergencyReparentShard) - // + // (InitShardPrimary, PlannedReparentShard, EmergencyReparentShard) // OR // c) the last time vttablet was started and it initialized its tablet type - // - // as PRIMARY because it was recorded as the shard's current primary in the - // topology (see go/vt/vttablet/tabletmanager/init_tablet.go) - // + // as PRIMARY because it was recorded as the shard's current primary in the + // topology (see go/vt/vttablet/tabletmanager/init_tablet.go) // OR // d) 0 if the vttablet was never a PRIMARY. TabletExternallyReparentedTimestamp int64 `protobuf:"varint,3,opt,name=tablet_externally_reparented_timestamp,json=tabletExternallyReparentedTimestamp,proto3" json:"tablet_externally_reparented_timestamp,omitempty"` diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go index 99cf8dfe48f..a9797c58282 100644 --- a/go/vt/proto/topodata/topodata.pb.go +++ b/go/vt/proto/topodata/topodata.pb.go @@ -402,6 +402,7 @@ type Tablet struct { // about which tablet should be the primary, such as via Vitess // replication-management commands like PlannedReparentShard, // EmergencyReparentShard, and TabletExternallyReparented. + // PrimaryTermStartTime *vttime.Time `protobuf:"bytes,14,opt,name=primary_term_start_time,json=primaryTermStartTime,proto3" json:"primary_term_start_time,omitempty"` // db_server_version represents the database version used by the tablet. DbServerVersion string `protobuf:"bytes,15,opt,name=db_server_version,json=dbServerVersion,proto3" json:"db_server_version,omitempty"` diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go index b2ebe0ed4b5..9ff0a6a3e4f 100644 --- a/go/vt/proto/vtrpc/vtrpc.pb.go +++ b/go/vt/proto/vtrpc/vtrpc.pb.go @@ -39,9 +39,7 @@ const ( // Code represents canonical error codes. The names, numbers and comments // must match the ones defined by grpc (0-16): -// -// https://godoc.org/google.golang.org/grpc/codes. -// +// https://godoc.org/google.golang.org/grpc/codes. // 17+ are custom codes type Code int32 @@ -90,19 +88,18 @@ const ( // // A litmus test that may help a service implementor in deciding // between FAILED_PRECONDITION, ABORTED, and UNAVAILABLE: - // - // (a) Use UNAVAILABLE if the client can retry just the failing call. - // (b) Use ABORTED if the client should retry at a higher-level - // (e.g., restarting a read-modify-write sequence). - // (c) Use FAILED_PRECONDITION if the client should not retry until - // the system state has been explicitly fixed. E.g., if an "rmdir" - // fails because the directory is non-empty, FAILED_PRECONDITION - // should be returned since the client should not retry unless - // they have first fixed up the directory by deleting files from it. - // (d) Use FAILED_PRECONDITION if the client performs conditional - // REST Get/Update/Delete on a resource and the resource on the - // server does not match the condition. E.g., conflicting - // read-modify-write on the same resource. + // (a) Use UNAVAILABLE if the client can retry just the failing call. + // (b) Use ABORTED if the client should retry at a higher-level + // (e.g., restarting a read-modify-write sequence). + // (c) Use FAILED_PRECONDITION if the client should not retry until + // the system state has been explicitly fixed. E.g., if an "rmdir" + // fails because the directory is non-empty, FAILED_PRECONDITION + // should be returned since the client should not retry unless + // they have first fixed up the directory by deleting files from it. + // (d) Use FAILED_PRECONDITION if the client performs conditional + // REST Get/Update/Delete on a resource and the resource on the + // server does not match the condition. E.g., conflicting + // read-modify-write on the same resource. Code_FAILED_PRECONDITION Code = 9 // ABORTED indicates the operation was aborted, typically due to a // concurrency issue like sequencer check failures, transaction aborts,