diff --git a/go/cmd/vtctld/schema.go b/go/cmd/vtctld/schema.go index 55abd11d344..ae229dc03fd 100644 --- a/go/cmd/vtctld/schema.go +++ b/go/cmd/vtctld/schema.go @@ -32,12 +32,10 @@ import ( ) var ( - schemaChangeDir = flag.String("schema_change_dir", "", "directory contains schema changes for all keyspaces. Each keyspace has its own directory and schema changes are expected to live in '$KEYSPACE/input' dir. e.g. test_keyspace/input/*sql, each sql file represents a schema change") - schemaChangeController = flag.String("schema_change_controller", "", "schema change controller is responsible for finding schema changes and responding to schema change events") - schemaChangeCheckInterval = flag.Int("schema_change_check_interval", 60, "this value decides how often we check schema change dir, in seconds") - schemaChangeUser = flag.String("schema_change_user", "", "The user who submits this schema change.") - // for backwards compatibility - deprecatedTimeout = flag.Duration("schema_change_slave_timeout", wrangler.DefaultWaitReplicasTimeout, "DEPRECATED -- use -schema_change_replicas_timeout instead") + schemaChangeDir = flag.String("schema_change_dir", "", "directory contains schema changes for all keyspaces. Each keyspace has its own directory and schema changes are expected to live in '$KEYSPACE/input' dir. e.g. test_keyspace/input/*sql, each sql file represents a schema change") + schemaChangeController = flag.String("schema_change_controller", "", "schema change controller is responsible for finding schema changes and responding to schema change events") + schemaChangeCheckInterval = flag.Int("schema_change_check_interval", 60, "this value decides how often we check schema change dir, in seconds") + schemaChangeUser = flag.String("schema_change_user", "", "The user who submits this schema change.") schemaChangeReplicasTimeout = flag.Duration("schema_change_replicas_timeout", wrangler.DefaultWaitReplicasTimeout, "how long to wait for replicas to receive the schema change") ) @@ -48,9 +46,6 @@ func initSchema() { if *schemaChangeCheckInterval > 0 { interval = *schemaChangeCheckInterval } - if *deprecatedTimeout != 10*time.Second { - *schemaChangeReplicasTimeout = *deprecatedTimeout - } timer := timer.NewTimer(time.Duration(interval) * time.Second) controllerFactory, err := schemamanager.GetControllerFactory(*schemaChangeController) diff --git a/go/test/endtoend/reparent/reparent_test.go b/go/test/endtoend/reparent/reparent_test.go index e7dc254ca7c..c8f0719dbb9 100644 --- a/go/test/endtoend/reparent/reparent_test.go +++ b/go/test/endtoend/reparent/reparent_test.go @@ -374,8 +374,7 @@ func TestChangeTypeSemiSync(t *testing.T) { master, replica, rdonly1, rdonly2 := tab1, tab2, tab3, tab4 // Updated rdonly tablet and set tablet type to rdonly - // TODO: replace with ChangeTabletType once ChangeSlaveType is removed - err := clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", rdonly1.Alias, "rdonly") + err := clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", rdonly1.Alias, "rdonly") require.NoError(t, err) err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", rdonly2.Alias, "rdonly") require.NoError(t, err) diff --git a/go/test/endtoend/reparent/utils_test.go b/go/test/endtoend/reparent/utils_test.go index 039e17432ce..c29e481350c 100644 --- a/go/test/endtoend/reparent/utils_test.go +++ b/go/test/endtoend/reparent/utils_test.go @@ -384,8 +384,8 @@ func checkDBstatus(ctx context.Context, t *testing.T, tablet *cluster.Vttablet, func checkReplicaStatus(ctx context.Context, t *testing.T, tablet *cluster.Vttablet) { qr := runSQL(ctx, t, "show slave status", tablet) - IOThreadRunning := fmt.Sprintf("%v", qr.Rows[0][10]) // Slave_IO_Running - SQLThreadRunning := fmt.Sprintf("%v", qr.Rows[0][10]) // Slave_SQL_Running + IOThreadRunning := fmt.Sprintf("%v", qr.Rows[0][10]) + SQLThreadRunning := fmt.Sprintf("%v", qr.Rows[0][10]) assert.Equal(t, IOThreadRunning, "VARCHAR(\"No\")") assert.Equal(t, SQLThreadRunning, "VARCHAR(\"No\")") } diff --git a/go/test/endtoend/sharding/mergesharding/mergesharding_base.go b/go/test/endtoend/sharding/mergesharding/mergesharding_base.go index d521470866e..ed20617156e 100644 --- a/go/test/endtoend/sharding/mergesharding/mergesharding_base.go +++ b/go/test/endtoend/sharding/mergesharding/mergesharding_base.go @@ -319,9 +319,9 @@ func TestMergesharding(t *testing.T, useVarbinaryShardingKeyType bool) { require.NoError(t, err) // Change tablet, which was taken offline, back to rdonly. - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard0Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard0Rdonly.Alias, "rdonly") require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Rdonly.Alias, "rdonly") require.NoError(t, err) // Terminate worker daemon because it is no longer needed. @@ -391,9 +391,9 @@ func TestMergesharding(t *testing.T, useVarbinaryShardingKeyType bool) { shard3Ks) require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard0Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard0Rdonly.Alias, "rdonly") require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard3Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard3Rdonly.Alias, "rdonly") require.NoError(t, err) log.Debug("Running vtworker SplitDiff on second half") @@ -408,9 +408,9 @@ func TestMergesharding(t *testing.T, useVarbinaryShardingKeyType bool) { shard3Ks) require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Rdonly.Alias, "rdonly") require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard3Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard3Rdonly.Alias, "rdonly") require.NoError(t, err) sharding.CheckTabletQueryService(t, *shard3Master, "NOT_SERVING", false, *clusterInstance) diff --git a/go/test/endtoend/sharding/resharding/resharding_base.go b/go/test/endtoend/sharding/resharding/resharding_base.go index 18a784beb5c..d04e0834a79 100644 --- a/go/test/endtoend/sharding/resharding/resharding_base.go +++ b/go/test/endtoend/sharding/resharding/resharding_base.go @@ -372,7 +372,7 @@ func TestResharding(t *testing.T, useVarbinaryShardingKeyType bool) { sharding.CheckSrvKeyspace(t, cell1, keyspaceName, "", 0, expectedPartitions, *clusterInstance) // disable shard1Replica2, so we're sure filtered replication will go from shard1Replica1 - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Replica2.Alias, "spare") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Replica2.Alias, "spare") require.Nil(t, err) err = shard1Replica2.VttabletProcess.WaitForTabletType("NOT_SERVING") @@ -486,7 +486,7 @@ func TestResharding(t *testing.T, useVarbinaryShardingKeyType bool) { require.Nil(t, err) // Change tablet, which was taken offline, back to rdonly. - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Rdonly.Alias, "rdonly") require.Nil(t, err) // Terminate worker daemon because it is no longer needed. @@ -585,15 +585,15 @@ func TestResharding(t *testing.T, useVarbinaryShardingKeyType bool) { shard1Ks) require.Nil(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Rdonly.Alias, "rdonly") require.Nil(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard3Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard3Rdonly.Alias, "rdonly") require.Nil(t, err) // tests a failover switching serving to a different replica - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Replica2.Alias, "replica") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Replica2.Alias, "replica") require.Nil(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Replica1.Alias, "spare") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Replica1.Alias, "spare") require.Nil(t, err) err = shard1Replica2.VttabletProcess.WaitForTabletType("SERVING") @@ -791,9 +791,9 @@ func TestResharding(t *testing.T, useVarbinaryShardingKeyType bool) { shard1Ks) require.Nil(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard1Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard1Rdonly.Alias, "rdonly") require.Nil(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeSlaveType", shard3Rdonly.Alias, "rdonly") + err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", shard3Rdonly.Alias, "rdonly") require.Nil(t, err) // going to migrate the master now diff --git a/go/test/endtoend/tabletmanager/tablet_health_test.go b/go/test/endtoend/tabletmanager/tablet_health_test.go index 93289bcab6f..dda7958e26e 100644 --- a/go/test/endtoend/tabletmanager/tablet_health_test.go +++ b/go/test/endtoend/tabletmanager/tablet_health_test.go @@ -125,8 +125,7 @@ func TestHealthCheck(t *testing.T) { exec(t, masterConn, "stop slave") // stop replication, make sure we don't go unhealthy. - // TODO: replace with StopReplication once StopSlave has been removed - err = clusterInstance.VtctlclientProcess.ExecuteCommand("StopSlave", rTablet.Alias) + err = clusterInstance.VtctlclientProcess.ExecuteCommand("StopReplication", rTablet.Alias) require.NoError(t, err) err = clusterInstance.VtctlclientProcess.ExecuteCommand("RunHealthCheck", rTablet.Alias) require.NoError(t, err) @@ -237,7 +236,7 @@ func TestHealthCheckDrainedStateDoesNotShutdownQueryService(t *testing.T) { // Restart replication. Tablet will become healthy again. err = clusterInstance.VtctlclientProcess.ExecuteCommand("ChangeTabletType", rdonlyTablet.Alias, "rdonly") require.NoError(t, err) - err = clusterInstance.VtctlclientProcess.ExecuteCommand("StartSlave", rdonlyTablet.Alias) + err = clusterInstance.VtctlclientProcess.ExecuteCommand("StartReplication", rdonlyTablet.Alias) require.NoError(t, err) err = clusterInstance.VtctlclientProcess.ExecuteCommand("RunHealthCheck", rdonlyTablet.Alias) require.NoError(t, err) diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 5df50ab9dc0..75a2108d406 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -1383,9 +1383,6 @@ func (m *VEvent) GetJournal() *Journal { func (m *VEvent) GetDml() string { if m != nil { - if m.Statement != "" { - return m.Statement - } return m.Dml } return "" diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go index e6f519587a3..18d66d9896d 100644 --- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go +++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go @@ -3710,671 +3710,6 @@ func (m *RestoreFromBackupResponse) GetEvent() *logutil.Event { return nil } -// Deprecated -type SlaveStatusRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveStatusRequest) Reset() { *m = SlaveStatusRequest{} } -func (m *SlaveStatusRequest) String() string { return proto.CompactTextString(m) } -func (*SlaveStatusRequest) ProtoMessage() {} -func (*SlaveStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{92} -} - -func (m *SlaveStatusRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveStatusRequest.Unmarshal(m, b) -} -func (m *SlaveStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveStatusRequest.Marshal(b, m, deterministic) -} -func (m *SlaveStatusRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveStatusRequest.Merge(m, src) -} -func (m *SlaveStatusRequest) XXX_Size() int { - return xxx_messageInfo_SlaveStatusRequest.Size(m) -} -func (m *SlaveStatusRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveStatusRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveStatusRequest proto.InternalMessageInfo - -// Deprecated -type SlaveStatusResponse struct { - Status *replicationdata.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveStatusResponse) Reset() { *m = SlaveStatusResponse{} } -func (m *SlaveStatusResponse) String() string { return proto.CompactTextString(m) } -func (*SlaveStatusResponse) ProtoMessage() {} -func (*SlaveStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{93} -} - -func (m *SlaveStatusResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveStatusResponse.Unmarshal(m, b) -} -func (m *SlaveStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveStatusResponse.Marshal(b, m, deterministic) -} -func (m *SlaveStatusResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveStatusResponse.Merge(m, src) -} -func (m *SlaveStatusResponse) XXX_Size() int { - return xxx_messageInfo_SlaveStatusResponse.Size(m) -} -func (m *SlaveStatusResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveStatusResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveStatusResponse proto.InternalMessageInfo - -func (m *SlaveStatusResponse) GetStatus() *replicationdata.Status { - if m != nil { - return m.Status - } - return nil -} - -// Deprecated -type StopSlaveRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StopSlaveRequest) Reset() { *m = StopSlaveRequest{} } -func (m *StopSlaveRequest) String() string { return proto.CompactTextString(m) } -func (*StopSlaveRequest) ProtoMessage() {} -func (*StopSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{94} -} - -func (m *StopSlaveRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StopSlaveRequest.Unmarshal(m, b) -} -func (m *StopSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StopSlaveRequest.Marshal(b, m, deterministic) -} -func (m *StopSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveRequest.Merge(m, src) -} -func (m *StopSlaveRequest) XXX_Size() int { - return xxx_messageInfo_StopSlaveRequest.Size(m) -} -func (m *StopSlaveRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StopSlaveRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StopSlaveRequest proto.InternalMessageInfo - -// Deprecated -type StopSlaveResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StopSlaveResponse) Reset() { *m = StopSlaveResponse{} } -func (m *StopSlaveResponse) String() string { return proto.CompactTextString(m) } -func (*StopSlaveResponse) ProtoMessage() {} -func (*StopSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{95} -} - -func (m *StopSlaveResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StopSlaveResponse.Unmarshal(m, b) -} -func (m *StopSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StopSlaveResponse.Marshal(b, m, deterministic) -} -func (m *StopSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveResponse.Merge(m, src) -} -func (m *StopSlaveResponse) XXX_Size() int { - return xxx_messageInfo_StopSlaveResponse.Size(m) -} -func (m *StopSlaveResponse) XXX_DiscardUnknown() { - xxx_messageInfo_StopSlaveResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_StopSlaveResponse proto.InternalMessageInfo - -// Deprecated -type StopSlaveMinimumRequest struct { - Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"` - WaitTimeout int64 `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StopSlaveMinimumRequest) Reset() { *m = StopSlaveMinimumRequest{} } -func (m *StopSlaveMinimumRequest) String() string { return proto.CompactTextString(m) } -func (*StopSlaveMinimumRequest) ProtoMessage() {} -func (*StopSlaveMinimumRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{96} -} - -func (m *StopSlaveMinimumRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StopSlaveMinimumRequest.Unmarshal(m, b) -} -func (m *StopSlaveMinimumRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StopSlaveMinimumRequest.Marshal(b, m, deterministic) -} -func (m *StopSlaveMinimumRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveMinimumRequest.Merge(m, src) -} -func (m *StopSlaveMinimumRequest) XXX_Size() int { - return xxx_messageInfo_StopSlaveMinimumRequest.Size(m) -} -func (m *StopSlaveMinimumRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StopSlaveMinimumRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StopSlaveMinimumRequest proto.InternalMessageInfo - -func (m *StopSlaveMinimumRequest) GetPosition() string { - if m != nil { - return m.Position - } - return "" -} - -func (m *StopSlaveMinimumRequest) GetWaitTimeout() int64 { - if m != nil { - return m.WaitTimeout - } - return 0 -} - -// Deprecated -type StopSlaveMinimumResponse struct { - Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StopSlaveMinimumResponse) Reset() { *m = StopSlaveMinimumResponse{} } -func (m *StopSlaveMinimumResponse) String() string { return proto.CompactTextString(m) } -func (*StopSlaveMinimumResponse) ProtoMessage() {} -func (*StopSlaveMinimumResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{97} -} - -func (m *StopSlaveMinimumResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StopSlaveMinimumResponse.Unmarshal(m, b) -} -func (m *StopSlaveMinimumResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StopSlaveMinimumResponse.Marshal(b, m, deterministic) -} -func (m *StopSlaveMinimumResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveMinimumResponse.Merge(m, src) -} -func (m *StopSlaveMinimumResponse) XXX_Size() int { - return xxx_messageInfo_StopSlaveMinimumResponse.Size(m) -} -func (m *StopSlaveMinimumResponse) XXX_DiscardUnknown() { - xxx_messageInfo_StopSlaveMinimumResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_StopSlaveMinimumResponse proto.InternalMessageInfo - -func (m *StopSlaveMinimumResponse) GetPosition() string { - if m != nil { - return m.Position - } - return "" -} - -// Deprecated -type StartSlaveRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StartSlaveRequest) Reset() { *m = StartSlaveRequest{} } -func (m *StartSlaveRequest) String() string { return proto.CompactTextString(m) } -func (*StartSlaveRequest) ProtoMessage() {} -func (*StartSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{98} -} - -func (m *StartSlaveRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StartSlaveRequest.Unmarshal(m, b) -} -func (m *StartSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StartSlaveRequest.Marshal(b, m, deterministic) -} -func (m *StartSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveRequest.Merge(m, src) -} -func (m *StartSlaveRequest) XXX_Size() int { - return xxx_messageInfo_StartSlaveRequest.Size(m) -} -func (m *StartSlaveRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StartSlaveRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StartSlaveRequest proto.InternalMessageInfo - -// Deprecated -type StartSlaveResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StartSlaveResponse) Reset() { *m = StartSlaveResponse{} } -func (m *StartSlaveResponse) String() string { return proto.CompactTextString(m) } -func (*StartSlaveResponse) ProtoMessage() {} -func (*StartSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{99} -} - -func (m *StartSlaveResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StartSlaveResponse.Unmarshal(m, b) -} -func (m *StartSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StartSlaveResponse.Marshal(b, m, deterministic) -} -func (m *StartSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveResponse.Merge(m, src) -} -func (m *StartSlaveResponse) XXX_Size() int { - return xxx_messageInfo_StartSlaveResponse.Size(m) -} -func (m *StartSlaveResponse) XXX_DiscardUnknown() { - xxx_messageInfo_StartSlaveResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_StartSlaveResponse proto.InternalMessageInfo - -// Deprecated -type StartSlaveUntilAfterRequest struct { - Position string `protobuf:"bytes,1,opt,name=position,proto3" json:"position,omitempty"` - WaitTimeout int64 `protobuf:"varint,2,opt,name=wait_timeout,json=waitTimeout,proto3" json:"wait_timeout,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StartSlaveUntilAfterRequest) Reset() { *m = StartSlaveUntilAfterRequest{} } -func (m *StartSlaveUntilAfterRequest) String() string { return proto.CompactTextString(m) } -func (*StartSlaveUntilAfterRequest) ProtoMessage() {} -func (*StartSlaveUntilAfterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{100} -} - -func (m *StartSlaveUntilAfterRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StartSlaveUntilAfterRequest.Unmarshal(m, b) -} -func (m *StartSlaveUntilAfterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StartSlaveUntilAfterRequest.Marshal(b, m, deterministic) -} -func (m *StartSlaveUntilAfterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveUntilAfterRequest.Merge(m, src) -} -func (m *StartSlaveUntilAfterRequest) XXX_Size() int { - return xxx_messageInfo_StartSlaveUntilAfterRequest.Size(m) -} -func (m *StartSlaveUntilAfterRequest) XXX_DiscardUnknown() { - xxx_messageInfo_StartSlaveUntilAfterRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_StartSlaveUntilAfterRequest proto.InternalMessageInfo - -func (m *StartSlaveUntilAfterRequest) GetPosition() string { - if m != nil { - return m.Position - } - return "" -} - -func (m *StartSlaveUntilAfterRequest) GetWaitTimeout() int64 { - if m != nil { - return m.WaitTimeout - } - return 0 -} - -// Deprecated -type StartSlaveUntilAfterResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *StartSlaveUntilAfterResponse) Reset() { *m = StartSlaveUntilAfterResponse{} } -func (m *StartSlaveUntilAfterResponse) String() string { return proto.CompactTextString(m) } -func (*StartSlaveUntilAfterResponse) ProtoMessage() {} -func (*StartSlaveUntilAfterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{101} -} - -func (m *StartSlaveUntilAfterResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_StartSlaveUntilAfterResponse.Unmarshal(m, b) -} -func (m *StartSlaveUntilAfterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_StartSlaveUntilAfterResponse.Marshal(b, m, deterministic) -} -func (m *StartSlaveUntilAfterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveUntilAfterResponse.Merge(m, src) -} -func (m *StartSlaveUntilAfterResponse) XXX_Size() int { - return xxx_messageInfo_StartSlaveUntilAfterResponse.Size(m) -} -func (m *StartSlaveUntilAfterResponse) XXX_DiscardUnknown() { - xxx_messageInfo_StartSlaveUntilAfterResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_StartSlaveUntilAfterResponse proto.InternalMessageInfo - -// Deprecated -type GetSlavesRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetSlavesRequest) Reset() { *m = GetSlavesRequest{} } -func (m *GetSlavesRequest) String() string { return proto.CompactTextString(m) } -func (*GetSlavesRequest) ProtoMessage() {} -func (*GetSlavesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{102} -} - -func (m *GetSlavesRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetSlavesRequest.Unmarshal(m, b) -} -func (m *GetSlavesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetSlavesRequest.Marshal(b, m, deterministic) -} -func (m *GetSlavesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSlavesRequest.Merge(m, src) -} -func (m *GetSlavesRequest) XXX_Size() int { - return xxx_messageInfo_GetSlavesRequest.Size(m) -} -func (m *GetSlavesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetSlavesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_GetSlavesRequest proto.InternalMessageInfo - -// Deprecated -type GetSlavesResponse struct { - Addrs []string `protobuf:"bytes,1,rep,name=addrs,proto3" json:"addrs,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *GetSlavesResponse) Reset() { *m = GetSlavesResponse{} } -func (m *GetSlavesResponse) String() string { return proto.CompactTextString(m) } -func (*GetSlavesResponse) ProtoMessage() {} -func (*GetSlavesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{103} -} - -func (m *GetSlavesResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetSlavesResponse.Unmarshal(m, b) -} -func (m *GetSlavesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetSlavesResponse.Marshal(b, m, deterministic) -} -func (m *GetSlavesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSlavesResponse.Merge(m, src) -} -func (m *GetSlavesResponse) XXX_Size() int { - return xxx_messageInfo_GetSlavesResponse.Size(m) -} -func (m *GetSlavesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetSlavesResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_GetSlavesResponse proto.InternalMessageInfo - -func (m *GetSlavesResponse) GetAddrs() []string { - if m != nil { - return m.Addrs - } - return nil -} - -// Deprecated -type InitSlaveRequest struct { - Parent *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` - ReplicationPosition string `protobuf:"bytes,2,opt,name=replication_position,json=replicationPosition,proto3" json:"replication_position,omitempty"` - TimeCreatedNs int64 `protobuf:"varint,3,opt,name=time_created_ns,json=timeCreatedNs,proto3" json:"time_created_ns,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *InitSlaveRequest) Reset() { *m = InitSlaveRequest{} } -func (m *InitSlaveRequest) String() string { return proto.CompactTextString(m) } -func (*InitSlaveRequest) ProtoMessage() {} -func (*InitSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{104} -} - -func (m *InitSlaveRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_InitSlaveRequest.Unmarshal(m, b) -} -func (m *InitSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_InitSlaveRequest.Marshal(b, m, deterministic) -} -func (m *InitSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitSlaveRequest.Merge(m, src) -} -func (m *InitSlaveRequest) XXX_Size() int { - return xxx_messageInfo_InitSlaveRequest.Size(m) -} -func (m *InitSlaveRequest) XXX_DiscardUnknown() { - xxx_messageInfo_InitSlaveRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_InitSlaveRequest proto.InternalMessageInfo - -func (m *InitSlaveRequest) GetParent() *topodata.TabletAlias { - if m != nil { - return m.Parent - } - return nil -} - -func (m *InitSlaveRequest) GetReplicationPosition() string { - if m != nil { - return m.ReplicationPosition - } - return "" -} - -func (m *InitSlaveRequest) GetTimeCreatedNs() int64 { - if m != nil { - return m.TimeCreatedNs - } - return 0 -} - -// Deprecated -type InitSlaveResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *InitSlaveResponse) Reset() { *m = InitSlaveResponse{} } -func (m *InitSlaveResponse) String() string { return proto.CompactTextString(m) } -func (*InitSlaveResponse) ProtoMessage() {} -func (*InitSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{105} -} - -func (m *InitSlaveResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_InitSlaveResponse.Unmarshal(m, b) -} -func (m *InitSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_InitSlaveResponse.Marshal(b, m, deterministic) -} -func (m *InitSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitSlaveResponse.Merge(m, src) -} -func (m *InitSlaveResponse) XXX_Size() int { - return xxx_messageInfo_InitSlaveResponse.Size(m) -} -func (m *InitSlaveResponse) XXX_DiscardUnknown() { - xxx_messageInfo_InitSlaveResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_InitSlaveResponse proto.InternalMessageInfo - -// Deprecated -type SlaveWasPromotedRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveWasPromotedRequest) Reset() { *m = SlaveWasPromotedRequest{} } -func (m *SlaveWasPromotedRequest) String() string { return proto.CompactTextString(m) } -func (*SlaveWasPromotedRequest) ProtoMessage() {} -func (*SlaveWasPromotedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{106} -} - -func (m *SlaveWasPromotedRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveWasPromotedRequest.Unmarshal(m, b) -} -func (m *SlaveWasPromotedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveWasPromotedRequest.Marshal(b, m, deterministic) -} -func (m *SlaveWasPromotedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasPromotedRequest.Merge(m, src) -} -func (m *SlaveWasPromotedRequest) XXX_Size() int { - return xxx_messageInfo_SlaveWasPromotedRequest.Size(m) -} -func (m *SlaveWasPromotedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveWasPromotedRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveWasPromotedRequest proto.InternalMessageInfo - -// Deprecated -type SlaveWasPromotedResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveWasPromotedResponse) Reset() { *m = SlaveWasPromotedResponse{} } -func (m *SlaveWasPromotedResponse) String() string { return proto.CompactTextString(m) } -func (*SlaveWasPromotedResponse) ProtoMessage() {} -func (*SlaveWasPromotedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{107} -} - -func (m *SlaveWasPromotedResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveWasPromotedResponse.Unmarshal(m, b) -} -func (m *SlaveWasPromotedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveWasPromotedResponse.Marshal(b, m, deterministic) -} -func (m *SlaveWasPromotedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasPromotedResponse.Merge(m, src) -} -func (m *SlaveWasPromotedResponse) XXX_Size() int { - return xxx_messageInfo_SlaveWasPromotedResponse.Size(m) -} -func (m *SlaveWasPromotedResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveWasPromotedResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveWasPromotedResponse proto.InternalMessageInfo - -// Deprecated -type SlaveWasRestartedRequest struct { - // the parent alias the tablet should have - Parent *topodata.TabletAlias `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveWasRestartedRequest) Reset() { *m = SlaveWasRestartedRequest{} } -func (m *SlaveWasRestartedRequest) String() string { return proto.CompactTextString(m) } -func (*SlaveWasRestartedRequest) ProtoMessage() {} -func (*SlaveWasRestartedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{108} -} - -func (m *SlaveWasRestartedRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveWasRestartedRequest.Unmarshal(m, b) -} -func (m *SlaveWasRestartedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveWasRestartedRequest.Marshal(b, m, deterministic) -} -func (m *SlaveWasRestartedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasRestartedRequest.Merge(m, src) -} -func (m *SlaveWasRestartedRequest) XXX_Size() int { - return xxx_messageInfo_SlaveWasRestartedRequest.Size(m) -} -func (m *SlaveWasRestartedRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveWasRestartedRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveWasRestartedRequest proto.InternalMessageInfo - -func (m *SlaveWasRestartedRequest) GetParent() *topodata.TabletAlias { - if m != nil { - return m.Parent - } - return nil -} - -// Deprecated -type SlaveWasRestartedResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SlaveWasRestartedResponse) Reset() { *m = SlaveWasRestartedResponse{} } -func (m *SlaveWasRestartedResponse) String() string { return proto.CompactTextString(m) } -func (*SlaveWasRestartedResponse) ProtoMessage() {} -func (*SlaveWasRestartedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{109} -} - -func (m *SlaveWasRestartedResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SlaveWasRestartedResponse.Unmarshal(m, b) -} -func (m *SlaveWasRestartedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SlaveWasRestartedResponse.Marshal(b, m, deterministic) -} -func (m *SlaveWasRestartedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasRestartedResponse.Merge(m, src) -} -func (m *SlaveWasRestartedResponse) XXX_Size() int { - return xxx_messageInfo_SlaveWasRestartedResponse.Size(m) -} -func (m *SlaveWasRestartedResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SlaveWasRestartedResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_SlaveWasRestartedResponse proto.InternalMessageInfo - type VExecRequest struct { Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` Workflow string `protobuf:"bytes,2,opt,name=workflow,proto3" json:"workflow,omitempty"` @@ -4388,7 +3723,7 @@ func (m *VExecRequest) Reset() { *m = VExecRequest{} } func (m *VExecRequest) String() string { return proto.CompactTextString(m) } func (*VExecRequest) ProtoMessage() {} func (*VExecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{110} + return fileDescriptor_ff9ac4f89e61ffa4, []int{92} } func (m *VExecRequest) XXX_Unmarshal(b []byte) error { @@ -4441,7 +3776,7 @@ func (m *VExecResponse) Reset() { *m = VExecResponse{} } func (m *VExecResponse) String() string { return proto.CompactTextString(m) } func (*VExecResponse) ProtoMessage() {} func (*VExecResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9ac4f89e61ffa4, []int{111} + return fileDescriptor_ff9ac4f89e61ffa4, []int{93} } func (m *VExecResponse) XXX_Unmarshal(b []byte) error { @@ -4565,24 +3900,6 @@ func init() { proto.RegisterType((*BackupResponse)(nil), "tabletmanagerdata.BackupResponse") proto.RegisterType((*RestoreFromBackupRequest)(nil), "tabletmanagerdata.RestoreFromBackupRequest") proto.RegisterType((*RestoreFromBackupResponse)(nil), "tabletmanagerdata.RestoreFromBackupResponse") - proto.RegisterType((*SlaveStatusRequest)(nil), "tabletmanagerdata.SlaveStatusRequest") - proto.RegisterType((*SlaveStatusResponse)(nil), "tabletmanagerdata.SlaveStatusResponse") - proto.RegisterType((*StopSlaveRequest)(nil), "tabletmanagerdata.StopSlaveRequest") - proto.RegisterType((*StopSlaveResponse)(nil), "tabletmanagerdata.StopSlaveResponse") - proto.RegisterType((*StopSlaveMinimumRequest)(nil), "tabletmanagerdata.StopSlaveMinimumRequest") - proto.RegisterType((*StopSlaveMinimumResponse)(nil), "tabletmanagerdata.StopSlaveMinimumResponse") - proto.RegisterType((*StartSlaveRequest)(nil), "tabletmanagerdata.StartSlaveRequest") - proto.RegisterType((*StartSlaveResponse)(nil), "tabletmanagerdata.StartSlaveResponse") - proto.RegisterType((*StartSlaveUntilAfterRequest)(nil), "tabletmanagerdata.StartSlaveUntilAfterRequest") - proto.RegisterType((*StartSlaveUntilAfterResponse)(nil), "tabletmanagerdata.StartSlaveUntilAfterResponse") - proto.RegisterType((*GetSlavesRequest)(nil), "tabletmanagerdata.GetSlavesRequest") - proto.RegisterType((*GetSlavesResponse)(nil), "tabletmanagerdata.GetSlavesResponse") - proto.RegisterType((*InitSlaveRequest)(nil), "tabletmanagerdata.InitSlaveRequest") - proto.RegisterType((*InitSlaveResponse)(nil), "tabletmanagerdata.InitSlaveResponse") - proto.RegisterType((*SlaveWasPromotedRequest)(nil), "tabletmanagerdata.SlaveWasPromotedRequest") - proto.RegisterType((*SlaveWasPromotedResponse)(nil), "tabletmanagerdata.SlaveWasPromotedResponse") - proto.RegisterType((*SlaveWasRestartedRequest)(nil), "tabletmanagerdata.SlaveWasRestartedRequest") - proto.RegisterType((*SlaveWasRestartedResponse)(nil), "tabletmanagerdata.SlaveWasRestartedResponse") proto.RegisterType((*VExecRequest)(nil), "tabletmanagerdata.VExecRequest") proto.RegisterType((*VExecResponse)(nil), "tabletmanagerdata.VExecResponse") } @@ -4590,150 +3907,142 @@ func init() { func init() { proto.RegisterFile("tabletmanagerdata.proto", fileDescriptor_ff9ac4f89e61ffa4) } var fileDescriptor_ff9ac4f89e61ffa4 = []byte{ - // 2316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xdd, 0x72, 0xdb, 0xc6, - 0xf5, 0x1f, 0x52, 0x1f, 0x96, 0x0e, 0x3f, 0x44, 0x81, 0x94, 0x48, 0x51, 0xb1, 0x2c, 0xc3, 0x4e, - 0xe2, 0x7f, 0x32, 0x7f, 0x2a, 0x91, 0x13, 0x4f, 0x26, 0x69, 0x3b, 0x95, 0x6d, 0xc9, 0x76, 0x2c, - 0xc7, 0x0a, 0xe4, 0x8f, 0x4c, 0xa6, 0x53, 0x0c, 0x48, 0xac, 0x28, 0x8c, 0x40, 0x2c, 0xbc, 0xbb, - 0xa4, 0xc4, 0x9b, 0x3e, 0x42, 0xfb, 0x02, 0x9d, 0xde, 0x74, 0xa6, 0xbd, 0xef, 0x43, 0xf4, 0x11, - 0xd2, 0x47, 0xe9, 0x45, 0x2f, 0xda, 0xd9, 0xdd, 0x03, 0x10, 0x20, 0x20, 0x59, 0x56, 0xdd, 0x99, - 0xdc, 0x68, 0xb0, 0xbf, 0xb3, 0xe7, 0x73, 0xcf, 0x9e, 0x73, 0x96, 0x82, 0xa6, 0x70, 0xba, 0x3e, - 0x11, 0x03, 0x27, 0x70, 0xfa, 0x84, 0xb9, 0x8e, 0x70, 0x3a, 0x21, 0xa3, 0x82, 0x1a, 0xcb, 0x19, - 0x42, 0xbb, 0xf4, 0x66, 0x48, 0xd8, 0x58, 0xd3, 0xdb, 0x55, 0x41, 0x43, 0x3a, 0xd9, 0xdf, 0x5e, - 0x61, 0x24, 0xf4, 0xbd, 0x9e, 0x23, 0x3c, 0x1a, 0x24, 0xe0, 0x8a, 0x4f, 0xfb, 0x43, 0xe1, 0xf9, - 0x7a, 0x69, 0xfe, 0xbb, 0x00, 0x4b, 0x2f, 0xa4, 0xe0, 0x87, 0xe4, 0xc8, 0x0b, 0x3c, 0xb9, 0xd9, - 0x30, 0x60, 0x36, 0x70, 0x06, 0xa4, 0x55, 0xd8, 0x2c, 0xdc, 0x59, 0xb4, 0xd4, 0xb7, 0xb1, 0x0a, - 0xf3, 0xbc, 0x77, 0x4c, 0x06, 0x4e, 0xab, 0xa8, 0x50, 0x5c, 0x19, 0x2d, 0xb8, 0xd6, 0xa3, 0xfe, - 0x70, 0x10, 0xf0, 0xd6, 0xcc, 0xe6, 0xcc, 0x9d, 0x45, 0x2b, 0x5a, 0x1a, 0x1d, 0xa8, 0x87, 0xcc, - 0x1b, 0x38, 0x6c, 0x6c, 0x9f, 0x90, 0xb1, 0x1d, 0xed, 0x9a, 0x55, 0xbb, 0x96, 0x91, 0xf4, 0x94, - 0x8c, 0x1f, 0xe0, 0x7e, 0x03, 0x66, 0xc5, 0x38, 0x24, 0xad, 0x39, 0xad, 0x55, 0x7e, 0x1b, 0x37, - 0xa0, 0x24, 0x4d, 0xb7, 0x7d, 0x12, 0xf4, 0xc5, 0x71, 0x6b, 0x7e, 0xb3, 0x70, 0x67, 0xd6, 0x02, - 0x09, 0xed, 0x2b, 0xc4, 0x58, 0x87, 0x45, 0x46, 0x4f, 0xed, 0x1e, 0x1d, 0x06, 0xa2, 0x75, 0x4d, - 0x91, 0x17, 0x18, 0x3d, 0x7d, 0x20, 0xd7, 0xc6, 0x6d, 0x98, 0x3f, 0xf2, 0x88, 0xef, 0xf2, 0xd6, - 0xc2, 0xe6, 0xcc, 0x9d, 0xd2, 0x76, 0xb9, 0xa3, 0xe3, 0xb5, 0x27, 0x41, 0x0b, 0x69, 0xe6, 0x5f, - 0x0a, 0x50, 0x3b, 0x54, 0xce, 0x24, 0x42, 0xf0, 0x31, 0x2c, 0x49, 0x2d, 0x5d, 0x87, 0x13, 0x1b, - 0xfd, 0xd6, 0xd1, 0xa8, 0x46, 0xb0, 0x66, 0x31, 0x9e, 0x83, 0x3e, 0x17, 0xdb, 0x8d, 0x99, 0x79, - 0xab, 0xa8, 0xd4, 0x99, 0x9d, 0xec, 0x51, 0x4e, 0x85, 0xda, 0xaa, 0x89, 0x34, 0xc0, 0x65, 0x40, - 0x47, 0x84, 0x71, 0x8f, 0x06, 0xad, 0x19, 0xa5, 0x31, 0x5a, 0x4a, 0x43, 0x0d, 0xad, 0xf5, 0xc1, - 0xb1, 0x13, 0xf4, 0x89, 0x45, 0xf8, 0xd0, 0x17, 0xc6, 0x63, 0xa8, 0x74, 0xc9, 0x11, 0x65, 0x29, - 0x43, 0x4b, 0xdb, 0xb7, 0x72, 0xb4, 0x4f, 0xbb, 0x69, 0x95, 0x35, 0x27, 0xfa, 0xb2, 0x07, 0x65, - 0xe7, 0x48, 0x10, 0x66, 0x27, 0x4e, 0xfa, 0x92, 0x82, 0x4a, 0x8a, 0x51, 0xc3, 0xe6, 0x3f, 0x0b, - 0x50, 0x7d, 0xc9, 0x09, 0x3b, 0x20, 0x6c, 0xe0, 0x71, 0x8e, 0x29, 0x75, 0x4c, 0xb9, 0x88, 0x52, - 0x4a, 0x7e, 0x4b, 0x6c, 0xc8, 0x09, 0xc3, 0x84, 0x52, 0xdf, 0xc6, 0xa7, 0xb0, 0x1c, 0x3a, 0x9c, - 0x9f, 0x52, 0xe6, 0xda, 0xbd, 0x63, 0xd2, 0x3b, 0xe1, 0xc3, 0x81, 0x8a, 0xc3, 0xac, 0x55, 0x8b, - 0x08, 0x0f, 0x10, 0x37, 0xbe, 0x07, 0x08, 0x99, 0x37, 0xf2, 0x7c, 0xd2, 0x27, 0x3a, 0xb1, 0x4a, - 0xdb, 0x9f, 0xe7, 0x58, 0x9b, 0xb6, 0xa5, 0x73, 0x10, 0xf3, 0xec, 0x06, 0x82, 0x8d, 0xad, 0x84, - 0x90, 0xf6, 0x2f, 0x61, 0x69, 0x8a, 0x6c, 0xd4, 0x60, 0xe6, 0x84, 0x8c, 0xd1, 0x72, 0xf9, 0x69, - 0x34, 0x60, 0x6e, 0xe4, 0xf8, 0x43, 0x82, 0x96, 0xeb, 0xc5, 0xd7, 0xc5, 0xaf, 0x0a, 0xe6, 0x4f, - 0x05, 0x28, 0x3f, 0xec, 0xbe, 0xc5, 0xef, 0x2a, 0x14, 0xdd, 0x2e, 0xf2, 0x16, 0xdd, 0x6e, 0x1c, - 0x87, 0x99, 0x44, 0x1c, 0x9e, 0xe7, 0xb8, 0xb6, 0x95, 0xe3, 0x5a, 0x52, 0xd9, 0xff, 0xd2, 0xb1, - 0x3f, 0x17, 0xa0, 0x34, 0xd1, 0xc4, 0x8d, 0x7d, 0xa8, 0x49, 0x3b, 0xed, 0x70, 0x82, 0xb5, 0x0a, - 0xca, 0xca, 0x9b, 0x6f, 0x3d, 0x00, 0x6b, 0x69, 0x98, 0x5a, 0x73, 0x63, 0x0f, 0xaa, 0x6e, 0x37, - 0x25, 0x4b, 0xdf, 0xa0, 0x1b, 0x6f, 0xf1, 0xd8, 0xaa, 0xb8, 0x89, 0x15, 0x37, 0x3f, 0x86, 0xd2, - 0x81, 0x17, 0xf4, 0x2d, 0xf2, 0x66, 0x48, 0xb8, 0x90, 0x57, 0x29, 0x74, 0xc6, 0x3e, 0x75, 0x5c, - 0x74, 0x32, 0x5a, 0x9a, 0x77, 0xa0, 0xac, 0x37, 0xf2, 0x90, 0x06, 0x9c, 0x5c, 0xb0, 0xf3, 0x13, - 0x28, 0x1f, 0xfa, 0x84, 0x84, 0x91, 0xcc, 0x36, 0x2c, 0xb8, 0x43, 0xa6, 0x8a, 0xaa, 0xda, 0x3a, - 0x63, 0xc5, 0x6b, 0x73, 0x09, 0x2a, 0xb8, 0x57, 0x8b, 0x35, 0xff, 0x51, 0x00, 0x63, 0xf7, 0x8c, - 0xf4, 0x86, 0x82, 0x3c, 0xa6, 0xf4, 0x24, 0x92, 0x91, 0x57, 0x5f, 0x37, 0x00, 0x42, 0x87, 0x39, - 0x03, 0x22, 0x08, 0xd3, 0xee, 0x2f, 0x5a, 0x09, 0xc4, 0x38, 0x80, 0x45, 0x72, 0x26, 0x98, 0x63, - 0x93, 0x60, 0xa4, 0x2a, 0x6d, 0x69, 0xfb, 0x6e, 0x4e, 0x74, 0xb2, 0xda, 0x3a, 0xbb, 0x92, 0x6d, - 0x37, 0x18, 0xe9, 0x9c, 0x58, 0x20, 0xb8, 0x6c, 0x7f, 0x03, 0x95, 0x14, 0xe9, 0x9d, 0xf2, 0xe1, - 0x08, 0xea, 0x29, 0x55, 0x18, 0xc7, 0x1b, 0x50, 0x22, 0x67, 0x9e, 0xb0, 0xb9, 0x70, 0xc4, 0x90, - 0x63, 0x80, 0x40, 0x42, 0x87, 0x0a, 0x51, 0x6d, 0x44, 0xb8, 0x74, 0x28, 0xe2, 0x36, 0xa2, 0x56, - 0x88, 0x13, 0x16, 0xdd, 0x02, 0x5c, 0x99, 0x23, 0xa8, 0x3d, 0x22, 0x42, 0xd7, 0x95, 0x28, 0x7c, - 0xab, 0x30, 0xaf, 0x1c, 0xd7, 0x19, 0xb7, 0x68, 0xe1, 0xca, 0xb8, 0x05, 0x15, 0x2f, 0xe8, 0xf9, - 0x43, 0x97, 0xd8, 0x23, 0x8f, 0x9c, 0x72, 0xa5, 0x62, 0xc1, 0x2a, 0x23, 0xf8, 0x4a, 0x62, 0xc6, - 0x87, 0x50, 0x25, 0x67, 0x7a, 0x13, 0x0a, 0xd1, 0x6d, 0xab, 0x82, 0xa8, 0x2a, 0xd0, 0xdc, 0x24, - 0xb0, 0x9c, 0xd0, 0x8b, 0xde, 0x1d, 0xc0, 0xb2, 0xae, 0x8c, 0x89, 0x62, 0xff, 0x2e, 0xd5, 0xb6, - 0xc6, 0xa7, 0x10, 0xb3, 0x09, 0x2b, 0x8f, 0x88, 0x48, 0xa4, 0x30, 0xfa, 0x68, 0xfe, 0x08, 0xab, - 0xd3, 0x04, 0x34, 0xe2, 0xd7, 0x50, 0x4a, 0x5f, 0x3a, 0xa9, 0x7e, 0x23, 0x47, 0x7d, 0x92, 0x39, - 0xc9, 0x62, 0x36, 0xc0, 0x38, 0x24, 0xc2, 0x22, 0x8e, 0xfb, 0x3c, 0xf0, 0xc7, 0x91, 0xc6, 0x15, - 0xa8, 0xa7, 0x50, 0x4c, 0xe1, 0x09, 0xfc, 0x9a, 0x79, 0x82, 0x44, 0xbb, 0x57, 0xa1, 0x91, 0x86, - 0x71, 0xfb, 0xb7, 0xb0, 0xac, 0x9b, 0xd3, 0x8b, 0x71, 0x18, 0x6d, 0x36, 0xbe, 0x84, 0x92, 0x36, - 0xcf, 0x56, 0x0d, 0x5e, 0x9a, 0x5c, 0xdd, 0x6e, 0x74, 0xe2, 0x79, 0x45, 0xc5, 0x5c, 0x28, 0x0e, - 0x10, 0xf1, 0xb7, 0xb4, 0x33, 0x29, 0x6b, 0x62, 0x90, 0x45, 0x8e, 0x18, 0xe1, 0xc7, 0x32, 0xa5, - 0x92, 0x06, 0xa5, 0x61, 0xdc, 0xde, 0x84, 0x15, 0x6b, 0x18, 0x3c, 0x26, 0x8e, 0x2f, 0x8e, 0x55, - 0xe3, 0x88, 0x18, 0x5a, 0xb0, 0x3a, 0x4d, 0x40, 0x96, 0x2f, 0xa0, 0xf5, 0xa4, 0x1f, 0x50, 0x46, - 0x34, 0x71, 0x97, 0x31, 0xca, 0x52, 0x25, 0x45, 0x08, 0xc2, 0x82, 0x49, 0xa1, 0x50, 0x4b, 0x73, - 0x1d, 0xd6, 0x72, 0xb8, 0x50, 0xe4, 0xd7, 0xd2, 0x68, 0x59, 0x4f, 0xd2, 0x99, 0x7c, 0x0b, 0x2a, - 0xa7, 0x8e, 0x27, 0xec, 0x90, 0xf2, 0x49, 0x32, 0x2d, 0x5a, 0x65, 0x09, 0x1e, 0x20, 0xa6, 0x3d, - 0x4b, 0xf2, 0xa2, 0xcc, 0x6d, 0x58, 0x3d, 0x60, 0xe4, 0xc8, 0xf7, 0xfa, 0xc7, 0x53, 0x17, 0x44, - 0xce, 0x64, 0x2a, 0x70, 0xd1, 0x0d, 0x89, 0x96, 0x66, 0x1f, 0x9a, 0x19, 0x1e, 0xcc, 0xab, 0x7d, - 0xa8, 0xea, 0x5d, 0x36, 0x53, 0x73, 0x45, 0x54, 0xcf, 0x3f, 0x3c, 0x37, 0xb3, 0x93, 0x53, 0x88, - 0x55, 0xe9, 0x25, 0x56, 0xdc, 0xfc, 0x57, 0x01, 0x8c, 0x9d, 0x30, 0xf4, 0xc7, 0x69, 0xcb, 0x6a, - 0x30, 0xc3, 0xdf, 0xf8, 0x51, 0x89, 0xe1, 0x6f, 0x7c, 0x59, 0x62, 0x8e, 0x28, 0xeb, 0x11, 0xbc, - 0xac, 0x7a, 0x21, 0xc7, 0x00, 0xc7, 0xf7, 0xe9, 0xa9, 0x9d, 0x98, 0x61, 0x55, 0x65, 0x58, 0xb0, - 0x6a, 0x8a, 0x60, 0x4d, 0xf0, 0xec, 0x00, 0x34, 0xfb, 0xbe, 0x06, 0xa0, 0xb9, 0x2b, 0x0e, 0x40, - 0x7f, 0x2d, 0x40, 0x3d, 0xe5, 0x3d, 0xc6, 0xf8, 0xe7, 0x37, 0xaa, 0xd5, 0x61, 0x79, 0x9f, 0xf6, - 0x4e, 0x74, 0xd5, 0x8b, 0xae, 0x46, 0x03, 0x8c, 0x24, 0x38, 0xb9, 0x78, 0x2f, 0x03, 0x3f, 0xb3, - 0x79, 0x15, 0x1a, 0x69, 0x18, 0xb7, 0xff, 0xad, 0x00, 0x2d, 0x6c, 0x11, 0x7b, 0x44, 0xf4, 0x8e, - 0x77, 0xf8, 0xc3, 0x6e, 0x9c, 0x07, 0x0d, 0x98, 0x53, 0xa3, 0xb8, 0x0a, 0x40, 0xd9, 0xd2, 0x0b, - 0xa3, 0x09, 0xd7, 0xdc, 0xae, 0xad, 0x5a, 0x23, 0x76, 0x07, 0xb7, 0xfb, 0x9d, 0x6c, 0x8e, 0x6b, - 0xb0, 0x30, 0x70, 0xce, 0x6c, 0x46, 0x4f, 0x39, 0x0e, 0x83, 0xd7, 0x06, 0xce, 0x99, 0x45, 0x4f, - 0xb9, 0x1a, 0xd4, 0x3d, 0xae, 0x26, 0xf0, 0xae, 0x17, 0xf8, 0xb4, 0xcf, 0xd5, 0xf1, 0x2f, 0x58, - 0x55, 0x84, 0xef, 0x6b, 0x54, 0xde, 0x35, 0xa6, 0xae, 0x51, 0xf2, 0x70, 0x17, 0xac, 0x32, 0x4b, - 0xdc, 0x2d, 0xf3, 0x11, 0xac, 0xe5, 0xd8, 0x8c, 0xa7, 0xf7, 0x09, 0xcc, 0xeb, 0xab, 0x81, 0xc7, - 0x66, 0xe0, 0x73, 0xe2, 0x7b, 0xf9, 0x17, 0xaf, 0x01, 0xee, 0x30, 0x7f, 0x5f, 0x80, 0xeb, 0x69, - 0x49, 0x3b, 0xbe, 0x2f, 0x07, 0x30, 0xfe, 0xfe, 0x43, 0x90, 0xf1, 0x6c, 0x36, 0xc7, 0xb3, 0x7d, - 0xd8, 0x38, 0xcf, 0x9e, 0x2b, 0xb8, 0xf7, 0x74, 0xfa, 0x6c, 0x77, 0xc2, 0xf0, 0x62, 0xc7, 0x92, - 0xf6, 0x17, 0x53, 0xf6, 0x67, 0x83, 0xae, 0x84, 0x5d, 0xc1, 0xaa, 0x36, 0xb4, 0x12, 0x75, 0x41, - 0x4f, 0x1c, 0x51, 0x9a, 0xee, 0xc3, 0x5a, 0x0e, 0x0d, 0x95, 0x6c, 0xc9, 0xe9, 0x23, 0x9e, 0x58, - 0x4a, 0xdb, 0xcd, 0xce, 0xf4, 0xdb, 0x19, 0x19, 0x70, 0x9b, 0xbc, 0x0b, 0xcf, 0x1c, 0x2e, 0xaf, - 0x51, 0x4a, 0xc9, 0x33, 0x68, 0xa4, 0x61, 0x94, 0xff, 0xe5, 0x94, 0xfc, 0xeb, 0x19, 0xf9, 0x29, - 0xb6, 0x48, 0x4b, 0x13, 0x56, 0x34, 0x1e, 0xf5, 0x82, 0x48, 0xcf, 0x17, 0xb0, 0x3a, 0x4d, 0x40, - 0x4d, 0x6d, 0x58, 0x98, 0x6a, 0x26, 0xf1, 0x5a, 0x72, 0xbd, 0x76, 0x3c, 0xb1, 0x47, 0xa7, 0xe5, - 0x5d, 0xc8, 0xb5, 0x06, 0xcd, 0x0c, 0x17, 0x5e, 0xf1, 0x16, 0xac, 0x1e, 0x0a, 0x1a, 0x26, 0xe2, - 0x1a, 0x19, 0xb8, 0x06, 0xcd, 0x0c, 0x05, 0x99, 0x7e, 0x0b, 0xd7, 0xa7, 0x48, 0xcf, 0xbc, 0xc0, - 0x1b, 0x0c, 0x07, 0x97, 0x30, 0xc6, 0xb8, 0x09, 0xaa, 0x37, 0xda, 0xc2, 0x1b, 0x90, 0x68, 0x88, - 0x9c, 0xb1, 0x4a, 0x12, 0x7b, 0xa1, 0x21, 0xf3, 0x17, 0xb0, 0x71, 0x9e, 0xfc, 0x4b, 0xc4, 0x48, - 0x19, 0xee, 0x30, 0x91, 0xe3, 0x53, 0x1b, 0x5a, 0x59, 0x12, 0x3a, 0xd5, 0x85, 0x9b, 0xd3, 0xb4, - 0x97, 0x81, 0xf0, 0xfc, 0x1d, 0x59, 0x6a, 0xdf, 0x93, 0x63, 0xb7, 0xc1, 0xbc, 0x48, 0x07, 0x5a, - 0xd2, 0x00, 0xe3, 0x11, 0x89, 0xf6, 0xc4, 0x89, 0xf9, 0x29, 0xd4, 0x53, 0x28, 0x46, 0xa2, 0x01, - 0x73, 0x8e, 0xeb, 0xb2, 0x68, 0x4c, 0xd0, 0x0b, 0x19, 0x03, 0x8b, 0x70, 0x72, 0x4e, 0x0c, 0xb2, - 0x24, 0xd4, 0xbc, 0x05, 0xcd, 0x57, 0x09, 0x5c, 0x5e, 0xe9, 0xdc, 0x92, 0xb0, 0x88, 0x25, 0xc1, - 0xdc, 0x83, 0x56, 0x96, 0xe1, 0x4a, 0xc5, 0xe8, 0x7a, 0x52, 0xce, 0x24, 0x5b, 0x23, 0xf5, 0x55, - 0x28, 0x7a, 0x2e, 0x3e, 0x46, 0x8a, 0x9e, 0x9b, 0x3a, 0x88, 0xe2, 0x54, 0x02, 0x6c, 0xc2, 0xc6, - 0x79, 0xc2, 0xd0, 0xcf, 0x3a, 0x2c, 0x3f, 0x09, 0x3c, 0xa1, 0x2f, 0x60, 0x14, 0x98, 0xcf, 0xc0, - 0x48, 0x82, 0x97, 0xc8, 0xb4, 0x9f, 0x0a, 0xb0, 0x71, 0x40, 0xc3, 0xa1, 0xaf, 0xa6, 0xd5, 0xd0, - 0x61, 0x24, 0x10, 0xdf, 0xd2, 0x21, 0x0b, 0x1c, 0x3f, 0xb2, 0xfb, 0x23, 0x58, 0x92, 0xf9, 0x60, - 0xf7, 0x18, 0x71, 0x04, 0x71, 0xed, 0x20, 0x7a, 0x51, 0x55, 0x24, 0xfc, 0x40, 0xa3, 0xdf, 0x71, - 0xf9, 0xea, 0x72, 0x7a, 0x52, 0x68, 0xb2, 0x71, 0x80, 0x86, 0x54, 0xf3, 0xf8, 0x0a, 0xca, 0x03, - 0x65, 0x99, 0xed, 0xf8, 0x9e, 0xa3, 0x1b, 0x48, 0x69, 0x7b, 0x65, 0x7a, 0x02, 0xdf, 0x91, 0x44, - 0xab, 0xa4, 0xb7, 0xaa, 0x85, 0xf1, 0x39, 0x34, 0x12, 0xa5, 0x6a, 0x32, 0xa8, 0xce, 0x2a, 0x1d, - 0xf5, 0x04, 0x2d, 0x9e, 0x57, 0x6f, 0xc2, 0x8d, 0x73, 0xfd, 0xc2, 0x10, 0xfe, 0xa9, 0xa0, 0xc3, - 0x85, 0x81, 0x8e, 0xfc, 0xfd, 0x7f, 0x98, 0xd7, 0xfb, 0xf1, 0xd0, 0xcf, 0x31, 0x10, 0x37, 0x9d, - 0x6b, 0x5b, 0xf1, 0x5c, 0xdb, 0xf2, 0x22, 0x3a, 0x93, 0x13, 0x51, 0x59, 0xdf, 0x53, 0xf6, 0x4d, - 0x46, 0xa0, 0x87, 0x64, 0x40, 0x05, 0x49, 0x1f, 0xfe, 0x1f, 0x0a, 0xd0, 0x48, 0xe3, 0x78, 0xfe, - 0x77, 0xa1, 0xee, 0x92, 0x90, 0x91, 0x9e, 0x52, 0x96, 0x4e, 0x85, 0xfb, 0xc5, 0x56, 0xc1, 0x32, - 0x26, 0xe4, 0xd8, 0xc6, 0xfb, 0x50, 0xc1, 0xc3, 0xc2, 0x9e, 0x51, 0xbc, 0x4c, 0xcf, 0xc0, 0x03, - 0xd6, 0x2b, 0x79, 0x85, 0x5f, 0x06, 0x2e, 0xcd, 0x33, 0xb6, 0x0d, 0xad, 0x2c, 0x09, 0xfd, 0x5b, - 0x8f, 0x9b, 0xe4, 0x6b, 0x87, 0x1f, 0x30, 0x2a, 0xb7, 0xb8, 0x11, 0xe3, 0x07, 0xd0, 0xce, 0x23, - 0x22, 0xeb, 0xdf, 0x0b, 0x50, 0x3b, 0x24, 0xe9, 0x5b, 0xf1, 0xae, 0x07, 0x9a, 0x73, 0x3a, 0xc5, - 0xbc, 0x7c, 0xbf, 0x07, 0x4d, 0xf5, 0x4c, 0x90, 0x01, 0x62, 0x22, 0xe7, 0x8d, 0xb0, 0xa2, 0xc8, - 0xd3, 0xd5, 0x32, 0xfb, 0xdc, 0x9a, 0xcd, 0x79, 0x6e, 0xd5, 0x61, 0x39, 0xe1, 0x07, 0x7a, 0xf7, - 0x34, 0xe9, 0xbb, 0x45, 0x94, 0xde, 0x38, 0x32, 0xef, 0xe8, 0xa6, 0x79, 0x1d, 0xd6, 0x73, 0x85, - 0xa1, 0xae, 0xdf, 0xc9, 0x3a, 0x9f, 0x6a, 0x60, 0x3b, 0x81, 0xfb, 0x88, 0x88, 0xd4, 0xa8, 0x61, - 0xfc, 0x00, 0x2b, 0x5c, 0xd0, 0x30, 0xe9, 0xbc, 0x3d, 0xa0, 0x6e, 0xf4, 0xba, 0xbe, 0x9d, 0x33, - 0xc1, 0xa4, 0x9b, 0x22, 0x75, 0x89, 0x55, 0xe7, 0x59, 0x50, 0x3e, 0x5e, 0x6e, 0x5d, 0x68, 0x40, - 0xfc, 0x43, 0x44, 0xe5, 0x78, 0xdc, 0x65, 0x9e, 0x6b, 0x5f, 0x6a, 0x76, 0x52, 0xf9, 0x5e, 0xd6, - 0x1c, 0xf8, 0x63, 0xd0, 0xaf, 0xe2, 0xb1, 0x48, 0xa7, 0xf8, 0x47, 0x6f, 0x33, 0x3a, 0x3b, 0x1f, - 0x61, 0x1e, 0xa6, 0x0b, 0x89, 0x9c, 0x74, 0xa6, 0x09, 0x97, 0xa8, 0xc8, 0x87, 0x50, 0xb9, 0xef, - 0xf4, 0x4e, 0x86, 0xf1, 0x24, 0xbb, 0x09, 0xa5, 0x1e, 0x0d, 0x7a, 0x43, 0xc6, 0x48, 0xd0, 0x1b, - 0x63, 0xed, 0x4d, 0x42, 0x72, 0x87, 0x7a, 0x8e, 0xea, 0x74, 0xc1, 0x37, 0x6c, 0x12, 0x32, 0xef, - 0x41, 0x35, 0x12, 0x8a, 0x26, 0xdc, 0x86, 0x39, 0x32, 0x9a, 0x24, 0x4b, 0xb5, 0x13, 0xfd, 0x43, - 0x66, 0x57, 0xa2, 0x96, 0x26, 0x62, 0xa7, 0x15, 0x94, 0x91, 0x3d, 0x46, 0x07, 0x29, 0xbb, 0xcc, - 0x1d, 0x79, 0x4d, 0x33, 0xb4, 0x77, 0x12, 0xdf, 0x00, 0xe3, 0xd0, 0x77, 0x46, 0x24, 0x3d, 0xbf, - 0xee, 0x41, 0x3d, 0x85, 0x5e, 0x75, 0x3c, 0x36, 0xa0, 0x26, 0x4f, 0x4e, 0xc9, 0x8a, 0x64, 0xcb, - 0x7b, 0x35, 0xc1, 0x30, 0xd7, 0x7f, 0xd0, 0x73, 0xa2, 0x02, 0xdf, 0xef, 0x18, 0x78, 0x4f, 0x4e, - 0x6b, 0xd3, 0x92, 0x2f, 0x91, 0x04, 0xca, 0x4c, 0x87, 0x89, 0x94, 0xed, 0x32, 0x5a, 0x09, 0x10, - 0x8d, 0xff, 0x0d, 0xac, 0x4f, 0xd0, 0xf7, 0x3e, 0xee, 0x6d, 0xc0, 0x07, 0xf9, 0xd2, 0x51, 0xbb, - 0xa1, 0x7f, 0x19, 0x95, 0xd4, 0xf8, 0xfc, 0xfe, 0x4f, 0xff, 0x6a, 0x89, 0xd8, 0x85, 0x43, 0xde, - 0x1f, 0x0b, 0x50, 0x93, 0x2d, 0x2e, 0xe9, 0xe7, 0xcf, 0xa8, 0x01, 0xe3, 0x90, 0x95, 0x0e, 0xb8, - 0x1c, 0xce, 0x25, 0x90, 0xd3, 0x9c, 0xe4, 0x70, 0x9e, 0x21, 0x21, 0xdb, 0x93, 0x09, 0xed, 0xbf, - 0x2d, 0xdd, 0xeb, 0xb0, 0x96, 0x23, 0x2a, 0xce, 0x87, 0xf2, 0xab, 0xb7, 0x4e, 0xbd, 0x32, 0x2d, - 0x4e, 0x29, 0x3b, 0x39, 0xf2, 0xe9, 0x69, 0x34, 0x7c, 0x46, 0x6b, 0x49, 0x3b, 0x21, 0x63, 0x1e, - 0x3a, 0x3d, 0x82, 0xbf, 0x83, 0xc7, 0x6b, 0xf3, 0x1b, 0xa8, 0xbc, 0xba, 0xea, 0x88, 0x7c, 0xff, - 0xb3, 0x1f, 0x3b, 0x23, 0x4f, 0x10, 0xce, 0x3b, 0x1e, 0xdd, 0xd2, 0x5f, 0x5b, 0x7d, 0xba, 0x35, - 0x12, 0x5b, 0xea, 0xbf, 0xc0, 0x5b, 0x99, 0x9f, 0x8d, 0xba, 0xf3, 0x8a, 0x70, 0xf7, 0x3f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x82, 0x1c, 0x56, 0x23, 0x8f, 0x1e, 0x00, 0x00, + // 2181 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x19, 0xdb, 0x72, 0xdb, 0xc6, + 0x75, 0x40, 0x4a, 0x32, 0x75, 0x78, 0x11, 0x05, 0x52, 0x22, 0x44, 0xd7, 0xb2, 0x0c, 0x3b, 0x89, + 0x27, 0x99, 0x52, 0x89, 0x9c, 0x64, 0x32, 0x49, 0xdb, 0xa9, 0x6c, 0x4b, 0x76, 0x62, 0x39, 0x56, + 0x20, 0x5f, 0x3a, 0x99, 0x4e, 0x31, 0x20, 0xb0, 0x22, 0x31, 0x02, 0xb1, 0xf0, 0xee, 0x82, 0x14, + 0x5f, 0xfa, 0x09, 0xed, 0x1f, 0xf4, 0xa5, 0x33, 0xed, 0x7b, 0x3f, 0xa2, 0x9f, 0x90, 0x7e, 0x4a, + 0x1f, 0xfa, 0xd0, 0xce, 0x5e, 0x40, 0x02, 0x04, 0x64, 0xcb, 0x1a, 0x77, 0x26, 0x2f, 0x1a, 0x9c, + 0xfb, 0x65, 0xcf, 0x9e, 0x73, 0x96, 0x82, 0x0e, 0x73, 0xfa, 0x01, 0x62, 0x23, 0x27, 0x74, 0x06, + 0x88, 0x78, 0x0e, 0x73, 0x7a, 0x11, 0xc1, 0x0c, 0xeb, 0xeb, 0x39, 0x42, 0xb7, 0xfa, 0x3a, 0x46, + 0x64, 0x2a, 0xe9, 0xdd, 0x06, 0xc3, 0x11, 0x9e, 0xf3, 0x77, 0x37, 0x08, 0x8a, 0x02, 0xdf, 0x75, + 0x98, 0x8f, 0xc3, 0x14, 0xba, 0x1e, 0xe0, 0x41, 0xcc, 0xfc, 0x40, 0x82, 0xe6, 0x7f, 0x35, 0x58, + 0x7b, 0xce, 0x15, 0x3f, 0x44, 0xa7, 0x7e, 0xe8, 0x73, 0x66, 0x5d, 0x87, 0xa5, 0xd0, 0x19, 0x21, + 0x43, 0xdb, 0xd1, 0xee, 0xae, 0x5a, 0xe2, 0x5b, 0xdf, 0x84, 0x15, 0xea, 0x0e, 0xd1, 0xc8, 0x31, + 0x4a, 0x02, 0xab, 0x20, 0xdd, 0x80, 0x6b, 0x2e, 0x0e, 0xe2, 0x51, 0x48, 0x8d, 0xf2, 0x4e, 0xf9, + 0xee, 0xaa, 0x95, 0x80, 0x7a, 0x0f, 0x5a, 0x11, 0xf1, 0x47, 0x0e, 0x99, 0xda, 0x67, 0x68, 0x6a, + 0x27, 0x5c, 0x4b, 0x82, 0x6b, 0x5d, 0x91, 0x9e, 0xa0, 0xe9, 0x03, 0xc5, 0xaf, 0xc3, 0x12, 0x9b, + 0x46, 0xc8, 0x58, 0x96, 0x56, 0xf9, 0xb7, 0x7e, 0x13, 0xaa, 0xdc, 0x75, 0x3b, 0x40, 0xe1, 0x80, + 0x0d, 0x8d, 0x95, 0x1d, 0xed, 0xee, 0x92, 0x05, 0x1c, 0x75, 0x24, 0x30, 0xfa, 0x75, 0x58, 0x25, + 0x78, 0x62, 0xbb, 0x38, 0x0e, 0x99, 0x71, 0x4d, 0x90, 0x2b, 0x04, 0x4f, 0x1e, 0x70, 0x58, 0xbf, + 0x03, 0x2b, 0xa7, 0x3e, 0x0a, 0x3c, 0x6a, 0x54, 0x76, 0xca, 0x77, 0xab, 0x7b, 0xb5, 0x9e, 0xcc, + 0xd7, 0x21, 0x47, 0x5a, 0x8a, 0x66, 0xfe, 0x4d, 0x83, 0xe6, 0x89, 0x08, 0x26, 0x95, 0x82, 0x8f, + 0x60, 0x8d, 0x5b, 0xe9, 0x3b, 0x14, 0xd9, 0x2a, 0x6e, 0x99, 0x8d, 0x46, 0x82, 0x96, 0x22, 0xfa, + 0x33, 0x90, 0xe7, 0x62, 0x7b, 0x33, 0x61, 0x6a, 0x94, 0x84, 0x39, 0xb3, 0x97, 0x3f, 0xca, 0x85, + 0x54, 0x5b, 0x4d, 0x96, 0x45, 0x50, 0x9e, 0xd0, 0x31, 0x22, 0xd4, 0xc7, 0xa1, 0x51, 0x16, 0x16, + 0x13, 0x90, 0x3b, 0xaa, 0x4b, 0xab, 0x0f, 0x86, 0x4e, 0x38, 0x40, 0x16, 0xa2, 0x71, 0xc0, 0xf4, + 0xc7, 0x50, 0xef, 0xa3, 0x53, 0x4c, 0x32, 0x8e, 0x56, 0xf7, 0x6e, 0x17, 0x58, 0x5f, 0x0c, 0xd3, + 0xaa, 0x49, 0x49, 0x15, 0xcb, 0x21, 0xd4, 0x9c, 0x53, 0x86, 0x88, 0x9d, 0x3a, 0xe9, 0x4b, 0x2a, + 0xaa, 0x0a, 0x41, 0x89, 0x36, 0xff, 0xad, 0x41, 0xe3, 0x05, 0x45, 0xe4, 0x18, 0x91, 0x91, 0x4f, + 0xa9, 0x2a, 0xa9, 0x21, 0xa6, 0x2c, 0x29, 0x29, 0xfe, 0xcd, 0x71, 0x31, 0x45, 0x44, 0x15, 0x94, + 0xf8, 0xd6, 0x3f, 0x81, 0xf5, 0xc8, 0xa1, 0x74, 0x82, 0x89, 0x67, 0xbb, 0x43, 0xe4, 0x9e, 0xd1, + 0x78, 0x24, 0xf2, 0xb0, 0x64, 0x35, 0x13, 0xc2, 0x03, 0x85, 0xd7, 0x7f, 0x00, 0x88, 0x88, 0x3f, + 0xf6, 0x03, 0x34, 0x40, 0xb2, 0xb0, 0xaa, 0x7b, 0x9f, 0x15, 0x78, 0x9b, 0xf5, 0xa5, 0x77, 0x3c, + 0x93, 0x39, 0x08, 0x19, 0x99, 0x5a, 0x29, 0x25, 0xdd, 0x5f, 0xc3, 0xda, 0x02, 0x59, 0x6f, 0x42, + 0xf9, 0x0c, 0x4d, 0x95, 0xe7, 0xfc, 0x53, 0x6f, 0xc3, 0xf2, 0xd8, 0x09, 0x62, 0xa4, 0x3c, 0x97, + 0xc0, 0xd7, 0xa5, 0xaf, 0x34, 0xf3, 0x27, 0x0d, 0x6a, 0x0f, 0xfb, 0x6f, 0x89, 0xbb, 0x01, 0x25, + 0xaf, 0xaf, 0x64, 0x4b, 0x5e, 0x7f, 0x96, 0x87, 0x72, 0x2a, 0x0f, 0xcf, 0x0a, 0x42, 0xdb, 0x2d, + 0x08, 0x2d, 0x6d, 0xec, 0xff, 0x19, 0xd8, 0x5f, 0x35, 0xa8, 0xce, 0x2d, 0x51, 0xfd, 0x08, 0x9a, + 0xdc, 0x4f, 0x3b, 0x9a, 0xe3, 0x0c, 0x4d, 0x78, 0x79, 0xeb, 0xad, 0x07, 0x60, 0xad, 0xc5, 0x19, + 0x98, 0xea, 0x87, 0xd0, 0xf0, 0xfa, 0x19, 0x5d, 0xf2, 0x06, 0xdd, 0x7c, 0x4b, 0xc4, 0x56, 0xdd, + 0x4b, 0x41, 0xd4, 0xfc, 0x08, 0xaa, 0xc7, 0x7e, 0x38, 0xb0, 0xd0, 0xeb, 0x18, 0x51, 0xc6, 0xaf, + 0x52, 0xe4, 0x4c, 0x03, 0xec, 0x78, 0x2a, 0xc8, 0x04, 0x34, 0xef, 0x42, 0x4d, 0x32, 0xd2, 0x08, + 0x87, 0x14, 0xbd, 0x81, 0xf3, 0x63, 0xa8, 0x9d, 0x04, 0x08, 0x45, 0x89, 0xce, 0x2e, 0x54, 0xbc, + 0x98, 0x88, 0xa6, 0x2a, 0x58, 0xcb, 0xd6, 0x0c, 0x36, 0xd7, 0xa0, 0xae, 0x78, 0xa5, 0x5a, 0xf3, + 0x5f, 0x1a, 0xe8, 0x07, 0xe7, 0xc8, 0x8d, 0x19, 0x7a, 0x8c, 0xf1, 0x59, 0xa2, 0xa3, 0xa8, 0xbf, + 0x6e, 0x03, 0x44, 0x0e, 0x71, 0x46, 0x88, 0x21, 0x22, 0xc3, 0x5f, 0xb5, 0x52, 0x18, 0xfd, 0x18, + 0x56, 0xd1, 0x39, 0x23, 0x8e, 0x8d, 0xc2, 0xb1, 0xe8, 0xb4, 0xd5, 0xbd, 0x7b, 0x05, 0xd9, 0xc9, + 0x5b, 0xeb, 0x1d, 0x70, 0xb1, 0x83, 0x70, 0x2c, 0x6b, 0xa2, 0x82, 0x14, 0xd8, 0xfd, 0x06, 0xea, + 0x19, 0xd2, 0x3b, 0xd5, 0xc3, 0x29, 0xb4, 0x32, 0xa6, 0x54, 0x1e, 0x6f, 0x42, 0x15, 0x9d, 0xfb, + 0xcc, 0xa6, 0xcc, 0x61, 0x31, 0x55, 0x09, 0x02, 0x8e, 0x3a, 0x11, 0x18, 0x31, 0x46, 0x98, 0x87, + 0x63, 0x36, 0x1b, 0x23, 0x02, 0x52, 0x78, 0x44, 0x92, 0x5b, 0xa0, 0x20, 0x73, 0x0c, 0xcd, 0x47, + 0x88, 0xc9, 0xbe, 0x92, 0xa4, 0x6f, 0x13, 0x56, 0x44, 0xe0, 0xb2, 0xe2, 0x56, 0x2d, 0x05, 0xe9, + 0xb7, 0xa1, 0xee, 0x87, 0x6e, 0x10, 0x7b, 0xc8, 0x1e, 0xfb, 0x68, 0x42, 0x85, 0x89, 0x8a, 0x55, + 0x53, 0xc8, 0x97, 0x1c, 0xa7, 0x7f, 0x00, 0x0d, 0x74, 0x2e, 0x99, 0x94, 0x12, 0x39, 0xb6, 0xea, + 0x0a, 0x2b, 0x1a, 0x34, 0x35, 0x11, 0xac, 0xa7, 0xec, 0xaa, 0xe8, 0x8e, 0x61, 0x5d, 0x76, 0xc6, + 0x54, 0xb3, 0x7f, 0x97, 0x6e, 0xdb, 0xa4, 0x0b, 0x18, 0xb3, 0x03, 0x1b, 0x8f, 0x10, 0x4b, 0x95, + 0xb0, 0x8a, 0xd1, 0xfc, 0x11, 0x36, 0x17, 0x09, 0xca, 0x89, 0xdf, 0x42, 0x35, 0x7b, 0xe9, 0xb8, + 0xf9, 0xed, 0x02, 0xf3, 0x69, 0xe1, 0xb4, 0x88, 0xd9, 0x06, 0xfd, 0x04, 0x31, 0x0b, 0x39, 0xde, + 0xb3, 0x30, 0x98, 0x26, 0x16, 0x37, 0xa0, 0x95, 0xc1, 0xaa, 0x12, 0x9e, 0xa3, 0x5f, 0x11, 0x9f, + 0xa1, 0x84, 0x7b, 0x13, 0xda, 0x59, 0xb4, 0x62, 0xff, 0x0e, 0xd6, 0xe5, 0x70, 0x7a, 0x3e, 0x8d, + 0x12, 0x66, 0xfd, 0x0b, 0xa8, 0x4a, 0xf7, 0x6c, 0x31, 0xe0, 0xb9, 0xcb, 0x8d, 0xbd, 0x76, 0x6f, + 0xb6, 0xaf, 0x88, 0x9c, 0x33, 0x21, 0x01, 0x6c, 0xf6, 0xcd, 0xfd, 0x4c, 0xeb, 0x9a, 0x3b, 0x64, + 0xa1, 0x53, 0x82, 0xe8, 0x90, 0x97, 0x54, 0xda, 0xa1, 0x2c, 0x5a, 0xb1, 0x77, 0x60, 0xc3, 0x8a, + 0xc3, 0xc7, 0xc8, 0x09, 0xd8, 0x50, 0x0c, 0x8e, 0x44, 0xc0, 0x80, 0xcd, 0x45, 0x82, 0x12, 0xf9, + 0x1c, 0x8c, 0x6f, 0x07, 0x21, 0x26, 0x48, 0x12, 0x0f, 0x08, 0xc1, 0x24, 0xd3, 0x52, 0x18, 0x43, + 0x24, 0x9c, 0x37, 0x0a, 0x01, 0x9a, 0xd7, 0x61, 0xab, 0x40, 0x4a, 0xa9, 0xfc, 0x9a, 0x3b, 0xcd, + 0xfb, 0x49, 0xb6, 0x92, 0x6f, 0x43, 0x7d, 0xe2, 0xf8, 0xcc, 0x8e, 0x30, 0x9d, 0x17, 0xd3, 0xaa, + 0x55, 0xe3, 0xc8, 0x63, 0x85, 0x93, 0x91, 0xa5, 0x65, 0x95, 0xce, 0x3d, 0xd8, 0x3c, 0x26, 0xe8, + 0x34, 0xf0, 0x07, 0xc3, 0x85, 0x0b, 0xc2, 0x77, 0x32, 0x91, 0xb8, 0xe4, 0x86, 0x24, 0xa0, 0x39, + 0x80, 0x4e, 0x4e, 0x46, 0xd5, 0xd5, 0x11, 0x34, 0x24, 0x97, 0x4d, 0xc4, 0x5e, 0x91, 0xf4, 0xf3, + 0x0f, 0x2e, 0xac, 0xec, 0xf4, 0x16, 0x62, 0xd5, 0xdd, 0x14, 0x44, 0xcd, 0xff, 0x68, 0xa0, 0xef, + 0x47, 0x51, 0x30, 0xcd, 0x7a, 0xd6, 0x84, 0x32, 0x7d, 0x1d, 0x24, 0x2d, 0x86, 0xbe, 0x0e, 0x78, + 0x8b, 0x39, 0xc5, 0xc4, 0x45, 0xea, 0xb2, 0x4a, 0x80, 0xaf, 0x01, 0x4e, 0x10, 0xe0, 0x89, 0x9d, + 0xda, 0x61, 0x45, 0x67, 0xa8, 0x58, 0x4d, 0x41, 0xb0, 0xe6, 0xf8, 0xfc, 0x02, 0xb4, 0xf4, 0xbe, + 0x16, 0xa0, 0xe5, 0x2b, 0x2e, 0x40, 0x7f, 0xd7, 0xa0, 0x95, 0x89, 0x5e, 0xe5, 0xf8, 0xe7, 0xb7, + 0xaa, 0xb5, 0x60, 0xfd, 0x08, 0xbb, 0x67, 0xb2, 0xeb, 0x25, 0x57, 0xa3, 0x0d, 0x7a, 0x1a, 0x39, + 0xbf, 0x78, 0x2f, 0xc2, 0x20, 0xc7, 0xbc, 0x09, 0xed, 0x2c, 0x5a, 0xb1, 0xff, 0x43, 0x03, 0x43, + 0x8d, 0x88, 0x43, 0xc4, 0xdc, 0xe1, 0x3e, 0x7d, 0xd8, 0x9f, 0xd5, 0x41, 0x1b, 0x96, 0xc5, 0x2a, + 0x2e, 0x12, 0x50, 0xb3, 0x24, 0xa0, 0x77, 0xe0, 0x9a, 0xd7, 0xb7, 0xc5, 0x68, 0x54, 0xd3, 0xc1, + 0xeb, 0x7f, 0xcf, 0x87, 0xe3, 0x16, 0x54, 0x46, 0xce, 0xb9, 0x4d, 0xf0, 0x84, 0xaa, 0x65, 0xf0, + 0xda, 0xc8, 0x39, 0xb7, 0xf0, 0x84, 0x8a, 0x45, 0xdd, 0xa7, 0x62, 0x03, 0xef, 0xfb, 0x61, 0x80, + 0x07, 0x54, 0x1c, 0x7f, 0xc5, 0x6a, 0x28, 0xf4, 0x7d, 0x89, 0xe5, 0x77, 0x8d, 0x88, 0x6b, 0x94, + 0x3e, 0xdc, 0x8a, 0x55, 0x23, 0xa9, 0xbb, 0x65, 0x3e, 0x82, 0xad, 0x02, 0x9f, 0xd5, 0xe9, 0x7d, + 0x0c, 0x2b, 0xf2, 0x6a, 0xa8, 0x63, 0xd3, 0xd5, 0x73, 0xe2, 0x07, 0xfe, 0x57, 0x5d, 0x03, 0xc5, + 0x61, 0xfe, 0x49, 0x83, 0x1b, 0x59, 0x4d, 0xfb, 0x41, 0xc0, 0x17, 0x30, 0xfa, 0xfe, 0x53, 0x90, + 0x8b, 0x6c, 0xa9, 0x20, 0xb2, 0x23, 0xd8, 0xbe, 0xc8, 0x9f, 0x2b, 0x84, 0xf7, 0x64, 0xf1, 0x6c, + 0xf7, 0xa3, 0xe8, 0xcd, 0x81, 0xa5, 0xfd, 0x2f, 0x65, 0xfc, 0xcf, 0x27, 0x5d, 0x28, 0xbb, 0x82, + 0x57, 0x5d, 0x30, 0x52, 0x7d, 0x41, 0x6e, 0x1c, 0x49, 0x99, 0x1e, 0xc1, 0x56, 0x01, 0x4d, 0x19, + 0xd9, 0xe5, 0xdb, 0xc7, 0x6c, 0x63, 0xa9, 0xee, 0x75, 0x7a, 0x8b, 0x6f, 0x67, 0x25, 0xa0, 0xd8, + 0xf8, 0x5d, 0x78, 0xea, 0x50, 0x7e, 0x8d, 0x32, 0x46, 0x9e, 0x42, 0x3b, 0x8b, 0x56, 0xfa, 0xbf, + 0x58, 0xd0, 0x7f, 0x23, 0xa7, 0x3f, 0x23, 0x96, 0x58, 0xe9, 0xc0, 0x86, 0xc4, 0x27, 0xb3, 0x20, + 0xb1, 0xf3, 0x39, 0x6c, 0x2e, 0x12, 0x94, 0xa5, 0x2e, 0x54, 0x16, 0x86, 0xc9, 0x0c, 0xe6, 0x52, + 0xaf, 0x1c, 0x9f, 0x1d, 0xe2, 0x45, 0x7d, 0x6f, 0x94, 0xda, 0x82, 0x4e, 0x4e, 0x4a, 0x5d, 0x71, + 0x03, 0x36, 0x4f, 0x18, 0x8e, 0x52, 0x79, 0x4d, 0x1c, 0xdc, 0x82, 0x4e, 0x8e, 0xa2, 0x84, 0xfe, + 0x00, 0x37, 0x16, 0x48, 0x4f, 0xfd, 0xd0, 0x1f, 0xc5, 0xa3, 0x4b, 0x38, 0xa3, 0xdf, 0x02, 0x31, + 0x1b, 0x6d, 0xe6, 0x8f, 0x50, 0xb2, 0x44, 0x96, 0xad, 0x2a, 0xc7, 0x3d, 0x97, 0x28, 0xf3, 0x57, + 0xb0, 0x7d, 0x91, 0xfe, 0x4b, 0xe4, 0x48, 0x38, 0xee, 0x10, 0x56, 0x10, 0x53, 0x17, 0x8c, 0x3c, + 0x49, 0x05, 0xd5, 0x87, 0x5b, 0x8b, 0xb4, 0x17, 0x21, 0xf3, 0x83, 0x7d, 0xde, 0x6a, 0xdf, 0x53, + 0x60, 0x77, 0xc0, 0x7c, 0x93, 0x0d, 0xe5, 0x49, 0x1b, 0xf4, 0x47, 0x28, 0xe1, 0x99, 0x15, 0xe6, + 0x27, 0xd0, 0xca, 0x60, 0x55, 0x26, 0xda, 0xb0, 0xec, 0x78, 0x1e, 0x49, 0xd6, 0x04, 0x09, 0xf0, + 0x1c, 0x58, 0x88, 0xa2, 0x0b, 0x72, 0x90, 0x27, 0x29, 0xcb, 0xbb, 0xd0, 0x79, 0x99, 0xc2, 0xf3, + 0x2b, 0x5d, 0xd8, 0x12, 0x56, 0x55, 0x4b, 0x30, 0x0f, 0xc1, 0xc8, 0x0b, 0x5c, 0xa9, 0x19, 0xdd, + 0x48, 0xeb, 0x99, 0x57, 0x6b, 0x62, 0xbe, 0x01, 0x25, 0xdf, 0x53, 0x8f, 0x91, 0x92, 0xef, 0x65, + 0x0e, 0xa2, 0xb4, 0x50, 0x00, 0x3b, 0xb0, 0x7d, 0x91, 0x32, 0x15, 0x67, 0x0b, 0xd6, 0xbf, 0x0d, + 0x7d, 0x26, 0x2f, 0x60, 0x92, 0x98, 0x4f, 0x41, 0x4f, 0x23, 0x2f, 0x51, 0x69, 0x3f, 0x69, 0xb0, + 0x7d, 0x8c, 0xa3, 0x38, 0x10, 0xdb, 0x6a, 0xe4, 0x10, 0x14, 0xb2, 0xef, 0x70, 0x4c, 0x42, 0x27, + 0x48, 0xfc, 0xfe, 0x10, 0xd6, 0x78, 0x3d, 0xd8, 0x2e, 0x41, 0x0e, 0x43, 0x9e, 0x1d, 0x26, 0x2f, + 0xaa, 0x3a, 0x47, 0x3f, 0x90, 0xd8, 0xef, 0x29, 0x7f, 0x75, 0x39, 0x2e, 0x57, 0x9a, 0x1e, 0x1c, + 0x20, 0x51, 0x62, 0x78, 0x7c, 0x05, 0xb5, 0x91, 0xf0, 0xcc, 0x76, 0x02, 0xdf, 0x91, 0x03, 0xa4, + 0xba, 0xb7, 0xb1, 0xb8, 0x81, 0xef, 0x73, 0xa2, 0x55, 0x95, 0xac, 0x02, 0xd0, 0x3f, 0x83, 0x76, + 0xaa, 0x55, 0xcd, 0x17, 0xd5, 0x25, 0x61, 0xa3, 0x95, 0xa2, 0xcd, 0xf6, 0xd5, 0x5b, 0x70, 0xf3, + 0xc2, 0xb8, 0x54, 0x0a, 0xff, 0xa2, 0xc9, 0x74, 0xa9, 0x44, 0x27, 0xf1, 0xfe, 0x12, 0x56, 0x24, + 0xbf, 0x3a, 0xf4, 0x0b, 0x1c, 0x54, 0x4c, 0x17, 0xfa, 0x56, 0xba, 0xd0, 0xb7, 0xa2, 0x8c, 0x96, + 0x0b, 0x32, 0xca, 0xfb, 0x7b, 0xc6, 0xbf, 0xf9, 0x0a, 0xf4, 0x10, 0x8d, 0x30, 0x43, 0xd9, 0xc3, + 0xff, 0xb3, 0x06, 0xed, 0x2c, 0x5e, 0x9d, 0xff, 0x3d, 0x68, 0x79, 0x28, 0x22, 0xc8, 0x15, 0xc6, + 0xb2, 0xa5, 0x70, 0xbf, 0x64, 0x68, 0x96, 0x3e, 0x27, 0xcf, 0x7c, 0xbc, 0x0f, 0x75, 0x75, 0x58, + 0x6a, 0x66, 0x94, 0x2e, 0x33, 0x33, 0xd4, 0x01, 0x4b, 0x88, 0x5f, 0xe1, 0x17, 0xa1, 0x87, 0x8b, + 0x9c, 0xed, 0x82, 0x91, 0x27, 0xa9, 0xf8, 0xae, 0xcf, 0x86, 0xe4, 0x2b, 0x87, 0x1e, 0x13, 0xcc, + 0x59, 0xbc, 0x44, 0xf0, 0x17, 0xd0, 0x2d, 0x22, 0x2a, 0xd1, 0x7f, 0x6a, 0xd0, 0x3c, 0x41, 0xd9, + 0x5b, 0xf1, 0xae, 0x07, 0x5a, 0x70, 0x3a, 0xa5, 0xa2, 0x7a, 0xff, 0x12, 0x3a, 0xe2, 0x99, 0xc0, + 0x13, 0x44, 0x58, 0xc1, 0x1b, 0x61, 0x43, 0x90, 0x17, 0xbb, 0x65, 0xfe, 0xb9, 0xb5, 0x54, 0xf0, + 0xdc, 0x6a, 0xc1, 0x7a, 0x2a, 0x0e, 0x15, 0xdd, 0x93, 0x74, 0xec, 0x16, 0x12, 0x76, 0x67, 0x99, + 0x79, 0xc7, 0x30, 0xcd, 0x1b, 0x70, 0xbd, 0x50, 0x99, 0xb2, 0xf5, 0x47, 0xde, 0xe7, 0x33, 0x03, + 0x6c, 0x3f, 0xf4, 0x1e, 0x21, 0x96, 0x59, 0x35, 0xf4, 0xdf, 0xc1, 0x06, 0x65, 0x38, 0x4a, 0x07, + 0x6f, 0x8f, 0xb0, 0x97, 0xbc, 0xae, 0xef, 0x14, 0x6c, 0x30, 0xd9, 0xa1, 0x88, 0x3d, 0x64, 0xb5, + 0x68, 0x1e, 0xc9, 0x1f, 0x2f, 0xb7, 0xdf, 0xe8, 0xc0, 0xec, 0x87, 0x88, 0xfa, 0x70, 0xda, 0x27, + 0xbe, 0x67, 0x5f, 0x6a, 0x77, 0x12, 0xf5, 0x5e, 0x93, 0x12, 0xea, 0xc7, 0xa0, 0xdf, 0xcc, 0xd6, + 0x22, 0x59, 0xe2, 0x1f, 0xbe, 0xcd, 0xe9, 0xfc, 0x7e, 0xa4, 0xea, 0x30, 0xdb, 0x48, 0xf8, 0xa6, + 0xb3, 0x48, 0xb8, 0x44, 0x47, 0x3e, 0x81, 0xfa, 0x7d, 0xc7, 0x3d, 0x8b, 0x67, 0x9b, 0xec, 0x0e, + 0x54, 0x5d, 0x1c, 0xba, 0x31, 0x21, 0x28, 0x74, 0xa7, 0xaa, 0xf7, 0xa6, 0x51, 0x9c, 0x43, 0x3c, + 0x47, 0x65, 0xb9, 0xa8, 0x37, 0x6c, 0x1a, 0x65, 0x7e, 0x09, 0x8d, 0x44, 0xa9, 0x72, 0xe1, 0x0e, + 0x2c, 0xa3, 0xf1, 0xbc, 0x58, 0x1a, 0xbd, 0xe4, 0x1f, 0x32, 0x07, 0x1c, 0x6b, 0x49, 0xa2, 0x9a, + 0xb4, 0x0c, 0x13, 0x74, 0x48, 0xf0, 0x28, 0xe3, 0x97, 0xb9, 0xcf, 0xaf, 0x69, 0x8e, 0xf6, 0x4e, + 0xea, 0x7f, 0x0f, 0xb5, 0x97, 0x6f, 0x9d, 0xd0, 0x3c, 0x5b, 0x13, 0x4c, 0xce, 0x4e, 0x03, 0x3c, + 0x49, 0x06, 0x65, 0x02, 0x73, 0xda, 0x19, 0x9a, 0xd2, 0xc8, 0x71, 0x91, 0xfa, 0xcd, 0x6e, 0x06, + 0x9b, 0xdf, 0x40, 0xfd, 0xe5, 0x55, 0xc7, 0xf9, 0xfd, 0x4f, 0x7f, 0xec, 0x8d, 0x7d, 0x86, 0x28, + 0xed, 0xf9, 0x78, 0x57, 0x7e, 0xed, 0x0e, 0xf0, 0xee, 0x98, 0xed, 0x8a, 0xff, 0x58, 0xed, 0xe6, + 0x9e, 0xb8, 0xfd, 0x15, 0x41, 0xb8, 0xf7, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x46, 0xf8, + 0x40, 0x3b, 0x1b, 0x00, 0x00, } diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go index 28e717a9db3..649fdbd479c 100644 --- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go +++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go @@ -29,78 +29,70 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("tabletmanagerservice.proto", fileDescriptor_9ee75fe63cfd9360) } var fileDescriptor_9ee75fe63cfd9360 = []byte{ - // 1134 bytes of a gzipped FileDescriptorProto + // 998 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x98, 0x6d, 0x6f, 0x23, 0x35, - 0x10, 0xc7, 0xa9, 0x04, 0x27, 0xe1, 0xe3, 0xd1, 0x9c, 0x38, 0xa9, 0x48, 0x70, 0x70, 0x2d, 0x1c, - 0xcd, 0x91, 0xdc, 0x03, 0xc7, 0xfb, 0xdc, 0x43, 0x7b, 0x45, 0x57, 0x11, 0x92, 0x6b, 0x8b, 0x40, - 0x3a, 0xc9, 0x4d, 0xa6, 0xc9, 0xd2, 0xcd, 0x7a, 0xb1, 0x9d, 0x88, 0xbe, 0x42, 0xe2, 0x2d, 0x12, - 0x9f, 0x8d, 0x8f, 0x84, 0xf6, 0xc1, 0xde, 0xf1, 0xee, 0xac, 0xb3, 0x79, 0x17, 0xe5, 0xff, 0xf3, - 0x8c, 0x3d, 0x1e, 0x8f, 0x67, 0xcd, 0x76, 0x8d, 0xb8, 0x88, 0xc1, 0x2c, 0x45, 0x22, 0xe6, 0xa0, - 0x34, 0xa8, 0x75, 0x34, 0x85, 0x7e, 0xaa, 0xa4, 0x91, 0xfc, 0x16, 0xa5, 0xed, 0xde, 0xf6, 0xfe, - 0x9d, 0x09, 0x23, 0x0a, 0xfc, 0xd1, 0x7f, 0x3d, 0xf6, 0xfe, 0xeb, 0x5c, 0x3b, 0x29, 0x34, 0x7e, - 0xcc, 0xde, 0x1e, 0x45, 0xc9, 0x9c, 0x7f, 0xde, 0x6f, 0x8e, 0xc9, 0x84, 0x31, 0xfc, 0xb1, 0x02, - 0x6d, 0x76, 0xbf, 0x68, 0xd5, 0x75, 0x2a, 0x13, 0x0d, 0x5f, 0xbd, 0xc5, 0x5f, 0xb1, 0x77, 0x26, - 0x31, 0x40, 0xca, 0x29, 0x36, 0x57, 0xac, 0xb1, 0x3b, 0xed, 0x80, 0xb3, 0xf6, 0x86, 0xdd, 0x7c, - 0xf1, 0x27, 0x4c, 0x57, 0x06, 0x5e, 0x4a, 0x79, 0xc5, 0xf7, 0x89, 0x21, 0x48, 0xb7, 0x96, 0xbf, - 0xde, 0x84, 0x39, 0xfb, 0xbf, 0xb0, 0x77, 0x8f, 0xc0, 0x4c, 0xa6, 0x0b, 0x58, 0x0a, 0x7e, 0x97, - 0x18, 0xe6, 0x54, 0x6b, 0x7b, 0x2f, 0x0c, 0x39, 0xcb, 0x73, 0xf6, 0xc1, 0x11, 0x98, 0x11, 0xa8, - 0x65, 0xa4, 0x75, 0x24, 0x13, 0xcd, 0xef, 0xd1, 0x23, 0x11, 0x62, 0x7d, 0x7c, 0xdb, 0x81, 0xc4, - 0x21, 0x9a, 0x80, 0x19, 0x83, 0x98, 0xfd, 0x94, 0xc4, 0xd7, 0x64, 0x88, 0x90, 0x1e, 0x0a, 0x91, - 0x87, 0x39, 0xfb, 0x82, 0xbd, 0x57, 0x0a, 0xe7, 0x2a, 0x32, 0xc0, 0x03, 0x23, 0x73, 0xc0, 0x7a, - 0xf8, 0x66, 0x23, 0xe7, 0x5c, 0xfc, 0xc6, 0xd8, 0xb3, 0x85, 0x48, 0xe6, 0xf0, 0xfa, 0x3a, 0x05, - 0x4e, 0x45, 0xb8, 0x92, 0xad, 0xf9, 0xfd, 0x0d, 0x14, 0x9e, 0xff, 0x18, 0x2e, 0x15, 0xe8, 0xc5, - 0xc4, 0x88, 0x96, 0xf9, 0x63, 0x20, 0x34, 0x7f, 0x9f, 0xc3, 0x7b, 0x3d, 0x5e, 0x25, 0x2f, 0x41, - 0xc4, 0x66, 0xf1, 0x6c, 0x01, 0xd3, 0x2b, 0x72, 0xaf, 0x7d, 0x24, 0xb4, 0xd7, 0x75, 0xd2, 0x39, - 0x4a, 0xd9, 0xc7, 0xc7, 0xf3, 0x44, 0x2a, 0x28, 0xe4, 0x17, 0x4a, 0x49, 0xc5, 0x7b, 0x84, 0x85, - 0x06, 0x65, 0xdd, 0xdd, 0xef, 0x06, 0xfb, 0xd1, 0x8b, 0xa5, 0x98, 0x95, 0x67, 0x84, 0x8e, 0x5e, - 0x05, 0x84, 0xa3, 0x87, 0x39, 0xe7, 0xe2, 0x77, 0xf6, 0xe1, 0x48, 0xc1, 0x65, 0x1c, 0xcd, 0x17, - 0xf6, 0x24, 0x52, 0x41, 0xa9, 0x31, 0xd6, 0xd1, 0x41, 0x17, 0x14, 0x1f, 0x96, 0x61, 0x9a, 0xc6, - 0xd7, 0xa5, 0x1f, 0x2a, 0x89, 0x90, 0x1e, 0x3a, 0x2c, 0x1e, 0x86, 0x33, 0xf9, 0x95, 0x9c, 0x5e, - 0xe5, 0xd5, 0x55, 0x93, 0x99, 0x5c, 0xc9, 0xa1, 0x4c, 0xc6, 0x14, 0xde, 0x8b, 0xd3, 0x24, 0xae, - 0xcc, 0x53, 0xd3, 0xc2, 0x40, 0x68, 0x2f, 0x7c, 0x0e, 0x27, 0x58, 0x59, 0x28, 0x0f, 0xc1, 0x4c, - 0x17, 0x43, 0xfd, 0xfc, 0x42, 0x90, 0x09, 0xd6, 0xa0, 0x42, 0x09, 0x46, 0xc0, 0xce, 0xe3, 0x5f, - 0xec, 0x53, 0x5f, 0x1e, 0xc6, 0xf1, 0x48, 0x45, 0x6b, 0xcd, 0x1f, 0x6c, 0xb4, 0x64, 0x51, 0xeb, - 0xfb, 0xe1, 0x16, 0x23, 0xda, 0x97, 0x3c, 0x4c, 0xd3, 0x0e, 0x4b, 0x1e, 0xa6, 0x69, 0xf7, 0x25, - 0xe7, 0x30, 0xf6, 0x38, 0x86, 0x34, 0x8e, 0xa6, 0xc2, 0x44, 0x32, 0xc9, 0x8a, 0xc9, 0x4a, 0x93, - 0x1e, 0x1b, 0x54, 0xc8, 0x23, 0x01, 0xe3, 0xcc, 0x39, 0x11, 0xda, 0x80, 0x2a, 0x9d, 0x51, 0x99, - 0x83, 0x81, 0x50, 0xe6, 0xf8, 0x1c, 0xae, 0x81, 0x85, 0x32, 0x92, 0x3a, 0xca, 0x26, 0x41, 0xd6, - 0x40, 0x1f, 0x09, 0xd5, 0xc0, 0x3a, 0x89, 0xcb, 0xc5, 0xb9, 0x88, 0xcc, 0xa1, 0xac, 0x3c, 0x51, - 0xe3, 0x6b, 0x4c, 0xa8, 0x5c, 0x34, 0x50, 0xec, 0x6b, 0x62, 0x64, 0x8a, 0x42, 0x4b, 0xfa, 0xaa, - 0x31, 0x21, 0x5f, 0x0d, 0x14, 0x1f, 0x84, 0x9a, 0x78, 0x12, 0x25, 0xd1, 0x72, 0xb5, 0x24, 0x0f, - 0x02, 0x8d, 0x86, 0x0e, 0x42, 0xdb, 0x08, 0x37, 0x81, 0x25, 0xfb, 0x68, 0x62, 0x84, 0x32, 0x78, - 0xb5, 0xf4, 0x12, 0x7c, 0xc8, 0x3a, 0xed, 0x75, 0x62, 0x9d, 0xbb, 0x7f, 0x76, 0xd8, 0x6e, 0x5d, - 0x3e, 0x4d, 0x4c, 0x14, 0x0f, 0x2f, 0x0d, 0x28, 0xfe, 0x7d, 0x07, 0x6b, 0x15, 0x6e, 0xe7, 0xf0, - 0x64, 0xcb, 0x51, 0xf8, 0x62, 0x38, 0x02, 0x4b, 0x69, 0xf2, 0x62, 0x40, 0x7a, 0xe8, 0x62, 0xf0, - 0x30, 0x1c, 0xdc, 0x33, 0x34, 0x87, 0xac, 0x3c, 0x90, 0xc1, 0xad, 0x43, 0xa1, 0xe0, 0x36, 0x59, - 0x9c, 0x4c, 0x58, 0xad, 0x32, 0x9c, 0x4c, 0x26, 0x1a, 0x0d, 0x25, 0x53, 0xdb, 0x08, 0xbc, 0xde, - 0x31, 0x68, 0xd8, 0x98, 0x4c, 0x75, 0x28, 0xb4, 0xde, 0x26, 0x8b, 0xef, 0xdd, 0xe3, 0x24, 0x32, - 0x45, 0xd1, 0x20, 0xef, 0xdd, 0x4a, 0x0e, 0xdd, 0xbb, 0x98, 0x72, 0xc6, 0xff, 0xde, 0x61, 0xb7, - 0x47, 0x32, 0x5d, 0xc5, 0x79, 0xd7, 0x97, 0x0a, 0x05, 0x89, 0xf9, 0x51, 0xae, 0x54, 0x22, 0x62, - 0x4e, 0x05, 0xa7, 0x85, 0xb5, 0x7e, 0x1f, 0x6d, 0x33, 0x04, 0x27, 0x68, 0x36, 0xb9, 0x72, 0xf9, - 0xbc, 0x6d, 0xf2, 0xa5, 0x1e, 0x4a, 0x50, 0x0f, 0xc3, 0x57, 0xc4, 0x73, 0x58, 0x4a, 0x03, 0x65, - 0x0c, 0xa9, 0x91, 0x18, 0x08, 0x5d, 0x11, 0x3e, 0x87, 0x73, 0xe2, 0x34, 0x99, 0x49, 0xcf, 0xcd, - 0x01, 0xd9, 0x9b, 0xf8, 0x50, 0x28, 0x27, 0x9a, 0xac, 0x73, 0xa7, 0x19, 0x2f, 0x97, 0x79, 0x2e, - 0xf4, 0x48, 0xc9, 0x0c, 0x9a, 0xf1, 0xc0, 0xd5, 0x89, 0x30, 0xeb, 0xf2, 0xbb, 0x8e, 0x34, 0xfe, - 0xa0, 0x9c, 0x80, 0xcd, 0xc3, 0xbb, 0xf4, 0x27, 0x90, 0xbf, 0xaa, 0xbd, 0x30, 0xe4, 0x2c, 0xaf, - 0xd9, 0x27, 0x95, 0xe7, 0x31, 0xe8, 0xac, 0xaa, 0xc1, 0x8c, 0x87, 0x67, 0xe8, 0x38, 0xeb, 0xad, - 0xdf, 0x15, 0x77, 0x7e, 0xff, 0xdd, 0x61, 0x9f, 0xd5, 0xee, 0x8e, 0x61, 0x32, 0xcb, 0x3e, 0x79, - 0x8b, 0x5e, 0xe2, 0xc9, 0xe6, 0xbb, 0x06, 0xf3, 0x76, 0x22, 0x3f, 0x6c, 0x3b, 0x0c, 0x77, 0x1a, - 0x65, 0xe0, 0xed, 0x61, 0xb8, 0x47, 0x7e, 0x03, 0x60, 0x24, 0xd4, 0x69, 0xd4, 0x49, 0xe7, 0xe8, - 0x67, 0x76, 0xe3, 0xa9, 0x98, 0x5e, 0xad, 0x52, 0x4e, 0x3d, 0x55, 0x14, 0x92, 0x35, 0xfc, 0x65, - 0x80, 0xb0, 0x06, 0x1f, 0xec, 0x70, 0x95, 0xb5, 0x7e, 0xda, 0x48, 0x05, 0x87, 0x4a, 0x2e, 0x4b, - 0xeb, 0x2d, 0xb5, 0xce, 0xa7, 0xc2, 0xad, 0x5f, 0x03, 0x46, 0x3e, 0xdf, 0xb0, 0x9b, 0x93, 0x58, - 0xac, 0xa1, 0xdc, 0x2f, 0xf2, 0x81, 0xa0, 0xd2, 0x83, 0x0f, 0x04, 0x18, 0xf3, 0x52, 0xde, 0xc8, - 0x34, 0x17, 0xe9, 0x94, 0xb7, 0x6a, 0x30, 0xe5, 0x2b, 0xc8, 0xef, 0x48, 0xca, 0xbf, 0x6d, 0x33, - 0x74, 0x10, 0x1a, 0x5b, 0x6b, 0x83, 0x7a, 0x9d, 0x58, 0x7c, 0x89, 0xe4, 0xbd, 0x42, 0xb1, 0x92, - 0xbd, 0xb6, 0x56, 0xc2, 0x5b, 0xca, 0xfe, 0x06, 0xca, 0x19, 0xbf, 0x66, 0xb7, 0xaa, 0xff, 0x51, - 0x9f, 0xd3, 0x0f, 0x1a, 0x68, 0x76, 0x38, 0x83, 0xce, 0x7c, 0xfd, 0x91, 0x2b, 0xd3, 0x75, 0xeb, - 0x23, 0x57, 0xae, 0x6e, 0x7a, 0xe4, 0x2a, 0x21, 0x6c, 0x39, 0xbb, 0x4d, 0xda, 0xb7, 0xde, 0xa9, - 0x21, 0xcb, 0x08, 0xf2, 0xb6, 0x3e, 0xfb, 0x0b, 0x97, 0xee, 0x83, 0xb6, 0x94, 0x24, 0x0a, 0x77, - 0xaf, 0x13, 0x8b, 0x3f, 0xc9, 0xac, 0x5a, 0x95, 0xd6, 0x90, 0x8d, 0x46, 0x61, 0xbd, 0xdf, 0x0d, - 0xc6, 0xef, 0xa4, 0x67, 0x79, 0x17, 0x48, 0xbd, 0x93, 0x9e, 0xe1, 0xd6, 0xef, 0x4e, 0x3b, 0x60, - 0xad, 0x3d, 0x7d, 0xfc, 0xeb, 0xc3, 0x75, 0x64, 0x40, 0xeb, 0x7e, 0x24, 0x07, 0xc5, 0xaf, 0xc1, - 0x5c, 0x0e, 0xd6, 0x66, 0x90, 0x3f, 0xf9, 0x0e, 0xa8, 0x07, 0xe2, 0x8b, 0x1b, 0xb9, 0xf6, 0xf8, - 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x3f, 0xf9, 0x7a, 0x5b, 0x16, 0x00, 0x00, + 0x10, 0xc7, 0xa9, 0xc4, 0x9d, 0x84, 0x79, 0x36, 0x88, 0x93, 0x8a, 0x04, 0x07, 0xd7, 0x83, 0xe3, + 0x0e, 0x9a, 0x7b, 0xe0, 0x78, 0x9f, 0x7b, 0x68, 0xaf, 0xa8, 0x15, 0x21, 0xe9, 0x03, 0x02, 0x09, + 0xc9, 0x4d, 0xa6, 0x89, 0xe9, 0xc6, 0x5e, 0x6c, 0x27, 0xa2, 0xaf, 0x90, 0x78, 0x8b, 0xc4, 0x07, + 0xe2, 0xd3, 0x9d, 0xb2, 0x59, 0x7b, 0xc7, 0xbb, 0xb3, 0xce, 0xf6, 0x5d, 0x94, 0xf9, 0xcd, 0xfc, + 0xed, 0xd9, 0xf1, 0x8c, 0x77, 0xd9, 0xb6, 0x13, 0xe7, 0x19, 0xb8, 0xb9, 0x50, 0x62, 0x0a, 0xc6, + 0x82, 0x59, 0xca, 0x31, 0xec, 0xe6, 0x46, 0x3b, 0xcd, 0x3f, 0xa6, 0x6c, 0xdb, 0xb7, 0xa2, 0x7f, + 0x27, 0xc2, 0x89, 0x35, 0xfe, 0xf8, 0xff, 0x1d, 0xf6, 0xee, 0x71, 0x61, 0x3b, 0x5a, 0xdb, 0xf8, + 0x01, 0x7b, 0x73, 0x20, 0xd5, 0x94, 0x7f, 0xb6, 0xdb, 0xf4, 0x59, 0x19, 0x86, 0xf0, 0xe7, 0x02, + 0xac, 0xdb, 0xfe, 0xbc, 0xd5, 0x6e, 0x73, 0xad, 0x2c, 0x7c, 0xf9, 0x06, 0x3f, 0x64, 0x37, 0x46, + 0x19, 0x40, 0xce, 0x29, 0xb6, 0xb0, 0xf8, 0x60, 0xb7, 0xdb, 0x81, 0x10, 0xed, 0x77, 0xf6, 0xf6, + 0xcb, 0xbf, 0x60, 0xbc, 0x70, 0xf0, 0x4a, 0xeb, 0x4b, 0x7e, 0x97, 0x70, 0x41, 0x76, 0x1f, 0xf9, + 0xab, 0x4d, 0x58, 0x88, 0xff, 0x0b, 0x7b, 0x6b, 0x1f, 0xdc, 0x68, 0x3c, 0x83, 0xb9, 0xe0, 0x77, + 0x08, 0xb7, 0x60, 0xf5, 0xb1, 0x77, 0xd2, 0x50, 0x88, 0x3c, 0x65, 0xef, 0xed, 0x83, 0x1b, 0x80, + 0x99, 0x4b, 0x6b, 0xa5, 0x56, 0x96, 0xdf, 0xa3, 0x3d, 0x11, 0xe2, 0x35, 0xbe, 0xe9, 0x40, 0xe2, + 0x14, 0x8d, 0xc0, 0x0d, 0x41, 0x4c, 0x7e, 0x52, 0xd9, 0x15, 0x99, 0x22, 0x64, 0x4f, 0xa5, 0x28, + 0xc2, 0x42, 0x7c, 0xc1, 0xde, 0x29, 0x0d, 0x67, 0x46, 0x3a, 0xe0, 0x09, 0xcf, 0x02, 0xf0, 0x0a, + 0x5f, 0x6f, 0xe4, 0x82, 0xc4, 0x6f, 0x8c, 0x3d, 0x9f, 0x09, 0x35, 0x85, 0xe3, 0xab, 0x1c, 0x38, + 0x95, 0xe1, 0xca, 0xec, 0xc3, 0xdf, 0xdd, 0x40, 0xe1, 0xf5, 0x0f, 0xe1, 0xc2, 0x80, 0x9d, 0x8d, + 0x9c, 0x68, 0x59, 0x3f, 0x06, 0x52, 0xeb, 0x8f, 0x39, 0xfc, 0xac, 0x87, 0x0b, 0xf5, 0x0a, 0x44, + 0xe6, 0x66, 0xcf, 0x67, 0x30, 0xbe, 0x24, 0x9f, 0x75, 0x8c, 0xa4, 0x9e, 0x75, 0x9d, 0x0c, 0x42, + 0x39, 0xfb, 0xf0, 0x60, 0xaa, 0xb4, 0x81, 0xb5, 0xf9, 0xa5, 0x31, 0xda, 0xf0, 0x07, 0x44, 0x84, + 0x06, 0xe5, 0xe5, 0xbe, 0xed, 0x06, 0xc7, 0xd9, 0xcb, 0xb4, 0x98, 0x94, 0x67, 0x84, 0xce, 0x5e, + 0x05, 0xa4, 0xb3, 0x87, 0xb9, 0x20, 0xf1, 0x07, 0x7b, 0x7f, 0x60, 0xe0, 0x22, 0x93, 0xd3, 0x99, + 0x3f, 0x89, 0x54, 0x52, 0x6a, 0x8c, 0x17, 0xba, 0xdf, 0x05, 0xc5, 0x87, 0xa5, 0x9f, 0xe7, 0xd9, + 0x55, 0xa9, 0x43, 0x15, 0x11, 0xb2, 0xa7, 0x0e, 0x4b, 0x84, 0xe1, 0x4a, 0x3e, 0xd4, 0xe3, 0xcb, + 0xa2, 0xbb, 0x5a, 0xb2, 0x92, 0x2b, 0x73, 0xaa, 0x92, 0x31, 0x85, 0x9f, 0xc5, 0x89, 0xca, 0xaa, + 0xf0, 0xd4, 0xb2, 0x30, 0x90, 0x7a, 0x16, 0x31, 0x87, 0x0b, 0xac, 0x6c, 0x94, 0x7b, 0xe0, 0xc6, + 0xb3, 0xbe, 0x7d, 0x71, 0x2e, 0xc8, 0x02, 0x6b, 0x50, 0xa9, 0x02, 0x23, 0xe0, 0xa0, 0xf8, 0x37, + 0xfb, 0x24, 0x36, 0xf7, 0xb3, 0x6c, 0x60, 0xe4, 0xd2, 0xf2, 0x87, 0x1b, 0x23, 0x79, 0xd4, 0x6b, + 0x3f, 0xba, 0x86, 0x47, 0xfb, 0x96, 0xfb, 0x79, 0xde, 0x61, 0xcb, 0xfd, 0x3c, 0xef, 0xbe, 0xe5, + 0x02, 0xc6, 0x8a, 0x43, 0xc8, 0x33, 0x39, 0x16, 0x4e, 0x6a, 0xb5, 0x6a, 0x26, 0x0b, 0x4b, 0x2a, + 0x36, 0xa8, 0x94, 0x22, 0x01, 0xe3, 0xca, 0x39, 0x12, 0xd6, 0x81, 0x29, 0xc5, 0xa8, 0xca, 0xc1, + 0x40, 0xaa, 0x72, 0x62, 0x0e, 0xf7, 0xc0, 0xb5, 0x65, 0xa0, 0xad, 0x5c, 0x2d, 0x82, 0xec, 0x81, + 0x31, 0x92, 0xea, 0x81, 0x75, 0x12, 0xb7, 0x8b, 0x33, 0x21, 0xdd, 0x9e, 0xae, 0x94, 0x28, 0xff, + 0x1a, 0x93, 0x6a, 0x17, 0x0d, 0x14, 0x6b, 0x8d, 0x9c, 0xce, 0x51, 0x6a, 0x49, 0xad, 0x1a, 0x93, + 0xd2, 0x6a, 0xa0, 0xf8, 0x20, 0xd4, 0x8c, 0x47, 0x52, 0xc9, 0xf9, 0x62, 0x4e, 0x1e, 0x04, 0x1a, + 0x4d, 0x1d, 0x84, 0x36, 0x8f, 0xb0, 0x80, 0x39, 0xfb, 0x60, 0xe4, 0x84, 0x71, 0x78, 0xb7, 0xf4, + 0x16, 0x62, 0xc8, 0x8b, 0x3e, 0xe8, 0xc4, 0x06, 0xb9, 0x7f, 0xb7, 0xd8, 0x76, 0xdd, 0x7c, 0xa2, + 0x9c, 0xcc, 0xfa, 0x17, 0x0e, 0x0c, 0xff, 0xbe, 0x43, 0xb4, 0x0a, 0xf7, 0x6b, 0x78, 0x7a, 0x4d, + 0x2f, 0x3c, 0x18, 0xf6, 0xc1, 0x53, 0x96, 0x1c, 0x0c, 0xc8, 0x9e, 0x1a, 0x0c, 0x11, 0x86, 0x93, + 0x7b, 0x8a, 0xd6, 0xb0, 0x6a, 0x0f, 0x64, 0x72, 0xeb, 0x50, 0x2a, 0xb9, 0x4d, 0x16, 0x17, 0x13, + 0xb6, 0x56, 0x15, 0x4e, 0x16, 0x13, 0x8d, 0xa6, 0x8a, 0xa9, 0xcd, 0x03, 0xef, 0x77, 0x08, 0x16, + 0x36, 0x16, 0x53, 0x1d, 0x4a, 0xed, 0xb7, 0xc9, 0xe2, 0xb9, 0x7b, 0xa0, 0xa4, 0x5b, 0x37, 0x0d, + 0x72, 0xee, 0x56, 0xe6, 0xd4, 0xdc, 0xc5, 0x54, 0x08, 0xfe, 0xcf, 0x16, 0xbb, 0x35, 0xd0, 0xf9, + 0x22, 0x2b, 0x6e, 0x7d, 0xb9, 0x30, 0xa0, 0xdc, 0x8f, 0x7a, 0x61, 0x94, 0xc8, 0x38, 0x95, 0x9c, + 0x16, 0xd6, 0xeb, 0x3e, 0xbe, 0x8e, 0x0b, 0x2e, 0xd0, 0xd5, 0xe2, 0xca, 0xed, 0xf3, 0xb6, 0xc5, + 0x97, 0xf6, 0x54, 0x81, 0x46, 0x18, 0x1e, 0x11, 0x2f, 0x60, 0xae, 0x1d, 0x94, 0x39, 0xa4, 0x3c, + 0x31, 0x90, 0x1a, 0x11, 0x31, 0x87, 0x6b, 0xe2, 0x44, 0x4d, 0x74, 0x24, 0x73, 0x9f, 0xbc, 0x9b, + 0xc4, 0x50, 0xaa, 0x26, 0x9a, 0x6c, 0x90, 0xb3, 0x8c, 0x97, 0xdb, 0x3c, 0x13, 0x76, 0x60, 0xf4, + 0x0a, 0x9a, 0xf0, 0xc4, 0xe8, 0x44, 0x98, 0x97, 0xfc, 0xae, 0x23, 0x8d, 0x5f, 0x28, 0x47, 0xe0, + 0xeb, 0xf0, 0x0e, 0xfd, 0x0a, 0x14, 0xef, 0x6a, 0x27, 0x0d, 0x85, 0xc8, 0x4b, 0xf6, 0x51, 0xa5, + 0x3c, 0x04, 0xbb, 0xea, 0x6a, 0x30, 0xe1, 0xe9, 0x15, 0x06, 0xce, 0xab, 0xed, 0x76, 0xc5, 0x83, + 0xee, 0x7f, 0x5b, 0xec, 0xd3, 0xda, 0xec, 0xe8, 0xab, 0xc9, 0xea, 0x95, 0x77, 0x7d, 0x97, 0x78, + 0xba, 0x79, 0xd6, 0x60, 0xde, 0x2f, 0xe4, 0x87, 0xeb, 0xba, 0xe1, 0x9b, 0x46, 0x99, 0x78, 0x7f, + 0x18, 0xee, 0x91, 0xef, 0x00, 0x18, 0x49, 0xdd, 0x34, 0xea, 0x64, 0x10, 0xfa, 0x99, 0xdd, 0x7c, + 0x26, 0xc6, 0x97, 0x8b, 0x9c, 0x53, 0x9f, 0x2a, 0xd6, 0x26, 0x1f, 0xf8, 0x8b, 0x04, 0xe1, 0x03, + 0x3e, 0xdc, 0xe2, 0x66, 0x75, 0xf5, 0xb3, 0x4e, 0x1b, 0xd8, 0x33, 0x7a, 0x5e, 0x46, 0x6f, 0xe9, + 0x75, 0x31, 0x95, 0xbe, 0xfa, 0x35, 0x60, 0xa4, 0x79, 0xc8, 0x6e, 0x9c, 0x16, 0xf3, 0x86, 0xfa, + 0x22, 0x73, 0x8a, 0x87, 0xcc, 0xed, 0x76, 0xc0, 0xc7, 0x7b, 0xf6, 0xe4, 0xd7, 0x47, 0x4b, 0xe9, + 0xc0, 0xda, 0x5d, 0xa9, 0x7b, 0xeb, 0x5f, 0xbd, 0xa9, 0xee, 0x2d, 0x5d, 0xaf, 0xf8, 0xb8, 0xd4, + 0xa3, 0x3e, 0x45, 0x9d, 0xdf, 0x2c, 0x6c, 0x4f, 0x5e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xba, 0xb0, + 0x28, 0x40, 0xc5, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -190,24 +182,6 @@ type TabletManagerClient interface { Backup(ctx context.Context, in *tabletmanagerdata.BackupRequest, opts ...grpc.CallOption) (TabletManager_BackupClient, error) // RestoreFromBackup deletes all local data and restores it from the latest backup. RestoreFromBackup(ctx context.Context, in *tabletmanagerdata.RestoreFromBackupRequest, opts ...grpc.CallOption) (TabletManager_RestoreFromBackupClient, error) - // Deprecated - remove after 7.0 - SlaveStatus(ctx context.Context, in *tabletmanagerdata.SlaveStatusRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveStatusResponse, error) - // Deprecated - StopSlave(ctx context.Context, in *tabletmanagerdata.StopSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveResponse, error) - // Deprecated - StopSlaveMinimum(ctx context.Context, in *tabletmanagerdata.StopSlaveMinimumRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveMinimumResponse, error) - // Deprecated - StartSlave(ctx context.Context, in *tabletmanagerdata.StartSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StartSlaveResponse, error) - // Deprecated - StartSlaveUntilAfter(ctx context.Context, in *tabletmanagerdata.StartSlaveUntilAfterRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StartSlaveUntilAfterResponse, error) - // Deprecated - GetSlaves(ctx context.Context, in *tabletmanagerdata.GetSlavesRequest, opts ...grpc.CallOption) (*tabletmanagerdata.GetSlavesResponse, error) - // Deprecated - InitSlave(ctx context.Context, in *tabletmanagerdata.InitSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.InitSlaveResponse, error) - // Deprecated - SlaveWasPromoted(ctx context.Context, in *tabletmanagerdata.SlaveWasPromotedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasPromotedResponse, error) - // Deprecated - SlaveWasRestarted(ctx context.Context, in *tabletmanagerdata.SlaveWasRestartedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasRestartedResponse, error) // Generic VExec request. Can be used for various purposes VExec(ctx context.Context, in *tabletmanagerdata.VExecRequest, opts ...grpc.CallOption) (*tabletmanagerdata.VExecResponse, error) } @@ -653,87 +627,6 @@ func (x *tabletManagerRestoreFromBackupClient) Recv() (*tabletmanagerdata.Restor return m, nil } -func (c *tabletManagerClient) SlaveStatus(ctx context.Context, in *tabletmanagerdata.SlaveStatusRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveStatusResponse, error) { - out := new(tabletmanagerdata.SlaveStatusResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveStatus", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) StopSlave(ctx context.Context, in *tabletmanagerdata.StopSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveResponse, error) { - out := new(tabletmanagerdata.StopSlaveResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlave", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) StopSlaveMinimum(ctx context.Context, in *tabletmanagerdata.StopSlaveMinimumRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StopSlaveMinimumResponse, error) { - out := new(tabletmanagerdata.StopSlaveMinimumResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StopSlaveMinimum", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) StartSlave(ctx context.Context, in *tabletmanagerdata.StartSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StartSlaveResponse, error) { - out := new(tabletmanagerdata.StartSlaveResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StartSlave", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) StartSlaveUntilAfter(ctx context.Context, in *tabletmanagerdata.StartSlaveUntilAfterRequest, opts ...grpc.CallOption) (*tabletmanagerdata.StartSlaveUntilAfterResponse, error) { - out := new(tabletmanagerdata.StartSlaveUntilAfterResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/StartSlaveUntilAfter", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) GetSlaves(ctx context.Context, in *tabletmanagerdata.GetSlavesRequest, opts ...grpc.CallOption) (*tabletmanagerdata.GetSlavesResponse, error) { - out := new(tabletmanagerdata.GetSlavesResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/GetSlaves", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) InitSlave(ctx context.Context, in *tabletmanagerdata.InitSlaveRequest, opts ...grpc.CallOption) (*tabletmanagerdata.InitSlaveResponse, error) { - out := new(tabletmanagerdata.InitSlaveResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/InitSlave", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) SlaveWasPromoted(ctx context.Context, in *tabletmanagerdata.SlaveWasPromotedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasPromotedResponse, error) { - out := new(tabletmanagerdata.SlaveWasPromotedResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasPromoted", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *tabletManagerClient) SlaveWasRestarted(ctx context.Context, in *tabletmanagerdata.SlaveWasRestartedRequest, opts ...grpc.CallOption) (*tabletmanagerdata.SlaveWasRestartedResponse, error) { - out := new(tabletmanagerdata.SlaveWasRestartedResponse) - err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/SlaveWasRestarted", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *tabletManagerClient) VExec(ctx context.Context, in *tabletmanagerdata.VExecRequest, opts ...grpc.CallOption) (*tabletmanagerdata.VExecResponse, error) { out := new(tabletmanagerdata.VExecResponse) err := c.cc.Invoke(ctx, "/tabletmanagerservice.TabletManager/VExec", in, out, opts...) @@ -820,24 +713,6 @@ type TabletManagerServer interface { Backup(*tabletmanagerdata.BackupRequest, TabletManager_BackupServer) error // RestoreFromBackup deletes all local data and restores it from the latest backup. RestoreFromBackup(*tabletmanagerdata.RestoreFromBackupRequest, TabletManager_RestoreFromBackupServer) error - // Deprecated - remove after 7.0 - SlaveStatus(context.Context, *tabletmanagerdata.SlaveStatusRequest) (*tabletmanagerdata.SlaveStatusResponse, error) - // Deprecated - StopSlave(context.Context, *tabletmanagerdata.StopSlaveRequest) (*tabletmanagerdata.StopSlaveResponse, error) - // Deprecated - StopSlaveMinimum(context.Context, *tabletmanagerdata.StopSlaveMinimumRequest) (*tabletmanagerdata.StopSlaveMinimumResponse, error) - // Deprecated - StartSlave(context.Context, *tabletmanagerdata.StartSlaveRequest) (*tabletmanagerdata.StartSlaveResponse, error) - // Deprecated - StartSlaveUntilAfter(context.Context, *tabletmanagerdata.StartSlaveUntilAfterRequest) (*tabletmanagerdata.StartSlaveUntilAfterResponse, error) - // Deprecated - GetSlaves(context.Context, *tabletmanagerdata.GetSlavesRequest) (*tabletmanagerdata.GetSlavesResponse, error) - // Deprecated - InitSlave(context.Context, *tabletmanagerdata.InitSlaveRequest) (*tabletmanagerdata.InitSlaveResponse, error) - // Deprecated - SlaveWasPromoted(context.Context, *tabletmanagerdata.SlaveWasPromotedRequest) (*tabletmanagerdata.SlaveWasPromotedResponse, error) - // Deprecated - SlaveWasRestarted(context.Context, *tabletmanagerdata.SlaveWasRestartedRequest) (*tabletmanagerdata.SlaveWasRestartedResponse, error) // Generic VExec request. Can be used for various purposes VExec(context.Context, *tabletmanagerdata.VExecRequest) (*tabletmanagerdata.VExecResponse, error) } @@ -975,33 +850,6 @@ func (*UnimplementedTabletManagerServer) Backup(req *tabletmanagerdata.BackupReq func (*UnimplementedTabletManagerServer) RestoreFromBackup(req *tabletmanagerdata.RestoreFromBackupRequest, srv TabletManager_RestoreFromBackupServer) error { return status.Errorf(codes.Unimplemented, "method RestoreFromBackup not implemented") } -func (*UnimplementedTabletManagerServer) SlaveStatus(ctx context.Context, req *tabletmanagerdata.SlaveStatusRequest) (*tabletmanagerdata.SlaveStatusResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SlaveStatus not implemented") -} -func (*UnimplementedTabletManagerServer) StopSlave(ctx context.Context, req *tabletmanagerdata.StopSlaveRequest) (*tabletmanagerdata.StopSlaveResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StopSlave not implemented") -} -func (*UnimplementedTabletManagerServer) StopSlaveMinimum(ctx context.Context, req *tabletmanagerdata.StopSlaveMinimumRequest) (*tabletmanagerdata.StopSlaveMinimumResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StopSlaveMinimum not implemented") -} -func (*UnimplementedTabletManagerServer) StartSlave(ctx context.Context, req *tabletmanagerdata.StartSlaveRequest) (*tabletmanagerdata.StartSlaveResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StartSlave not implemented") -} -func (*UnimplementedTabletManagerServer) StartSlaveUntilAfter(ctx context.Context, req *tabletmanagerdata.StartSlaveUntilAfterRequest) (*tabletmanagerdata.StartSlaveUntilAfterResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method StartSlaveUntilAfter not implemented") -} -func (*UnimplementedTabletManagerServer) GetSlaves(ctx context.Context, req *tabletmanagerdata.GetSlavesRequest) (*tabletmanagerdata.GetSlavesResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetSlaves not implemented") -} -func (*UnimplementedTabletManagerServer) InitSlave(ctx context.Context, req *tabletmanagerdata.InitSlaveRequest) (*tabletmanagerdata.InitSlaveResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method InitSlave not implemented") -} -func (*UnimplementedTabletManagerServer) SlaveWasPromoted(ctx context.Context, req *tabletmanagerdata.SlaveWasPromotedRequest) (*tabletmanagerdata.SlaveWasPromotedResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SlaveWasPromoted not implemented") -} -func (*UnimplementedTabletManagerServer) SlaveWasRestarted(ctx context.Context, req *tabletmanagerdata.SlaveWasRestartedRequest) (*tabletmanagerdata.SlaveWasRestartedResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SlaveWasRestarted not implemented") -} func (*UnimplementedTabletManagerServer) VExec(ctx context.Context, req *tabletmanagerdata.VExecRequest) (*tabletmanagerdata.VExecResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method VExec not implemented") } @@ -1790,168 +1638,6 @@ func (x *tabletManagerRestoreFromBackupServer) Send(m *tabletmanagerdata.Restore return x.ServerStream.SendMsg(m) } -func _TabletManager_SlaveStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.SlaveStatusRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).SlaveStatus(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/SlaveStatus", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).SlaveStatus(ctx, req.(*tabletmanagerdata.SlaveStatusRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_StopSlave_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.StopSlaveRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).StopSlave(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/StopSlave", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).StopSlave(ctx, req.(*tabletmanagerdata.StopSlaveRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_StopSlaveMinimum_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.StopSlaveMinimumRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).StopSlaveMinimum(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/StopSlaveMinimum", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).StopSlaveMinimum(ctx, req.(*tabletmanagerdata.StopSlaveMinimumRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_StartSlave_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.StartSlaveRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).StartSlave(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/StartSlave", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).StartSlave(ctx, req.(*tabletmanagerdata.StartSlaveRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_StartSlaveUntilAfter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.StartSlaveUntilAfterRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).StartSlaveUntilAfter(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/StartSlaveUntilAfter", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).StartSlaveUntilAfter(ctx, req.(*tabletmanagerdata.StartSlaveUntilAfterRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_GetSlaves_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.GetSlavesRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).GetSlaves(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/GetSlaves", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).GetSlaves(ctx, req.(*tabletmanagerdata.GetSlavesRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_InitSlave_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.InitSlaveRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).InitSlave(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/InitSlave", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).InitSlave(ctx, req.(*tabletmanagerdata.InitSlaveRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_SlaveWasPromoted_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.SlaveWasPromotedRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).SlaveWasPromoted(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/SlaveWasPromoted", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).SlaveWasPromoted(ctx, req.(*tabletmanagerdata.SlaveWasPromotedRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _TabletManager_SlaveWasRestarted_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(tabletmanagerdata.SlaveWasRestartedRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(TabletManagerServer).SlaveWasRestarted(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tabletmanagerservice.TabletManager/SlaveWasRestarted", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TabletManagerServer).SlaveWasRestarted(ctx, req.(*tabletmanagerdata.SlaveWasRestartedRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _TabletManager_VExec_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(tabletmanagerdata.VExecRequest) if err := dec(in); err != nil { @@ -2138,42 +1824,6 @@ var _TabletManager_serviceDesc = grpc.ServiceDesc{ MethodName: "PromoteReplica", Handler: _TabletManager_PromoteReplica_Handler, }, - { - MethodName: "SlaveStatus", - Handler: _TabletManager_SlaveStatus_Handler, - }, - { - MethodName: "StopSlave", - Handler: _TabletManager_StopSlave_Handler, - }, - { - MethodName: "StopSlaveMinimum", - Handler: _TabletManager_StopSlaveMinimum_Handler, - }, - { - MethodName: "StartSlave", - Handler: _TabletManager_StartSlave_Handler, - }, - { - MethodName: "StartSlaveUntilAfter", - Handler: _TabletManager_StartSlaveUntilAfter_Handler, - }, - { - MethodName: "GetSlaves", - Handler: _TabletManager_GetSlaves_Handler, - }, - { - MethodName: "InitSlave", - Handler: _TabletManager_InitSlave_Handler, - }, - { - MethodName: "SlaveWasPromoted", - Handler: _TabletManager_SlaveWasPromoted_Handler, - }, - { - MethodName: "SlaveWasRestarted", - Handler: _TabletManager_SlaveWasRestarted_Handler, - }, { MethodName: "VExec", Handler: _TabletManager_VExec_Handler, diff --git a/go/vt/vtcombo/tablet_map.go b/go/vt/vtcombo/tablet_map.go index 5f364585c23..ec8b8319f3c 100644 --- a/go/vt/vtcombo/tablet_map.go +++ b/go/vt/vtcombo/tablet_map.go @@ -657,11 +657,6 @@ func (itmc *internalTabletManagerClient) ExecuteFetchAsApp(ctx context.Context, return nil, fmt.Errorf("not implemented in vtcombo") } -// Deprecated -func (itmc *internalTabletManagerClient) SlaveStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.Status, error) { - return nil, fmt.Errorf("not implemented in vtcombo") -} - func (itmc *internalTabletManagerClient) MasterStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.MasterStatus, error) { return nil, fmt.Errorf("not implemented in vtcombo") } @@ -674,31 +669,6 @@ func (itmc *internalTabletManagerClient) WaitForPosition(ctx context.Context, ta return fmt.Errorf("not implemented in vtcombo") } -// Deprecated -func (itmc *internalTabletManagerClient) StopSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - return fmt.Errorf("not implemented in vtcombo") -} - -// Deprecated -func (itmc *internalTabletManagerClient) StopSlaveMinimum(ctx context.Context, tablet *topodatapb.Tablet, stopPos string, waitTime time.Duration) (string, error) { - return "", fmt.Errorf("not implemented in vtcombo") -} - -// Deprecated -func (itmc *internalTabletManagerClient) StartSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - return fmt.Errorf("not implemented in vtcombo") -} - -// Deprecated -func (itmc *internalTabletManagerClient) StartSlaveUntilAfter(ctx context.Context, tablet *topodatapb.Tablet, position string, duration time.Duration) error { - return fmt.Errorf("not implemented in vtcombo") -} - -// Deprecated -func (itmc *internalTabletManagerClient) GetSlaves(ctx context.Context, tablet *topodatapb.Tablet) ([]string, error) { - return nil, fmt.Errorf("not implemented in vtcombo") -} - func (itmc *internalTabletManagerClient) VExec(ctx context.Context, tablet *topodatapb.Tablet, query, workflow, keyspace string) (*querypb.QueryResult, error) { return nil, fmt.Errorf("not implemented in vtcombo") } @@ -723,11 +693,6 @@ func (itmc *internalTabletManagerClient) PopulateReparentJournal(ctx context.Con return fmt.Errorf("not implemented in vtcombo") } -// Deprecated -func (itmc *internalTabletManagerClient) InitSlave(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64) error { - return fmt.Errorf("not implemented in vtcombo") -} - func (itmc *internalTabletManagerClient) DemoteMaster(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.MasterStatus, error) { return nil, fmt.Errorf("not implemented in vtcombo") } @@ -736,20 +701,10 @@ func (itmc *internalTabletManagerClient) UndoDemoteMaster(ctx context.Context, t return fmt.Errorf("not implemented in vtcombo") } -// Deprecated -func (itmc *internalTabletManagerClient) SlaveWasPromoted(ctx context.Context, tablet *topodatapb.Tablet) error { - return fmt.Errorf("not implemented in vtcombo") -} - func (itmc *internalTabletManagerClient) SetMaster(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, timeCreatedNS int64, waitPosition string, forceStartSlave bool) error { return fmt.Errorf("not implemented in vtcombo") } -// Deprecated -func (itmc *internalTabletManagerClient) SlaveWasRestarted(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias) error { - return fmt.Errorf("not implemented in vtcombo") -} - func (itmc *internalTabletManagerClient) StopReplicationAndGetStatus(ctx context.Context, tablet *topodatapb.Tablet, stopReplicationMode replicationdatapb.StopReplicationMode) (*replicationdatapb.Status, *replicationdatapb.StopReplicationStatus, error) { return nil, nil, fmt.Errorf("not implemented in vtcombo") } diff --git a/go/vt/vtctl/reparent.go b/go/vt/vtctl/reparent.go index b4cca092825..9e2c416b769 100644 --- a/go/vt/vtctl/reparent.go +++ b/go/vt/vtctl/reparent.go @@ -83,12 +83,7 @@ func commandInitShardMaster(ctx context.Context, wr *wrangler.Wrangler, subFlags } force := subFlags.Bool("force", false, "will force the reparent even if the provided tablet is not a master or the shard master") - // for backwards compatibility - deprecatedTimeout := subFlags.Duration("wait_slave_timeout", *topo.RemoteOperationTimeout, "DEPRECATED -- use -wait_replicas_timeout") waitReplicasTimeout := subFlags.Duration("wait_replicas_timeout", *topo.RemoteOperationTimeout, "time to wait for replicas to catch up in reparenting") - if *deprecatedTimeout != *topo.RemoteOperationTimeout { - *waitReplicasTimeout = *deprecatedTimeout - } if err := subFlags.Parse(args); err != nil { return err } @@ -111,12 +106,7 @@ func commandPlannedReparentShard(ctx context.Context, wr *wrangler.Wrangler, sub return fmt.Errorf("active reparent commands disabled (unset the -disable_active_reparents flag to enable)") } - // for backwards compatibility - deprecatedTimeout := subFlags.Duration("wait_slave_timeout", *topo.RemoteOperationTimeout, "DEPRECATED -- use -wait_replicas_timeout") waitReplicasTimeout := subFlags.Duration("wait_replicas_timeout", *topo.RemoteOperationTimeout, "time to wait for replicas to catch up on replication before and after reparenting") - if *deprecatedTimeout != *topo.RemoteOperationTimeout { - *waitReplicasTimeout = *deprecatedTimeout - } keyspaceShard := subFlags.String("keyspace_shard", "", "keyspace/shard of the shard that needs to be reparented") newMaster := subFlags.String("new_master", "", "alias of a tablet that should be the new master") avoidMaster := subFlags.String("avoid_master", "", "alias of a tablet that should not be the master, i.e. reparent to any other tablet if this one is the master") @@ -159,12 +149,7 @@ func commandEmergencyReparentShard(ctx context.Context, wr *wrangler.Wrangler, s return fmt.Errorf("active reparent commands disabled (unset the -disable_active_reparents flag to enable)") } - // for backwards compatibility - deprecatedTimeout := subFlags.Duration("wait_slave_timeout", *topo.RemoteOperationTimeout, "DEPRECATED -- use -wait_replicas_timeout") waitReplicasTimeout := subFlags.Duration("wait_replicas_timeout", *topo.RemoteOperationTimeout, "time to wait for replicas to catch up in reparenting") - if *deprecatedTimeout != *topo.RemoteOperationTimeout { - *waitReplicasTimeout = *deprecatedTimeout - } keyspaceShard := subFlags.String("keyspace_shard", "", "keyspace/shard of the shard that needs to be reparented") newMaster := subFlags.String("new_master", "", "optional alias of a tablet that should be the new master. If not specified, Vitess will select the best candidate") ignoreReplicasList := subFlags.String("ignore_replicas", "", "comma-separated list of replica tablet aliases to ignore during emergency reparent") diff --git a/go/vt/vtctl/vtctl.go b/go/vt/vtctl/vtctl.go index ef286c311a9..54701e6e06a 100644 --- a/go/vt/vtctl/vtctl.go +++ b/go/vt/vtctl/vtctl.go @@ -175,22 +175,12 @@ var commands = []commandGroup{ {"SetReadWrite", commandSetReadWrite, "", "Sets the tablet as read-write."}, - {"StartSlave", commandStartReplication, - "DEPRECATED -- Use StartReplication ", - "Starts replication on the specified tablet."}, {"StartReplication", commandStartReplication, "", "Starts replication on the specified tablet."}, - {"StopSlave", commandStopReplication, - "DEPRECATED -- Use StopReplication ", - "Stops replication on the specified tablet."}, {"StopReplication", commandStopReplication, "", "Stops replication on the specified tablet."}, - {"ChangeSlaveType", commandChangeTabletType, - "DEPRECATED -- Use ChangeTabletType [-dry-run] ", - "Changes the db type for the specified tablet, if possible. This command is used primarily to arrange replicas, and it will not convert a master.\n" + - "NOTE: This command automatically updates the serving graph.\n"}, {"ChangeTabletType", commandChangeTabletType, "[-dry-run] ", "Changes the db type for the specified tablet, if possible. This command is used primarily to arrange replicas, and it will not convert a master.\n" + @@ -2454,12 +2444,7 @@ func commandApplySchema(ctx context.Context, wr *wrangler.Wrangler, subFlags *fl sql := subFlags.String("sql", "", "A list of semicolon-delimited SQL commands") sqlFile := subFlags.String("sql-file", "", "Identifies the file that contains the SQL commands") ddlStrategy := subFlags.String("ddl_strategy", "", "Online DDL strategy, compatible with @@ddl_strategy session variable (examples: 'gh-ost', 'pt-osc', 'gh-ost --max-load=Threads_running=100'") - // for backwards compatibility - deprecatedTimeout := subFlags.Duration("wait_slave_timeout", wrangler.DefaultWaitReplicasTimeout, "DEPRECATED -- use -wait_replicas_timeout") waitReplicasTimeout := subFlags.Duration("wait_replicas_timeout", wrangler.DefaultWaitReplicasTimeout, "The amount of time to wait for replicas to receive the schema change via replication.") - if *deprecatedTimeout != wrangler.DefaultWaitReplicasTimeout { - *waitReplicasTimeout = *deprecatedTimeout - } if err := subFlags.Parse(args); err != nil { return err } @@ -2569,11 +2554,7 @@ func commandCopySchemaShard(ctx context.Context, wr *wrangler.Wrangler, subFlags includeViews := subFlags.Bool("include-views", true, "Includes views in the output") skipVerify := subFlags.Bool("skip-verify", false, "Skip verification of source and target schema after copy") // for backwards compatibility - deprecatedTimeout := subFlags.Duration("wait_slave_timeout", wrangler.DefaultWaitReplicasTimeout, "DEPRECATED -- use -wait_replicas_timeout") waitReplicasTimeout := subFlags.Duration("wait_replicas_timeout", wrangler.DefaultWaitReplicasTimeout, "The amount of time to wait for replicas to receive the schema change via replication.") - if *deprecatedTimeout != wrangler.DefaultWaitReplicasTimeout { - *waitReplicasTimeout = *deprecatedTimeout - } if err := subFlags.Parse(args); err != nil { return err } diff --git a/go/vt/vttablet/faketmclient/fake_client.go b/go/vt/vttablet/faketmclient/fake_client.go index 38229216c97..93a1e20190c 100644 --- a/go/vt/vttablet/faketmclient/fake_client.go +++ b/go/vt/vttablet/faketmclient/fake_client.go @@ -231,7 +231,8 @@ func (client *FakeTabletManagerClient) WaitForPosition(ctx context.Context, tabl return nil } -func (c *FakeTabletManagerClient) VExec(ctx context.Context, tablet *topodatapb.Tablet, query, workflow, keyspace string) (*querypb.QueryResult, error) { +// VExec is part of the tmclient.TabletManagerClient interface. +func (client *FakeTabletManagerClient) VExec(ctx context.Context, tablet *topodatapb.Tablet, query, workflow, keyspace string) (*querypb.QueryResult, error) { // This result satisfies a generic VExec command result := sqltypes.MakeTestResult( sqltypes.MakeTestFields("id", "int"), @@ -299,51 +300,6 @@ func (client *FakeTabletManagerClient) PromoteReplica(ctx context.Context, table return "", nil } -// StopSlave is deprecated -func (client *FakeTabletManagerClient) StopSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - return nil -} - -// StopSlaveMinimum is deprecated -func (client *FakeTabletManagerClient) StopSlaveMinimum(ctx context.Context, tablet *topodatapb.Tablet, minPos string, waitTime time.Duration) (string, error) { - return "", nil -} - -// StartSlave is deprecated -func (client *FakeTabletManagerClient) StartSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - return nil -} - -// StartSlaveUntilAfter is deprecated -func (client *FakeTabletManagerClient) StartSlaveUntilAfter(ctx context.Context, tablet *topodatapb.Tablet, position string, duration time.Duration) error { - return nil -} - -// GetSlaves is deprecated -func (client *FakeTabletManagerClient) GetSlaves(ctx context.Context, tablet *topodatapb.Tablet) ([]string, error) { - return nil, nil -} - -// SlaveStatus is deprecated -func (client *FakeTabletManagerClient) SlaveStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.Status, error) { - return &replicationdatapb.Status{}, nil -} - -// InitSlave is deprecated -func (client *FakeTabletManagerClient) InitSlave(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, position string, timeCreatedNS int64) error { - return nil -} - -// SlaveWasPromoted is deprecated -func (client *FakeTabletManagerClient) SlaveWasPromoted(ctx context.Context, tablet *topodatapb.Tablet) error { - return nil -} - -// SlaveWasRestarted is deprecated -func (client *FakeTabletManagerClient) SlaveWasRestarted(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias) error { - return nil -} - // // Backup related methods // diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go index 0fb61207ef1..d593118e296 100644 --- a/go/vt/vttablet/grpctmclient/client.go +++ b/go/vt/vttablet/grpctmclient/client.go @@ -574,6 +574,7 @@ func (client *Client) GetReplicas(ctx context.Context, tablet *topodatapb.Tablet return response.Addrs, nil } +// VExec is part of the tmclient.TabletManagerClient interface. func (client *Client) VExec(ctx context.Context, tablet *topodatapb.Tablet, query, workflow, keyspace string) (*querypb.QueryResult, error) { cc, c, err := client.dial(tablet) if err != nil { @@ -862,123 +863,3 @@ func (client *Client) Close() { } client.rpcClientMap = nil } - -// SlaveStatus is deprecated -func (client *Client) SlaveStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.Status, error) { - cc, c, err := client.dial(tablet) - if err != nil { - return nil, err - } - defer cc.Close() - response, err := c.SlaveStatus(ctx, &tabletmanagerdatapb.SlaveStatusRequest{}) - if err != nil { - return nil, err - } - return response.Status, nil -} - -// StopSlave is deprecated -func (client *Client) StopSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.StopSlave(ctx, &tabletmanagerdatapb.StopSlaveRequest{}) - return err -} - -// StopSlaveMinimum is deprecated -func (client *Client) StopSlaveMinimum(ctx context.Context, tablet *topodatapb.Tablet, minPos string, waitTime time.Duration) (string, error) { - cc, c, err := client.dial(tablet) - if err != nil { - return "", err - } - defer cc.Close() - response, err := c.StopSlaveMinimum(ctx, &tabletmanagerdatapb.StopSlaveMinimumRequest{ - Position: minPos, - WaitTimeout: int64(waitTime), - }) - if err != nil { - return "", err - } - return response.Position, nil -} - -// StartSlave is deprecated -func (client *Client) StartSlave(ctx context.Context, tablet *topodatapb.Tablet) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.StartSlave(ctx, &tabletmanagerdatapb.StartSlaveRequest{}) - return err -} - -// StartSlaveUntilAfter is deprecated -func (client *Client) StartSlaveUntilAfter(ctx context.Context, tablet *topodatapb.Tablet, position string, waitTime time.Duration) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.StartSlaveUntilAfter(ctx, &tabletmanagerdatapb.StartSlaveUntilAfterRequest{ - Position: position, - WaitTimeout: int64(waitTime), - }) - return err -} - -// GetSlaves is deprecated -func (client *Client) GetSlaves(ctx context.Context, tablet *topodatapb.Tablet) ([]string, error) { - cc, c, err := client.dial(tablet) - if err != nil { - return nil, err - } - defer cc.Close() - response, err := c.GetSlaves(ctx, &tabletmanagerdatapb.GetSlavesRequest{}) - if err != nil { - return nil, err - } - return response.Addrs, nil -} - -// InitSlave is deprecated -func (client *Client) InitSlave(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.InitSlave(ctx, &tabletmanagerdatapb.InitSlaveRequest{ - Parent: parent, - ReplicationPosition: replicationPosition, - TimeCreatedNs: timeCreatedNS, - }) - return err -} - -// SlaveWasPromoted is deprecated -func (client *Client) SlaveWasPromoted(ctx context.Context, tablet *topodatapb.Tablet) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.SlaveWasPromoted(ctx, &tabletmanagerdatapb.SlaveWasPromotedRequest{}) - return err -} - -// SlaveWasRestarted is deprecated -func (client *Client) SlaveWasRestarted(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias) error { - cc, c, err := client.dial(tablet) - if err != nil { - return err - } - defer cc.Close() - _, err = c.SlaveWasRestarted(ctx, &tabletmanagerdatapb.SlaveWasRestartedRequest{ - Parent: parent, - }) - return err -} diff --git a/go/vt/vttablet/grpctmserver/server.go b/go/vt/vttablet/grpctmserver/server.go index 8e7bb1c9da5..b48cb3f499c 100644 --- a/go/vt/vttablet/grpctmserver/server.go +++ b/go/vt/vttablet/grpctmserver/server.go @@ -477,90 +477,6 @@ func (s *server) RestoreFromBackup(request *tabletmanagerdatapb.RestoreFromBacku return s.tm.RestoreFromBackup(ctx, logger) } -// Deprecated -func (s *server) InitSlave(ctx context.Context, request *tabletmanagerdatapb.InitSlaveRequest) (response *tabletmanagerdatapb.InitSlaveResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "InitSlave", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.InitSlaveResponse{} - return response, s.tm.InitSlave(ctx, request.Parent, request.ReplicationPosition, request.TimeCreatedNs) -} - -// Deprecated -func (s *server) SlaveStatus(ctx context.Context, request *tabletmanagerdatapb.SlaveStatusRequest) (response *tabletmanagerdatapb.SlaveStatusResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "SlaveStatus", request, response, false /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.SlaveStatusResponse{} - status, err := s.tm.SlaveStatus(ctx) - if err == nil { - response.Status = status - } - return response, err -} - -// Deprecated -func (s *server) StopSlave(ctx context.Context, request *tabletmanagerdatapb.StopSlaveRequest) (response *tabletmanagerdatapb.StopSlaveResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "StopSlave", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.StopSlaveResponse{} - return response, s.tm.StopSlave(ctx) -} - -// Deprecated -func (s *server) StopSlaveMinimum(ctx context.Context, request *tabletmanagerdatapb.StopSlaveMinimumRequest) (response *tabletmanagerdatapb.StopSlaveMinimumResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "StopSlaveMinimum", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.StopSlaveMinimumResponse{} - position, err := s.tm.StopSlaveMinimum(ctx, request.Position, time.Duration(request.WaitTimeout)) - if err == nil { - response.Position = position - } - return response, err -} - -// Deprecated -func (s *server) StartSlave(ctx context.Context, request *tabletmanagerdatapb.StartSlaveRequest) (response *tabletmanagerdatapb.StartSlaveResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "StartSlave", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.StartSlaveResponse{} - return response, s.tm.StartSlave(ctx) -} - -// Deprecated -func (s *server) StartSlaveUntilAfter(ctx context.Context, request *tabletmanagerdatapb.StartSlaveUntilAfterRequest) (response *tabletmanagerdatapb.StartSlaveUntilAfterResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "StartSlaveUntilAfter", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.StartSlaveUntilAfterResponse{} - return response, s.tm.StartSlaveUntilAfter(ctx, request.Position, time.Duration(request.WaitTimeout)) -} - -// Deprecated -func (s *server) GetSlaves(ctx context.Context, request *tabletmanagerdatapb.GetSlavesRequest) (response *tabletmanagerdatapb.GetSlavesResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "GetSlaves", request, response, false /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.GetSlavesResponse{} - addrs, err := s.tm.GetSlaves(ctx) - if err == nil { - response.Addrs = addrs - } - return response, err -} - -// Deprecated -func (s *server) SlaveWasPromoted(ctx context.Context, request *tabletmanagerdatapb.SlaveWasPromotedRequest) (response *tabletmanagerdatapb.SlaveWasPromotedResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "SlaveWasPromoted", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.SlaveWasPromotedResponse{} - return response, s.tm.SlaveWasPromoted(ctx) -} - -// Deprecated -func (s *server) SlaveWasRestarted(ctx context.Context, request *tabletmanagerdatapb.SlaveWasRestartedRequest) (response *tabletmanagerdatapb.SlaveWasRestartedResponse, err error) { - defer s.tm.HandleRPCPanic(ctx, "SlaveWasRestarted", request, response, true /*verbose*/, &err) - ctx = callinfo.GRPCCallInfo(ctx) - response = &tabletmanagerdatapb.SlaveWasRestartedResponse{} - return response, s.tm.SlaveWasRestarted(ctx, request.Parent) -} - // registration glue func init() { diff --git a/go/vt/vttablet/tabletmanager/rpc_agent.go b/go/vt/vttablet/tabletmanager/rpc_agent.go index e8ba5cd0e90..520d42213b8 100644 --- a/go/vt/vttablet/tabletmanager/rpc_agent.go +++ b/go/vt/vttablet/tabletmanager/rpc_agent.go @@ -77,27 +77,8 @@ type RPCTM interface { ExecuteFetchAsApp(ctx context.Context, query []byte, maxrows int) (*querypb.QueryResult, error) // Replication related methods - - //Deprecated - SlaveStatus(ctx context.Context) (*replicationdatapb.Status, error) - MasterStatus(ctx context.Context) (*replicationdatapb.MasterStatus, error) - //Deprecated - StopSlave(ctx context.Context) error - - //Deprecated - StopSlaveMinimum(ctx context.Context, position string, waitTime time.Duration) (string, error) - - //Deprecated - StartSlave(ctx context.Context) error - - //Deprecated - StartSlaveUntilAfter(ctx context.Context, position string, waitTime time.Duration) error - - //Deprecated - GetSlaves(ctx context.Context) ([]string, error) - ReplicationStatus(ctx context.Context) (*replicationdatapb.Status, error) StopReplication(ctx context.Context) error @@ -129,25 +110,16 @@ type RPCTM interface { PopulateReparentJournal(ctx context.Context, timeCreatedNS int64, actionName string, masterAlias *topodatapb.TabletAlias, pos string) error - // Deprecated - InitSlave(ctx context.Context, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64) error - InitReplica(ctx context.Context, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64) error DemoteMaster(ctx context.Context) (*replicationdatapb.MasterStatus, error) UndoDemoteMaster(ctx context.Context) error - // Deprecated - SlaveWasPromoted(ctx context.Context) error - ReplicaWasPromoted(ctx context.Context) error SetMaster(ctx context.Context, parent *topodatapb.TabletAlias, timeCreatedNS int64, waitPosition string, forceStartReplication bool) error - // Deprecated - SlaveWasRestarted(ctx context.Context, parent *topodatapb.TabletAlias) error - StopReplicationAndGetStatus(ctx context.Context, stopReplicationMode replicationdatapb.StopReplicationMode) (StopReplicationAndGetStatusResponse, error) ReplicaWasRestarted(ctx context.Context, parent *topodatapb.TabletAlias) error diff --git a/go/vt/vttablet/tabletmanager/rpc_replication.go b/go/vt/vttablet/tabletmanager/rpc_replication.go index 8116592a2b2..f8d1c3e95d4 100644 --- a/go/vt/vttablet/tabletmanager/rpc_replication.go +++ b/go/vt/vttablet/tabletmanager/rpc_replication.go @@ -871,48 +871,3 @@ func (tm *TabletManager) repairReplication(ctx context.Context) error { return tm.setMasterRepairReplication(ctx, si.MasterAlias, 0, "", true) } - -// SlaveStatus is deprecated -func (tm *TabletManager) SlaveStatus(ctx context.Context) (*replicationdatapb.Status, error) { - return tm.ReplicationStatus(ctx) -} - -// StopSlave is deprecated -func (tm *TabletManager) StopSlave(ctx context.Context) error { - return tm.StopReplication(ctx) -} - -// StopSlaveMinimum is deprecated -func (tm *TabletManager) StopSlaveMinimum(ctx context.Context, position string, waitTime time.Duration) (string, error) { - return tm.StopReplicationMinimum(ctx, position, waitTime) -} - -// StartSlave is deprecated -func (tm *TabletManager) StartSlave(ctx context.Context) error { - return tm.StartReplication(ctx) -} - -// StartSlaveUntilAfter is deprecated -func (tm *TabletManager) StartSlaveUntilAfter(ctx context.Context, position string, waitTime time.Duration) error { - return tm.StartReplicationUntilAfter(ctx, position, waitTime) -} - -// GetSlaves is deprecated -func (tm *TabletManager) GetSlaves(ctx context.Context) ([]string, error) { - return tm.GetReplicas(ctx) -} - -// InitSlave is deprecated -func (tm *TabletManager) InitSlave(ctx context.Context, parent *topodatapb.TabletAlias, position string, timeCreatedNS int64) error { - return tm.InitReplica(ctx, parent, position, timeCreatedNS) -} - -// SlaveWasPromoted is deprecated -func (tm *TabletManager) SlaveWasPromoted(ctx context.Context) error { - return tm.ReplicaWasPromoted(ctx) -} - -// SlaveWasRestarted is deprecated -func (tm *TabletManager) SlaveWasRestarted(ctx context.Context, parent *topodatapb.TabletAlias) error { - return tm.ReplicaWasRestarted(ctx, parent) -} diff --git a/go/vt/vttablet/tmclient/rpc_client_api.go b/go/vt/vttablet/tmclient/rpc_client_api.go index dc1f220958c..29855641045 100644 --- a/go/vt/vttablet/tmclient/rpc_client_api.go +++ b/go/vt/vttablet/tmclient/rpc_client_api.go @@ -110,27 +110,9 @@ type TabletManagerClient interface { // Replication related methods // - // Deprecated - SlaveStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.Status, error) - // MasterStatus returns the tablet's mysql master status. MasterStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.MasterStatus, error) - // Deprecated - StopSlave(ctx context.Context, tablet *topodatapb.Tablet) error - - // Deprecated - StopSlaveMinimum(ctx context.Context, tablet *topodatapb.Tablet, stopPos string, waitTime time.Duration) (string, error) - - // Deprecated - StartSlave(ctx context.Context, tablet *topodatapb.Tablet) error - - // Deprecated - StartSlaveUntilAfter(ctx context.Context, tablet *topodatapb.Tablet, position string, duration time.Duration) error - - // Deprecated - GetSlaves(ctx context.Context, tablet *topodatapb.Tablet) ([]string, error) - // ReplicationStatus returns the tablet's mysql replication status. ReplicationStatus(ctx context.Context, tablet *topodatapb.Tablet) (*replicationdatapb.Status, error) @@ -181,9 +163,6 @@ type TabletManagerClient interface { // its reparent_journal table. PopulateReparentJournal(ctx context.Context, tablet *topodatapb.Tablet, timeCreatedNS int64, actionName string, masterAlias *topodatapb.TabletAlias, pos string) error - // Deprecated - InitSlave(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, replicationPosition string, timeCreatedNS int64) error - // InitReplica tells a tablet to start replicating from the // passed in master tablet alias, and wait for the row in the // reparent_journal table. @@ -197,9 +176,6 @@ type TabletManagerClient interface { // To be used if we are unable to promote the chosen new master UndoDemoteMaster(ctx context.Context, tablet *topodatapb.Tablet) error - // Deprecated - SlaveWasPromoted(ctx context.Context, tablet *topodatapb.Tablet) error - // ReplicaWasPromoted tells the remote tablet it is now the master ReplicaWasPromoted(ctx context.Context, tablet *topodatapb.Tablet) error @@ -208,9 +184,6 @@ type TabletManagerClient interface { // reparent_journal table (if timeCreatedNS is non-zero). SetMaster(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias, timeCreatedNS int64, waitPosition string, forceStartReplication bool) error - // Deprecated - SlaveWasRestarted(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias) error - // ReplicaWasRestarted tells the replica tablet its master has changed ReplicaWasRestarted(ctx context.Context, tablet *topodatapb.Tablet, parent *topodatapb.TabletAlias) error diff --git a/go/vt/vttablet/tmrpctest/test_tm_rpc.go b/go/vt/vttablet/tmrpctest/test_tm_rpc.go index 40081f2346b..f74d2c9d4f9 100644 --- a/go/vt/vttablet/tmrpctest/test_tm_rpc.go +++ b/go/vt/vttablet/tmrpctest/test_tm_rpc.go @@ -702,13 +702,6 @@ var testReplicationStatus = &replicationdatapb.Status{ MasterConnectRetry: 12, } -func (fra *fakeRPCTM) SlaveStatus(ctx context.Context) (*replicationdatapb.Status, error) { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - return testReplicationStatus, nil -} - var testMasterStatus = &replicationdatapb.MasterStatus{Position: "MariaDB/1-345-789"} func (fra *fakeRPCTM) MasterStatus(ctx context.Context) (*replicationdatapb.MasterStatus, error) { @@ -718,16 +711,6 @@ func (fra *fakeRPCTM) MasterStatus(ctx context.Context) (*replicationdatapb.Mast return testMasterStatus, nil } -func tmRPCTestSlaveStatus(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - rs, err := client.SlaveStatus(ctx, tablet) - compareError(t, "SlaveStatus", err, rs, testReplicationStatus) -} - -func tmRPCTestSlaveStatusPanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - _, err := client.SlaveStatus(ctx, tablet) - expectHandleRPCPanic(t, "SlaveStatus", false /*verbose*/, err) -} - func (fra *fakeRPCTM) ReplicationStatus(ctx context.Context) (*replicationdatapb.Status, error) { if fra.panics { panic(fmt.Errorf("test-triggered panic")) @@ -768,27 +751,6 @@ func tmRPCTestMasterPositionPanic(ctx context.Context, t *testing.T, client tmcl expectHandleRPCPanic(t, "MasterPosition", false /*verbose*/, err) } -var testStopSlaveCalled = false - -// Deprecated. Delete after 7.0 -func (fra *fakeRPCTM) StopSlave(ctx context.Context) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - testStopSlaveCalled = true - return nil -} - -func tmRPCTestStopSlave(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.StopSlave(ctx, tablet) - compareError(t, "StopSlave", err, true, testStopSlaveCalled) -} - -func tmRPCTestStopSlavePanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.StopSlave(ctx, tablet) - expectHandleRPCPanic(t, "StopSlave", true /*verbose*/, err) -} - var testStopReplicationCalled = false func (fra *fakeRPCTM) StopReplication(ctx context.Context) error { @@ -809,82 +771,6 @@ func tmRPCTestStopReplicationPanic(ctx context.Context, t *testing.T, client tmc expectHandleRPCPanic(t, "StopReplication", true /*verbose*/, err) } -var testStopSlaveMinimumWaitTime = time.Hour - -// Deprecated -func (fra *fakeRPCTM) StopSlaveMinimum(ctx context.Context, position string, waitTime time.Duration) (string, error) { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - compare(fra.t, "StopSlaveMinimum position", position, testReplicationPosition) - compare(fra.t, "StopSlaveMinimum waitTime", waitTime, testStopSlaveMinimumWaitTime) - return testReplicationPositionReturned, nil -} - -func tmRPCTestStopSlaveMinimum(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - pos, err := client.StopSlaveMinimum(ctx, tablet, testReplicationPosition, testStopSlaveMinimumWaitTime) - compareError(t, "StopSlaveMinimum", err, pos, testReplicationPositionReturned) -} - -func tmRPCTestStopSlaveMinimumPanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - _, err := client.StopSlaveMinimum(ctx, tablet, testReplicationPosition, testStopSlaveMinimumWaitTime) - expectHandleRPCPanic(t, "StopSlaveMinimum", true /*verbose*/, err) -} - -var testStartSlaveCalled = false - -func (fra *fakeRPCTM) StartSlave(ctx context.Context) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - testStartSlaveCalled = true - return nil -} - -var testStartSlaveUntilAfterCalledWith = "" - -func (fra *fakeRPCTM) StartSlaveUntilAfter(ctx context.Context, position string, waitTime time.Duration) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - testStartSlaveUntilAfterCalledWith = position - return nil -} - -func tmRPCTestStartSlave(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.StartSlave(ctx, tablet) - compareError(t, "StartSlave", err, true, testStartSlaveCalled) -} - -func tmRPCTestStartSlaveUntilAfter(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.StartSlaveUntilAfter(ctx, tablet, "test-position", time.Minute) - compareError(t, "StartSlaveUntilAfter", err, "test-position", testStartSlaveUntilAfterCalledWith) -} - -func tmRPCTestStartSlavePanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.StartSlave(ctx, tablet) - expectHandleRPCPanic(t, "StartSlave", true /*verbose*/, err) -} - -var testGetSlavesResult = []string{"slave1", "slave2"} - -func (fra *fakeRPCTM) GetSlaves(ctx context.Context) ([]string, error) { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - return testGetSlavesResult, nil -} - -func tmRPCTestGetSlaves(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - s, err := client.GetSlaves(ctx, tablet) - compareError(t, "GetSlaves", err, s, testGetSlavesResult) -} - -func tmRPCTestGetSlavesPanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - _, err := client.GetSlaves(ctx, tablet) - expectHandleRPCPanic(t, "GetSlaves", false /*verbose*/, err) -} - var testStopReplicationMinimumWaitTime = time.Hour func (fra *fakeRPCTM) StopReplicationMinimum(ctx context.Context, position string, waitTime time.Duration) (string, error) { @@ -1084,30 +970,6 @@ func tmRPCTestPopulateReparentJournalPanic(ctx context.Context, t *testing.T, cl expectHandleRPCPanic(t, "PopulateReparentJournal", false /*verbose*/, err) } -var testInitSlaveCalled = false - -// Deprecated -func (fra *fakeRPCTM) InitSlave(ctx context.Context, parent *topodatapb.TabletAlias, position string, timeCreatedNS int64) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - compare(fra.t, "InitReplica parent", parent, testMasterAlias) - compare(fra.t, "InitReplica pos", position, testReplicationPosition) - compare(fra.t, "InitReplica timeCreatedNS", timeCreatedNS, testTimeCreatedNS) - testInitSlaveCalled = true - return nil -} - -func tmRPCTestInitSlave(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.InitSlave(ctx, tablet, testMasterAlias, testReplicationPosition, testTimeCreatedNS) - compareError(t, "InitReplica", err, true, testInitSlaveCalled) -} - -func tmRPCTestInitSlavePanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.InitSlave(ctx, tablet, testMasterAlias, testReplicationPosition, testTimeCreatedNS) - expectHandleRPCPanic(t, "InitSlave", true /*verbose*/, err) -} - var testInitReplicaCalled = false func (fra *fakeRPCTM) InitReplica(ctx context.Context, parent *topodatapb.TabletAlias, position string, timeCreatedNS int64) error { @@ -1190,27 +1052,6 @@ func tmRPCTestReplicaWasPromotedPanic(ctx context.Context, t *testing.T, client expectHandleRPCPanic(t, "ReplicaWasPromoted", true /*verbose*/, err) } -var testSlaveWasPromotedCalled = false - -// Deprecated -func (fra *fakeRPCTM) SlaveWasPromoted(ctx context.Context) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - testSlaveWasPromotedCalled = true - return nil -} - -func tmRPCTestSlaveWasPromoted(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.SlaveWasPromoted(ctx, tablet) - compareError(t, "SlaveWasPromoted", err, true, testSlaveWasPromotedCalled) -} - -func tmRPCTestSlaveWasPromotedPanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.SlaveWasPromoted(ctx, tablet) - expectHandleRPCPanic(t, "SlaveWasPromoted", true /*verbose*/, err) -} - var testSetMasterCalled = false var testForceStartReplica = true @@ -1236,31 +1077,6 @@ func tmRPCTestSetMasterPanic(ctx context.Context, t *testing.T, client tmclient. expectHandleRPCPanic(t, "SetMaster", true /*verbose*/, err) } -var testSlaveWasRestartedParent = &topodatapb.TabletAlias{ - Cell: "prison", - Uid: 42, -} -var testSlaveWasRestartedCalled = false - -func (fra *fakeRPCTM) SlaveWasRestarted(ctx context.Context, parent *topodatapb.TabletAlias) error { - if fra.panics { - panic(fmt.Errorf("test-triggered panic")) - } - compare(fra.t, "SlaveWasRestarted parent", parent, testSlaveWasRestartedParent) - testSlaveWasRestartedCalled = true - return nil -} - -func tmRPCTestSlaveWasRestarted(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.SlaveWasRestarted(ctx, tablet, testSlaveWasRestartedParent) - compareError(t, "SlaveWasRestarted", err, true, testSlaveWasRestartedCalled) -} - -func tmRPCTestSlaveWasRestartedPanic(ctx context.Context, t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.Tablet) { - err := client.SlaveWasRestarted(ctx, tablet, testSlaveWasRestartedParent) - expectHandleRPCPanic(t, "SlaveWasRestarted", true /*verbose*/, err) -} - func (fra *fakeRPCTM) StopReplicationAndGetStatus(ctx context.Context, stopReplicationMode replicationdatapb.StopReplicationMode) (tabletmanager.StopReplicationAndGetStatusResponse, error) { if fra.panics { panic(fmt.Errorf("test-triggered panic")) @@ -1443,13 +1259,7 @@ func Run(t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.T tmRPCTestExecuteFetch(ctx, t, client, tablet) // Replication related methods - tmRPCTestSlaveStatus(ctx, t, client, tablet) tmRPCTestMasterPosition(ctx, t, client, tablet) - tmRPCTestStopSlave(ctx, t, client, tablet) - tmRPCTestStopSlaveMinimum(ctx, t, client, tablet) - tmRPCTestStartSlave(ctx, t, client, tablet) - tmRPCTestStartSlaveUntilAfter(ctx, t, client, tablet) - tmRPCTestGetSlaves(ctx, t, client, tablet) tmRPCTestReplicationStatus(ctx, t, client, tablet) tmRPCTestMasterPosition(ctx, t, client, tablet) @@ -1467,12 +1277,9 @@ func Run(t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.T tmRPCTestResetReplication(ctx, t, client, tablet) tmRPCTestInitMaster(ctx, t, client, tablet) tmRPCTestPopulateReparentJournal(ctx, t, client, tablet) - tmRPCTestInitSlave(ctx, t, client, tablet) tmRPCTestDemoteMaster(ctx, t, client, tablet) tmRPCTestUndoDemoteMaster(ctx, t, client, tablet) - tmRPCTestSlaveWasPromoted(ctx, t, client, tablet) tmRPCTestSetMaster(ctx, t, client, tablet) - tmRPCTestSlaveWasRestarted(ctx, t, client, tablet) tmRPCTestStopReplicationAndGetStatus(ctx, t, client, tablet) tmRPCTestPromoteReplica(ctx, t, client, tablet) @@ -1508,13 +1315,7 @@ func Run(t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.T tmRPCTestExecuteFetchPanic(ctx, t, client, tablet) // Replication related methods - tmRPCTestSlaveStatusPanic(ctx, t, client, tablet) tmRPCTestMasterPositionPanic(ctx, t, client, tablet) - tmRPCTestStopSlavePanic(ctx, t, client, tablet) - tmRPCTestStopSlaveMinimumPanic(ctx, t, client, tablet) - tmRPCTestStartSlavePanic(ctx, t, client, tablet) - tmRPCTestGetSlavesPanic(ctx, t, client, tablet) - tmRPCTestReplicationStatusPanic(ctx, t, client, tablet) tmRPCTestStopReplicationPanic(ctx, t, client, tablet) tmRPCTestStopReplicationMinimumPanic(ctx, t, client, tablet) @@ -1528,12 +1329,9 @@ func Run(t *testing.T, client tmclient.TabletManagerClient, tablet *topodatapb.T tmRPCTestResetReplicationPanic(ctx, t, client, tablet) tmRPCTestInitMasterPanic(ctx, t, client, tablet) tmRPCTestPopulateReparentJournalPanic(ctx, t, client, tablet) - tmRPCTestInitSlavePanic(ctx, t, client, tablet) tmRPCTestDemoteMasterPanic(ctx, t, client, tablet) tmRPCTestUndoDemoteMasterPanic(ctx, t, client, tablet) - tmRPCTestSlaveWasPromotedPanic(ctx, t, client, tablet) tmRPCTestSetMasterPanic(ctx, t, client, tablet) - tmRPCTestSlaveWasRestartedPanic(ctx, t, client, tablet) tmRPCTestStopReplicationAndGetStatusPanic(ctx, t, client, tablet) tmRPCTestPromoteReplicaPanic(ctx, t, client, tablet) diff --git a/go/vt/wrangler/cleaner.go b/go/vt/wrangler/cleaner.go index 48b25ffdf7c..5adb2b5ee52 100644 --- a/go/vt/wrangler/cleaner.go +++ b/go/vt/wrangler/cleaner.go @@ -118,7 +118,7 @@ func (cleaner *Cleaner) CleanUp(wr *Wrangler) error { return rec.Error() } -// RecordChangeTabletTypeAction records a new ChangeSlaveTypeAction +// RecordChangeTabletTypeAction records a new ChangeTabletTypeAction // into the specified Cleaner func RecordChangeTabletTypeAction(cleaner *Cleaner, tabletAlias *topodatapb.TabletAlias, from topodatapb.TabletType, to topodatapb.TabletType) { cleaner.Record(ChangeTabletTypeActionName, topoproto.TabletAliasString(tabletAlias), func(ctx context.Context, wr *Wrangler) error { @@ -142,7 +142,7 @@ func RecordChangeTabletTypeAction(cleaner *Cleaner, tabletAlias *topodatapb.Tabl // into the specified Cleaner func RecordStartReplicationAction(cleaner *Cleaner, tablet *topodatapb.Tablet) { cleaner.Record(StartReplicationActionName, topoproto.TabletAliasString(tablet.Alias), func(ctx context.Context, wr *Wrangler) error { - return wr.TabletManagerClient().StartSlave(ctx, tablet) + return wr.TabletManagerClient().StartReplication(ctx, tablet) }) } diff --git a/proto/tabletmanagerdata.proto b/proto/tabletmanagerdata.proto index b7e6e32c5bb..99dd8a49784 100644 --- a/proto/tabletmanagerdata.proto +++ b/proto/tabletmanagerdata.proto @@ -453,90 +453,6 @@ message RestoreFromBackupResponse { logutil.Event event = 1; } -// Deprecated -message SlaveStatusRequest { -} - -// Deprecated -message SlaveStatusResponse { - replicationdata.Status status = 1; -} - -// Deprecated -message StopSlaveRequest { -} - -// Deprecated -message StopSlaveResponse { -} - -// Deprecated -message StopSlaveMinimumRequest { - string position = 1; - int64 wait_timeout = 2; -} - -// Deprecated -message StopSlaveMinimumResponse { - string position = 1; -} - -// Deprecated -message StartSlaveRequest { -} - -// Deprecated -message StartSlaveResponse { -} - -// Deprecated -message StartSlaveUntilAfterRequest { - string position = 1; - int64 wait_timeout = 2; -} - -// Deprecated -message StartSlaveUntilAfterResponse { -} - -// Deprecated -message GetSlavesRequest { -} - -// Deprecated -message GetSlavesResponse { - repeated string addrs = 1; -} - -// Deprecated -message InitSlaveRequest { - topodata.TabletAlias parent = 1; - string replication_position = 2; - int64 time_created_ns = 3; -} - -// Deprecated -message InitSlaveResponse { -} - -// Deprecated -message SlaveWasPromotedRequest { -} - -// Deprecated -message SlaveWasPromotedResponse { -} - -// Deprecated -message SlaveWasRestartedRequest { - // the parent alias the tablet should have - topodata.TabletAlias parent = 1; -} - -// Deprecated -message SlaveWasRestartedResponse { -} - message VExecRequest { string query = 1; string workflow = 2; diff --git a/proto/tabletmanagerservice.proto b/proto/tabletmanagerservice.proto index 4fc66525f39..609e289ba08 100644 --- a/proto/tabletmanagerservice.proto +++ b/proto/tabletmanagerservice.proto @@ -163,33 +163,6 @@ service TabletManager { // RestoreFromBackup deletes all local data and restores it from the latest backup. rpc RestoreFromBackup(tabletmanagerdata.RestoreFromBackupRequest) returns (stream tabletmanagerdata.RestoreFromBackupResponse) {}; - // Deprecated - remove after 7.0 - rpc SlaveStatus(tabletmanagerdata.SlaveStatusRequest) returns (tabletmanagerdata.SlaveStatusResponse) {}; - - // Deprecated - rpc StopSlave(tabletmanagerdata.StopSlaveRequest) returns (tabletmanagerdata.StopSlaveResponse) {}; - - // Deprecated - rpc StopSlaveMinimum(tabletmanagerdata.StopSlaveMinimumRequest) returns (tabletmanagerdata.StopSlaveMinimumResponse) {}; - - // Deprecated - rpc StartSlave(tabletmanagerdata.StartSlaveRequest) returns (tabletmanagerdata.StartSlaveResponse) {}; - - // Deprecated - rpc StartSlaveUntilAfter(tabletmanagerdata.StartSlaveUntilAfterRequest) returns (tabletmanagerdata.StartSlaveUntilAfterResponse) {}; - - // Deprecated - rpc GetSlaves(tabletmanagerdata.GetSlavesRequest) returns (tabletmanagerdata.GetSlavesResponse) {}; - - // Deprecated - rpc InitSlave(tabletmanagerdata.InitSlaveRequest) returns (tabletmanagerdata.InitSlaveResponse) {}; - - // Deprecated - rpc SlaveWasPromoted(tabletmanagerdata.SlaveWasPromotedRequest) returns (tabletmanagerdata.SlaveWasPromotedResponse) {}; - - // Deprecated - rpc SlaveWasRestarted(tabletmanagerdata.SlaveWasRestartedRequest) returns (tabletmanagerdata.SlaveWasRestartedResponse) {}; - // Generic VExec request. Can be used for various purposes rpc VExec(tabletmanagerdata.VExecRequest) returns(tabletmanagerdata.VExecResponse) {}; }