Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: rename DeployID to ReplicaID for HA clarity (#18796)
p0nye1cfe4a4be65
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex ae4b275b47..332535b1d8 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -16067,10 +16067,10 @@ components:title: log_timedescription: The time when the log was recorded.$ref: '#/components/schemas/google.protobuf.Timestamp'- deployId:+ replicaId:type: string- title: deploy_id- description: The deployment ID for this log entry.+ title: replica_id+ description: The replica ID for this log entry.schemaDump:title: schema_dumpdescription: Schema dump details (if type is SCHEMA_DUMP).diff --git a/backend/api/v1/rollout_service_converter.go b/backend/api/v1/rollout_service_converter.goindex b73a27e803..b05b325b75 100644--- a/backend/api/v1/rollout_service_converter.go+++ b/backend/api/v1/rollout_service_converter.go@@ -382,9 +382,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrswitch l.Payload.Type {case storepb.TaskRunLog_SCHEMA_DUMP_START:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_SCHEMA_DUMP,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_SCHEMA_DUMP,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,SchemaDump: &v1pb.TaskRunLogEntry_SchemaDump{StartTime: timestamppb.New(l.T),},@@ -404,9 +404,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_COMMAND_EXECUTE:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_COMMAND_EXECUTE,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_COMMAND_EXECUTE,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,CommandExecute: &v1pb.TaskRunLogEntry_CommandExecute{LogTime: timestamppb.New(l.T),Range: convertToRange(l.Payload.CommandExecute.Range),@@ -432,9 +432,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_DATABASE_SYNC_START:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_DATABASE_SYNC,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_DATABASE_SYNC,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,DatabaseSync: &v1pb.TaskRunLogEntry_DatabaseSync{StartTime: timestamppb.New(l.T),},@@ -454,9 +454,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_TRANSACTION_CONTROL:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_TRANSACTION_CONTROL,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_TRANSACTION_CONTROL,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,TransactionControl: &v1pb.TaskRunLogEntry_TransactionControl{Type: convertTaskRunLogTransactionControlType(l.Payload.TransactionControl.Type),Error: l.Payload.TransactionControl.Error,@@ -466,9 +466,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_PRIOR_BACKUP_START:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_PRIOR_BACKUP,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_PRIOR_BACKUP,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,PriorBackup: &v1pb.TaskRunLogEntry_PriorBackup{StartTime: timestamppb.New(l.T),},@@ -489,9 +489,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_COMPUTE_DIFF_START:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_COMPUTE_DIFF,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_COMPUTE_DIFF,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,ComputeDiff: &v1pb.TaskRunLogEntry_ComputeDiff{StartTime: timestamppb.New(l.T),},@@ -511,9 +511,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_RETRY_INFO:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_RETRY_INFO,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_RETRY_INFO,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,RetryInfo: &v1pb.TaskRunLogEntry_RetryInfo{RetryCount: l.Payload.RetryInfo.RetryCount,MaximumRetries: l.Payload.RetryInfo.MaximumRetries,@@ -524,9 +524,9 @@ func convertToTaskRunLogEntries(logs []*store.TaskRunLog) []*v1pb.TaskRunLogEntrcase storepb.TaskRunLog_RELEASE_FILE_EXECUTE:e := &v1pb.TaskRunLogEntry{- Type: v1pb.TaskRunLogEntry_RELEASE_FILE_EXECUTE,- LogTime: timestamppb.New(l.T),- DeployId: l.Payload.DeployId,+ Type: v1pb.TaskRunLogEntry_RELEASE_FILE_EXECUTE,+ LogTime: timestamppb.New(l.T),+ ReplicaId: l.Payload.ReplicaId,ReleaseFileExecute: &v1pb.TaskRunLogEntry_ReleaseFileExecute{Version: l.Payload.ReleaseFileExecute.Version,FilePath: l.Payload.ReleaseFileExecute.FilePath,diff --git a/backend/bin/server/cmd/profile.go b/backend/bin/server/cmd/profile.goindex dc7dec6362..a027f6278b 100644--- a/backend/bin/server/cmd/profile.go+++ b/backend/bin/server/cmd/profile.go@@ -23,7 +23,7 @@ func getBaseProfile(dataDir string) *config.Profile {Version: version,GitCommit: gitcommit,PgURL: os.Getenv("PG_URL"),- DeployID: uuid.NewString(),+ ReplicaID: uuid.NewString(),}config.LastActiveTS.Store(time.Now().Unix())diff --git a/backend/component/config/profile.go b/backend/component/config/profile.goindex 2d1fe95cd0..cf4aaf75e7 100644--- a/backend/component/config/profile.go+++ b/backend/component/config/profile.go@@ -40,8 +40,8 @@ type Profile struct {// LastActiveTS is the service last active timestamp, any API calls will refresh this value.LastActiveTS atomic.Int64- // Unique ID per Bytebase instance run.- DeployID string+ // Unique ID per Bytebase replica run.+ ReplicaID string// Whether the server is running in a docker container.IsDocker booldiff --git a/backend/generated-go/store/task_run_log.pb.go b/backend/generated-go/store/task_run_log.pb.goindex aee8eae76d..c470ce0f97 100644--- a/backend/generated-go/store/task_run_log.pb.go+++ b/backend/generated-go/store/task_run_log.pb.go@@ -158,7 +158,7 @@ func (TaskRunLog_TransactionControl_Type) EnumDescriptor() ([]byte, []int) {type TaskRunLog struct {state protoimpl.MessageState `protogen:"open.v1"`Type TaskRunLog_Type `protobuf:"varint,1,opt,name=type,proto3,enum=bytebase.store.TaskRunLog_Type" json:"type,omitempty"`- DeployId string `protobuf:"bytes,12,opt,name=deploy_id,json=deployId,proto3" json:"deploy_id,omitempty"`+ ReplicaId string `protobuf:"bytes,12,opt,name=replica_id,json=replicaId,proto3" json:"replica_id,omitempty"`SchemaDumpStart *TaskRunLog_SchemaDumpStart `protobuf:"bytes,2,opt,name=schema_dump_start,json=schemaDumpStart,proto3" json:"schema_dump_start,omitempty"`SchemaDumpEnd *TaskRunLog_SchemaDumpEnd `protobuf:"bytes,3,opt,name=schema_dump_end,json=schemaDumpEnd,proto3" json:"schema_dump_end,omitempty"`CommandExecute *TaskRunLog_CommandExecute `protobuf:"bytes,4,opt,name=command_execute,json=commandExecute,proto3" json:"command_execute,omitempty"`@@ -213,9 +213,9 @@ func (x *TaskRunLog) GetType() TaskRunLog_Type {return TaskRunLog_TYPE_UNSPECIFIED}-func (x *TaskRunLog) GetDeployId() string {+func (x *TaskRunLog) GetReplicaId() string {if x != nil {- return x.DeployId+ return x.ReplicaId}return ""}@@ -1111,11 +1111,12 @@ var File_store_task_run_log_proto protoreflect.FileDescriptorconst file_store_task_run_log_proto_rawDesc = "" +"\n" +- "\x18store/task_run_log.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\"\xa0\x13\n" ++ "\x18store/task_run_log.proto\x12\x0ebytebase.store\x1a\x12store/common.proto\"\xa2\x13\n" +"\n" +"TaskRunLog\x123\n" +- "\x04type\x18\x01 \x01(\x0e2\x1f.bytebase.store.TaskRunLog.TypeR\x04type\x12\x1b\n" +- "\tdeploy_id\x18\f \x01(\tR\bdeployId\x12V\n" ++ "\x04type\x18\x01 \x01(\x0e2\x1f.bytebase.store.TaskRunLog.TypeR\x04type\x12\x1d\n" ++ "\n" ++ "replica_id\x18\f \x01(\tR\treplicaId\x12V\n" +"\x11schema_dump_start\x18\x02 \x01(\v2*.bytebase.store.TaskRunLog.SchemaDumpStartR\x0fschemaDumpStart\x12P\n" +"\x0fschema_dump_end\x18\x03 \x01(\v2(.bytebase.store.TaskRunLog.SchemaDumpEndR\rschemaDumpEnd\x12R\n" +"\x0fcommand_execute\x18\x04 \x01(\v2).bytebase.store.TaskRunLog.CommandExecuteR\x0ecommandExecute\x12U\n" +diff --git a/backend/generated-go/store/task_run_log_equal.pb.go b/backend/generated-go/store/task_run_log_equal.pb.goindex 650bef2c4b..10d44536d6 100644--- a/backend/generated-go/store/task_run_log_equal.pb.go+++ b/backend/generated-go/store/task_run_log_equal.pb.go@@ -199,7 +199,7 @@ func (x *TaskRunLog) Equal(y *TaskRunLog) bool {if x.Type != y.Type {return false}- if x.DeployId != y.DeployId {+ if x.ReplicaId != y.ReplicaId {return false}if !x.SchemaDumpStart.Equal(y.SchemaDumpStart) {diff --git a/backend/generated-go/v1/rollout_service.pb.go b/backend/generated-go/v1/rollout_service.pb.goindex 8f4f86d45b..cc1030ed7a 100644--- a/backend/generated-go/v1/rollout_service.pb.go+++ b/backend/generated-go/v1/rollout_service.pb.go@@ -1666,8 +1666,8 @@ type TaskRunLogEntry struct {Type TaskRunLogEntry_Type `protobuf:"varint,1,opt,name=type,proto3,enum=bytebase.v1.TaskRunLogEntry_Type" json:"type,omitempty"`// The time when the log was recorded.LogTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=log_time,json=logTime,proto3" json:"log_time,omitempty"`- // The deployment ID for this log entry.- DeployId string `protobuf:"bytes,3,opt,name=deploy_id,json=deployId,proto3" json:"deploy_id,omitempty"`+ // The replica ID for this log entry.+ ReplicaId string `protobuf:"bytes,3,opt,name=replica_id,json=replicaId,proto3" json:"replica_id,omitempty"`// Schema dump details (if type is SCHEMA_DUMP).SchemaDump *TaskRunLogEntry_SchemaDump `protobuf:"bytes,4,opt,name=schema_dump,json=schemaDump,proto3" json:"schema_dump,omitempty"`// Command execution details (if type is COMMAND_EXECUTE).@@ -1732,9 +1732,9 @@ func (x *TaskRunLogEntry) GetLogTime() *timestamppb.Timestamp {return nil}-func (x *TaskRunLogEntry) GetDeployId() string {+func (x *TaskRunLogEntry) GetReplicaId() string {if x != nil {- return x.DeployId+ return x.ReplicaId}return ""}@@ -3464,11 +3464,12 @@ const file_v1_rollout_service_proto_rawDesc = "" +"TaskRunLog\x12\x12\n" +"\x04name\x18\x01 \x01(\tR\x04name\x126\n" +"\aentries\x18\x02 \x03(\v2\x1c.bytebase.v1.TaskRunLogEntryR\aentries:x\xeaAu\n" +- "\x17bytebase.com/TaskRunLog\x12Zprojects/{project}/plans/{plan}/rollout/stages/{stage}/tasks/{task}/taskRuns/{taskRun}/log\"\xe3\x17\n" ++ "\x17bytebase.com/TaskRunLog\x12Zprojects/{project}/plans/{plan}/rollout/stages/{stage}/tasks/{task}/taskRuns/{taskRun}/log\"\xe5\x17\n" +"\x0fTaskRunLogEntry\x125\n" +"\x04type\x18\x01 \x01(\x0e2!.bytebase.v1.TaskRunLogEntry.TypeR\x04type\x125\n" +- "\blog_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\alogTime\x12\x1b\n" +- "\tdeploy_id\x18\x03 \x01(\tR\bdeployId\x12H\n" ++ "\blog_time\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\alogTime\x12\x1d\n" ++ "\n" ++ "replica_id\x18\x03 \x01(\tR\treplicaId\x12H\n" +"\vschema_dump\x18\x04 \x01(\v2'.bytebase.v1.TaskRunLogEntry.SchemaDumpR\n" +"schemaDump\x12T\n" +"\x0fcommand_execute\x18\x05 \x01(\v2+.bytebase.v1.TaskRunLogEntry.CommandExecuteR\x0ecommandExecute\x12N\n" +diff --git a/backend/generated-go/v1/rollout_service_equal.pb.go b/backend/generated-go/v1/rollout_service_equal.pb.goindex 2e9062eb43..06f5e8d423 100644--- a/backend/generated-go/v1/rollout_service_equal.pb.go+++ b/backend/generated-go/v1/rollout_service_equal.pb.go@@ -717,7 +717,7 @@ func (x *TaskRunLogEntry) Equal(y *TaskRunLogEntry) bool {if p, q := x.LogTime, y.LogTime; (p == nil && q != nil) || (p != nil && (q == nil || p.Seconds != q.Seconds || p.Nanos != q.Nanos)) {return false}- if x.DeployId != y.DeployId {+ if x.ReplicaId != y.ReplicaId {return false}if !x.SchemaDump.Equal(y.SchemaDump) {diff --git a/backend/migrator/migration/3.14/0028##rename_deploy_id_to_replica_id.sql b/backend/migrator/migration/3.14/0028##rename_deploy_id_to_replica_id.sqlnew file mode 100644index 0000000000..83cb9f4b93--- /dev/null+++ b/backend/migrator/migration/3.14/0028##rename_deploy_id_to_replica_id.sql@@ -0,0 +1,4 @@+-- Rename deployId to replicaId in task_run_log payload JSONB+UPDATE task_run_log+SET payload = payload - 'deployId' || jsonb_build_object('replicaId', payload->'deployId')+WHERE payload ? 'deployId';diff --git a/backend/migrator/migrator_test.go b/backend/migrator/migrator_test.goindex 1b3284600f..bd1071f32a 100644--- a/backend/migrator/migrator_test.go+++ b/backend/migrator/migrator_test.go@@ -12,8 +12,8 @@ import (func TestLatestVersion(t *testing.T) {files, err := getSortedVersionedFiles()require.NoError(t, err)- require.Equal(t, semver.MustParse("3.14.27"), *files[len(files)-1].version)- require.Equal(t, "migration/3.14/0027##replica_heartbeat.sql", files[len(files)-1].path)+ require.Equal(t, semver.MustParse("3.14.28"), *files[len(files)-1].version)+ require.Equal(t, "migration/3.14/0028##rename_deploy_id_to_replica_id.sql", files[len(files)-1].path)}func TestVersionUnique(t *testing.T) {diff --git a/backend/runner/heartbeat/runner.go b/backend/runner/heartbeat/runner.goindex b305bdf96e..a6a06e1a8a 100644--- a/backend/runner/heartbeat/runner.go+++ b/backend/runner/heartbeat/runner.go@@ -36,7 +36,7 @@ func (r *Runner) Run(ctx context.Context, wg *sync.WaitGroup) {ticker := time.NewTicker(heartbeatInterval)defer ticker.Stop()- slog.Debug("Heartbeat runner started", slog.String("replicaID", r.profile.DeployID))+ slog.Debug("Heartbeat runner started", slog.String("replicaID", r.profile.ReplicaID))// Send heartbeat immediately on startupr.sendHeartbeat(ctx)@@ -52,7 +52,7 @@ func (r *Runner) Run(ctx context.Context, wg *sync.WaitGroup) {}func (r *Runner) sendHeartbeat(ctx context.Context) {- if err := r.store.UpsertReplicaHeartbeat(ctx, r.profile.DeployID); err != nil {+ if err := r.store.UpsertReplicaHeartbeat(ctx, r.profile.ReplicaID); err != nil {slog.Error("Failed to send heartbeat", log.BBError(err))}}diff --git a/backend/runner/taskrun/database_migrate_executor.go b/backend/runner/taskrun/database_migrate_executor.goindex e984b17a61..b8d329fb2e 100644--- a/backend/runner/taskrun/database_migrate_executor.go+++ b/backend/runner/taskrun/database_migrate_executor.go@@ -179,7 +179,7 @@ func (exec *DatabaseMigrateExecutor) runStandardMigration(ctx context.Context, d// so this works correctly for mixed DDL+DML statements.var priorBackupDetail *storepb.PriorBackupDetailif task.Payload.GetEnablePriorBackup() {- exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.DeployID, &storepb.TaskRunLog{+ exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.ReplicaID, &storepb.TaskRunLog{Type: storepb.TaskRunLog_PRIOR_BACKUP_START,PriorBackupStart: &storepb.TaskRunLog_PriorBackupStart{},})@@ -189,7 +189,7 @@ func (exec *DatabaseMigrateExecutor) runStandardMigration(ctx context.Context, dvar backupErr errorpriorBackupDetail, backupErr = exec.backupData(ctx, driverCtx, sheet.Statement, task.Payload, task, instance, database)if backupErr != nil {- exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.DeployID, &storepb.TaskRunLog{+ exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.ReplicaID, &storepb.TaskRunLog{Type: storepb.TaskRunLog_PRIOR_BACKUP_END,PriorBackupEnd: &storepb.TaskRunLog_PriorBackupEnd{Error: backupErr.Error(),@@ -201,7 +201,7 @@ func (exec *DatabaseMigrateExecutor) runStandardMigration(ctx context.Context, dreturn nil, backupErr}} else {- exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.DeployID, &storepb.TaskRunLog{+ exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.ReplicaID, &storepb.TaskRunLog{Type: storepb.TaskRunLog_PRIOR_BACKUP_END,PriorBackupEnd: &storepb.TaskRunLog_PriorBackupEnd{PriorBackupDetail: priorBackupDetail,@@ -236,7 +236,7 @@ func (exec *DatabaseMigrateExecutor) runStandardMigration(ctx context.Context, dopts.MaximumRetries = int(project.Setting.GetExecutionRetryPolicy().GetMaximumRetries())}opts.CreateTaskRunLog = func(t time.Time, e *storepb.TaskRunLog) error {- return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.DeployID, e)+ return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.ReplicaID, e)}// Begin migration - create pending changelog@@ -320,7 +320,7 @@ func (exec *DatabaseMigrateExecutor) runGhostMigration(ctx context.Context, drivopts.MaximumRetries = int(project.Setting.GetExecutionRetryPolicy().GetMaximumRetries())}opts.CreateTaskRunLog = func(t time.Time, e *storepb.TaskRunLog) error {- return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.DeployID, e)+ return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.ReplicaID, e)}// Prepare gh-ost migration context before beginning migration@@ -481,7 +481,7 @@ func (exec *DatabaseMigrateExecutor) runVersionedRelease(ctx context.Context, dropts.MaximumRetries = int(project.Setting.GetExecutionRetryPolicy().GetMaximumRetries())}opts.CreateTaskRunLog = func(t time.Time, e *storepb.TaskRunLog) error {- return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.DeployID, e)+ return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.ReplicaID, e)}// Get database driver once for all files@@ -521,7 +521,7 @@ func (exec *DatabaseMigrateExecutor) runVersionedRelease(ctx context.Context, drslog.String("file", file.Path))// Log release file execution- exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.DeployID, &storepb.TaskRunLog{+ exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.ReplicaID, &storepb.TaskRunLog{Type: storepb.TaskRunLog_RELEASE_FILE_EXECUTE,ReleaseFileExecute: &storepb.TaskRunLog_ReleaseFileExecute{Version: file.Version,@@ -636,7 +636,7 @@ func (exec *DatabaseMigrateExecutor) runDeclarativeRelease(ctx context.Context,slog.String("file", file.Path))// Log release file execution- exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.DeployID, &storepb.TaskRunLog{+ exec.store.CreateTaskRunLogS(ctx, taskRunUID, time.Now(), exec.profile.ReplicaID, &storepb.TaskRunLog{Type: storepb.TaskRunLog_RELEASE_FILE_EXECUTE,ReleaseFileExecute: &storepb.TaskRunLog_ReleaseFileExecute{Version: file.Version,@@ -667,7 +667,7 @@ func (exec *DatabaseMigrateExecutor) runDeclarativeRelease(ctx context.Context,opts.MaximumRetries = int(project.Setting.GetExecutionRetryPolicy().GetMaximumRetries())}opts.CreateTaskRunLog = func(t time.Time, e *storepb.TaskRunLog) error {- return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.DeployID, e)+ return exec.store.CreateTaskRunLog(ctx, taskRunUID, t.UTC(), exec.profile.ReplicaID, e)}// Compute SDL diff before beginning migrationdiff --git a/backend/runner/taskrun/running_scheduler.go b/backend/runner/taskrun/running_scheduler.goindex f9b09d17be..4c95bfd6be 100644--- a/backend/runner/taskrun/running_scheduler.go+++ b/backend/runner/taskrun/running_scheduler.go@@ -44,7 +44,7 @@ func (s *Scheduler) runRunningTaskRunsScheduler(ctx context.Context, wg *sync.Wafunc (s *Scheduler) scheduleRunningTaskRuns(ctx context.Context) error {// Atomically claim all AVAILABLE task runs- claimed, err := s.store.ClaimAvailableTaskRuns(ctx, s.profile.DeployID)+ claimed, err := s.store.ClaimAvailableTaskRuns(ctx, s.profile.ReplicaID)if err != nil {return errors.Wrapf(err, "failed to claim available task runs")}diff --git a/backend/server/server.go b/backend/server/server.goindex 5827504f1d..1ae06a81e7 100644--- a/backend/server/server.go+++ b/backend/server/server.go@@ -101,7 +101,7 @@ func NewServer(ctx context.Context, profile *config.Profile) (*Server, error) {slog.Info(fmt.Sprintf("mode=%s", profile.Mode))slog.Info(fmt.Sprintf("dataDir=%s", profile.DataDir))slog.Info(fmt.Sprintf("demo=%v", profile.Demo))- slog.Info(fmt.Sprintf("instanceRunUUID=%s", profile.DeployID))+ slog.Info(fmt.Sprintf("replicaID=%s", profile.ReplicaID))slog.Info("-----Config END-------")serverStarted := falsediff --git a/backend/store/task_run_log.go b/backend/store/task_run_log.goindex e4ff844f2b..8b5713c4f7 100644--- a/backend/store/task_run_log.go+++ b/backend/store/task_run_log.go@@ -19,14 +19,14 @@ type TaskRunLog struct {Payload *storepb.TaskRunLog}-func (s *Store) CreateTaskRunLogS(ctx context.Context, taskRunUID int, t time.Time, deployID string, e *storepb.TaskRunLog) {- if err := s.CreateTaskRunLog(ctx, taskRunUID, t, deployID, e); err != nil {+func (s *Store) CreateTaskRunLogS(ctx context.Context, taskRunUID int, t time.Time, replicaID string, e *storepb.TaskRunLog) {+ if err := s.CreateTaskRunLog(ctx, taskRunUID, t, replicaID, e); err != nil {slog.Error("failed to create task run log", log.BBError(err))}}-func (s *Store) CreateTaskRunLog(ctx context.Context, taskRunUID int, t time.Time, deployID string, e *storepb.TaskRunLog) error {- e.DeployId = deployID+func (s *Store) CreateTaskRunLog(ctx context.Context, taskRunUID int, t time.Time, replicaID string, e *storepb.TaskRunLog) error {+ e.ReplicaId = replicaIDp, err := protojson.Marshal(e)if err != nil {return errors.Wrapf(err, "failed to marshal task run log")diff --git a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/TaskRunLogViewer.vue b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/TaskRunLogViewer.vueindex aa2fc98f7c..d8d1e556a0 100644--- a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/TaskRunLogViewer.vue+++ b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/TaskRunLogViewer.vue@@ -37,45 +37,45 @@</button></div>- <!-- Multi-deploy view: show deploy groups when server restarts detected -->- <template v-if="hasMultipleDeploys">+ <!-- Multi-replica view: show replica groups when server restarts detected -->+ <template v-if="hasMultipleReplicas"><!-- Server restart notice --><divclass="flex items-center gap-x-2 px-3 py-2 bg-amber-50 border-b border-amber-200 text-amber-800"><AlertTriangleIcon class="w-4 h-4 shrink-0" />- <span>{{ $t("task-run.log-viewer.multiple-deploys-notice") }}</span>+ <span>{{ $t("task-run.log-viewer.multiple-replicas-notice") }}</span></div>- <!-- Deploy groups -->+ <!-- Replica groups --><div- v-for="(deployGroup, deployIdx) in deployGroups"- :key="deployGroup.deployId"+ v-for="(replicaGroup, replicaIdx) in replicaGroups"+ :key="replicaGroup.replicaId"class="border-b border-gray-300 last:border-b-0">- <!-- Deploy Header -->+ <!-- Replica Header --><divclass="flex items-center gap-x-2 px-3 py-1.5 bg-gray-100 hover:bg-gray-200 cursor-pointer select-none"- @click="toggleDeploy(deployGroup.deployId)"+ @click="toggleReplica(replicaGroup.replicaId)"><component- :is="isDeployExpanded(deployGroup.deployId) ? ChevronDownIcon : ChevronRightIcon"+ :is="isReplicaExpanded(replicaGroup.replicaId) ? ChevronDownIcon : ChevronRightIcon"class="w-3.5 h-3.5 text-gray-500 shrink-0"/><ServerIcon class="w-3.5 h-3.5 text-gray-500 shrink-0" /><span class="text-gray-700 font-medium">- {{ $t("task-run.log-viewer.deployment-n", { n: deployIdx + 1 }) }}+ {{ $t("task-run.log-viewer.replica-n", { n: replicaIdx + 1 }) }}</span><span class="text-gray-400 text-[10px] font-normal">- {{ deployGroup.deployId.substring(0, 8) }}+ {{ replicaGroup.replicaId.substring(0, 8) }}</span></div>- <!-- Sections within deploy group -->- <div v-if="isDeployExpanded(deployGroup.deployId)">+ <!-- Sections within replica group -->+ <div v-if="isReplicaExpanded(replicaGroup.replicaId)"><!-- Orphan sections (before any release file marker) --><div- v-for="section in deployGroup.sections"+ v-for="section in replicaGroup.sections":key="section.id"class="border-b border-gray-200 last:border-b-0">@@ -94,17 +94,17 @@<!-- Release file groups --><div- v-for="(fileGroup, fileIdx) in deployGroup.releaseFileGroups"- :key="`${deployGroup.deployId}-file-${fileIdx}`"+ v-for="(fileGroup, fileIdx) in replicaGroup.releaseFileGroups"+ :key="`${replicaGroup.replicaId}-file-${fileIdx}`"class="border-b border-gray-200 last:border-b-0"><!-- Release file header --><divclass="flex items-center gap-x-2 px-3 py-1.5 bg-blue-50 hover:bg-blue-100 cursor-pointer select-none ml-4"- @click="toggleReleaseFile(`${deployGroup.deployId}-file-${fileIdx}`)"+ @click="toggleReleaseFile(`${replicaGroup.replicaId}-file-${fileIdx}`)"><component- :is="isReleaseFileExpanded(`${deployGroup.deployId}-file-${fileIdx}`) ? ChevronDownIcon : ChevronRightIcon"+ :is="isReleaseFileExpanded(`${replicaGroup.replicaId}-file-${fileIdx}`) ? ChevronDownIcon : ChevronRightIcon"class="w-3.5 h-3.5 text-blue-500 shrink-0"/><FileCodeIcon class="w-3.5 h-3.5 text-blue-500 shrink-0" />@@ -114,7 +114,7 @@</div><!-- Sections within release file group -->- <div v-if="isReleaseFileExpanded(`${deployGroup.deployId}-file-${fileIdx}`)" class="ml-4">+ <div v-if="isReleaseFileExpanded(`${replicaGroup.replicaId}-file-${fileIdx}`)" class="ml-4"><divv-for="section in fileGroup.sections":key="section.id"@@ -138,7 +138,7 @@</div></template>- <!-- Single-deploy view with release files -->+ <!-- Single-replica view with release files --><template v-else-if="hasReleaseFiles"><divv-for="(fileGroup, fileIdx) in releaseFileGroups"@@ -183,7 +183,7 @@</div></template>- <!-- Single-deploy view: standard flat sections (no release files) -->+ <!-- Single-replica view: standard flat sections (no release files) --><template v-else><divv-for="section in sections"@@ -228,15 +228,15 @@ const props = defineProps<{const {sections,- hasMultipleDeploys,+ hasMultipleReplicas,hasReleaseFiles,releaseFileGroups,- deployGroups,+ replicaGroups,toggleSection,- toggleDeploy,+ toggleReplica,toggleReleaseFile,isSectionExpanded,- isDeployExpanded,+ isReplicaExpanded,isReleaseFileExpanded,expandAll,collapseAll,diff --git a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/types.ts b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/types.tsindex 5a7e28ca92..c2f2734af3 100644--- a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/types.ts+++ b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/types.ts@@ -37,8 +37,8 @@ export interface ReleaseFileGroup {sections: Section[];}-export interface DeployGroup {- deployId: string;+export interface ReplicaGroup {+ replicaId: string;releaseFileGroups: ReleaseFileGroup[];// Sections not associated with any release file (e.g., logs before file execution)sections: Section[];diff --git a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/useTaskRunLogSections.ts b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/useTaskRunLogSections.tsindex 1b9a5a151f..d2179be79d 100644--- a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/useTaskRunLogSections.ts+++ b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/useTaskRunLogSections.ts@@ -15,9 +15,9 @@ import {import type { Sheet } from "@/types/proto-es/v1/sheet_service_pb";import { addToSet, deleteFromSet } from "../utils/reactivity";import type {- DeployGroup,DisplayItem,ReleaseFileGroup,+ ReplicaGroup,Section,SectionStatus,} from "./types";@@ -26,9 +26,9 @@ import {formatRelativeTime,formatTime,getTimestampMs,- getUniqueDeployIds,- groupEntriesByDeploy,+ getUniqueReplicaIds,groupEntriesByReleaseFile,+ groupEntriesByReplica,groupEntriesByType,hasError,hasReleaseFileMarkers,@@ -45,18 +45,18 @@ const STATUS_CONFIG: Record<SectionStatus, { icon: Component; class: string }> =export interface UseTaskRunLogSectionsReturn {sections: ComputedRef<Section[]>;- hasMultipleDeploys: ComputedRef<boolean>;+ hasMultipleReplicas: ComputedRef<boolean>;hasReleaseFiles: ComputedRef<boolean>;releaseFileGroups: ComputedRef<ReleaseFileGroup[]>;- deployGroups: ComputedRef<DeployGroup[]>;+ replicaGroups: ComputedRef<ReplicaGroup[]>;expandedSections: Ref<Set<string>>;- expandedDeploys: Ref<Set<string>>;+ expandedReplicas: Ref<Set<string>>;expandedReleaseFiles: Ref<Set<string>>;toggleSection: (sectionId: string) => void;- toggleDeploy: (deployId: string) => void;+ toggleReplica: (replicaId: string) => void;toggleReleaseFile: (fileId: string) => void;isSectionExpanded: (sectionId: string) => boolean;- isDeployExpanded: (deployId: string) => boolean;+ isReplicaExpanded: (replicaId: string) => boolean;isReleaseFileExpanded: (fileId: string) => boolean;expandAll: () => void;collapseAll: () => void;@@ -73,8 +73,8 @@ export const useTaskRunLogSections = (const expandedSections = ref<Set<string>>(new Set());const userCollapsedSections = ref<Set<string>>(new Set());- const expandedDeploys = ref<Set<string>>(new Set());- const userCollapsedDeploys = ref<Set<string>>(new Set());+ const expandedReplicas = ref<Set<string>>(new Set());+ const userCollapsedReplicas = ref<Set<string>>(new Set());const expandedReleaseFiles = ref<Set<string>>(new Set());const userCollapsedReleaseFiles = ref<Set<string>>(new Set());@@ -243,7 +243,7 @@ export const useTaskRunLogSections = (return groups.map((group, groupIdx) => {const { type, entries: groupEntries } = group;- // For interrupted deployments, treat "running" as "error"+ // For interrupted replicas, treat "running" as "error"let status = calculateSectionStatus(groupEntries);if (forceError && status === "running") {status = "error";@@ -280,10 +280,10 @@ export const useTaskRunLogSections = (return buildSectionsFromEntries(entriesValue);});- const hasMultipleDeploys = computed((): boolean => {+ const hasMultipleReplicas = computed((): boolean => {const entriesValue = toValue(entries);- const deployIds = getUniqueDeployIds(entriesValue);- return deployIds.length > 1;+ const replicaIds = getUniqueReplicaIds(entriesValue);+ return replicaIds.length > 1;});const hasReleaseFiles = computed((): boolean => {@@ -329,46 +329,50 @@ export const useTaskRunLogSections = ();};- // Release file groups for single-deploy view+ // Release file groups for single-replica viewconst releaseFileGroups = computed((): ReleaseFileGroup[] => {const entriesValue = toValue(entries);if (!hasReleaseFileMarkers(entriesValue)) return [];return buildReleaseFileGroupsFromEntries(entriesValue);});- const deployGroups = computed((): DeployGroup[] => {+ const replicaGroups = computed((): ReplicaGroup[] => {const entriesValue = toValue(entries);if (!entriesValue.length) return [];- const deployIds = getUniqueDeployIds(entriesValue);- if (deployIds.length <= 1) return [];+ const replicaIds = getUniqueReplicaIds(entriesValue);+ if (replicaIds.length <= 1) return [];- const entriesByDeploy = groupEntriesByDeploy(entriesValue);+ const entriesByReplica = groupEntriesByReplica(entriesValue);- return deployIds.map((deployId, idx) => {- const deployEntries = entriesByDeploy.get(deployId) || [];- const isLatestDeploy = idx === deployIds.length - 1;- const forceError = !isLatestDeploy;+ return replicaIds.map((replicaId, idx) => {+ const replicaEntries = entriesByReplica.get(replicaId) || [];+ const isLatestReplica = idx === replicaIds.length - 1;+ const forceError = !isLatestReplica;- // Check if this deploy has release file markers- const hasFiles = hasReleaseFileMarkers(deployEntries);+ // Check if this replica has release file markers+ const hasFiles = hasReleaseFileMarkers(replicaEntries);if (hasFiles) {return {- deployId,+ replicaId,releaseFileGroups: buildReleaseFileGroupsFromEntries(- deployEntries,- deployId,+ replicaEntries,+ replicaId,forceError),- sections: getOrphanSections(deployEntries, deployId, forceError),+ sections: getOrphanSections(replicaEntries, replicaId, forceError),};}return {- deployId,+ replicaId,releaseFileGroups: [],- sections: buildSectionsFromEntries(deployEntries, deployId, forceError),+ sections: buildSectionsFromEntries(+ replicaEntries,+ replicaId,+ forceError+ ),};});});@@ -383,13 +387,13 @@ export const useTaskRunLogSections = (}};- const toggleDeploy = (deployId: string) => {- if (expandedDeploys.value.has(deployId)) {- deleteFromSet(expandedDeploys, deployId);- addToSet(userCollapsedDeploys, deployId);+ const toggleReplica = (replicaId: string) => {+ if (expandedReplicas.value.has(replicaId)) {+ deleteFromSet(expandedReplicas, replicaId);+ addToSet(userCollapsedReplicas, replicaId);} else {- addToSet(expandedDeploys, deployId);- deleteFromSet(userCollapsedDeploys, deployId);+ addToSet(expandedReplicas, replicaId);+ deleteFromSet(userCollapsedReplicas, replicaId);}};@@ -397,8 +401,8 @@ export const useTaskRunLogSections = (return expandedSections.value.has(sectionId);};- const isDeployExpanded = (deployId: string): boolean => {- return expandedDeploys.value.has(deployId);+ const isReplicaExpanded = (replicaId: string): boolean => {+ return expandedReplicas.value.has(replicaId);};const toggleReleaseFile = (fileId: string) => {@@ -415,10 +419,10 @@ export const useTaskRunLogSections = (return expandedReleaseFiles.value.has(fileId);};- // Get all section IDs (from flat sections, release file groups, and deploy groups)+ // Get all section IDs (from flat sections, release file groups, and replica groups)const getAllSectionIds = (): string[] => {- if (hasMultipleDeploys.value) {- return deployGroups.value.flatMap((group) => {+ if (hasMultipleReplicas.value) {+ return replicaGroups.value.flatMap((group) => {const orphanSectionIds = group.sections.map((s) => s.id);const fileSectionIds = group.releaseFileGroups.flatMap((fg) =>fg.sections.map((s) => s.id)@@ -434,17 +438,17 @@ export const useTaskRunLogSections = (return sections.value.map((section) => section.id);};- // Get all deploy IDs- const getAllDeployIds = (): string[] => {- return deployGroups.value.map((group) => group.deployId);+ // Get all replica IDs+ const getAllReplicaIds = (): string[] => {+ return replicaGroups.value.map((group) => group.replicaId);};// Get all release file IDsconst getAllReleaseFileIds = (): string[] => {- if (hasMultipleDeploys.value) {- return deployGroups.value.flatMap((group) =>+ if (hasMultipleReplicas.value) {+ return replicaGroups.value.flatMap((group) =>group.releaseFileGroups.map(- (_, fileIdx) => `${group.deployId}-file-${fileIdx}`+ (_, fileIdx) => `${group.replicaId}-file-${fileIdx}`));}@@ -457,11 +461,11 @@ export const useTaskRunLogSections = (addToSet(expandedSections, sectionId);deleteFromSet(userCollapsedSections, sectionId);}- // Expand all deploy groups (for multi-deploy view)- if (hasMultipleDeploys.value) {- for (const deployId of getAllDeployIds()) {- addToSet(expandedDeploys, deployId);- deleteFromSet(userCollapsedDeploys, deployId);+ // Expand all replica groups (for multi-replica view)+ if (hasMultipleReplicas.value) {+ for (const replicaId of getAllReplicaIds()) {+ addToSet(expandedReplicas, replicaId);+ deleteFromSet(userCollapsedReplicas, replicaId);}}// Expand all release file groups@@ -477,11 +481,11 @@ export const useTaskRunLogSections = (deleteFromSet(expandedSections, sectionId);addToSet(userCollapsedSections, sectionId);}- // Collapse all deploy groups (for multi-deploy view)- if (hasMultipleDeploys.value) {- for (const deployId of getAllDeployIds()) {- deleteFromSet(expandedDeploys, deployId);- addToSet(userCollapsedDeploys, deployId);+ // Collapse all replica groups (for multi-replica view)+ if (hasMultipleReplicas.value) {+ for (const replicaId of getAllReplicaIds()) {+ deleteFromSet(expandedReplicas, replicaId);+ addToSet(userCollapsedReplicas, replicaId);}}// Collapse all release file groups@@ -505,14 +509,14 @@ export const useTaskRunLogSections = (allReleaseFileIds.length === 0 ||allReleaseFileIds.every((id) => expandedReleaseFiles.value.has(id));- // For multi-deploy view, also check deploy groups- if (hasMultipleDeploys.value) {- const allDeployIds = getAllDeployIds();- const allDeploysExpanded = allDeployIds.every((id) =>- expandedDeploys.value.has(id)+ // For multi-replica view, also check replica groups+ if (hasMultipleReplicas.value) {+ const allReplicaIds = getAllReplicaIds();+ const allReplicasExpanded = allReplicaIds.every((id) =>+ expandedReplicas.value.has(id));return (- allSectionsExpanded && allDeploysExpanded && allReleaseFilesExpanded+ allSectionsExpanded && allReplicasExpanded && allReleaseFilesExpanded);}@@ -520,8 +524,8 @@ export const useTaskRunLogSections = (});const totalSections = computed((): number => {- if (hasMultipleDeploys.value) {- return deployGroups.value.reduce((sum, group) => {+ if (hasMultipleReplicas.value) {+ return replicaGroups.value.reduce((sum, group) => {const orphanCount = group.sections.length;const fileCount = group.releaseFileGroups.reduce((fSum, fg) => fSum + fg.sections.length,@@ -540,8 +544,8 @@ export const useTaskRunLogSections = (});const totalEntries = computed((): number => {- if (hasMultipleDeploys.value) {- return deployGroups.value.reduce((sum, group) => {+ if (hasMultipleReplicas.value) {+ return replicaGroups.value.reduce((sum, group) => {const orphanEntries = group.sections.reduce((sSum, section) => sSum + section.entryCount,0@@ -580,17 +584,17 @@ export const useTaskRunLogSections = ({ immediate: true });- // Auto-expand all deploys and error sections in deploy groups+ // Auto-expand all replicas and error sections in replica groupswatch(- deployGroups,- (newDeployGroups) => {- for (const deployGroup of newDeployGroups) {- // Auto-expand all deploy groups by default- if (!userCollapsedDeploys.value.has(deployGroup.deployId)) {- addToSet(expandedDeploys, deployGroup.deployId);+ replicaGroups,+ (newReplicaGroups) => {+ for (const replicaGroup of newReplicaGroups) {+ // Auto-expand all replica groups by default+ if (!userCollapsedReplicas.value.has(replicaGroup.replicaId)) {+ addToSet(expandedReplicas, replicaGroup.replicaId);}- // Auto-expand error sections within deploy groups (orphan sections)- for (const section of deployGroup.sections) {+ // Auto-expand error sections within replica groups (orphan sections)+ for (const section of replicaGroup.sections) {if (section.status === "error" &&!userCollapsedSections.value.has(section.id)@@ -599,8 +603,8 @@ export const useTaskRunLogSections = (}}// Auto-expand release file groups and their error sections- deployGroup.releaseFileGroups.forEach((fg, fileIdx) => {- const fileId = `${deployGroup.deployId}-file-${fileIdx}`;+ replicaGroup.releaseFileGroups.forEach((fg, fileIdx) => {+ const fileId = `${replicaGroup.replicaId}-file-${fileIdx}`;// Auto-expand all release file groups by defaultif (!userCollapsedReleaseFiles.value.has(fileId)) {addToSet(expandedReleaseFiles, fileId);@@ -620,7 +624,7 @@ export const useTaskRunLogSections = ({ immediate: true });- // Auto-expand release file groups (single-deploy view)+ // Auto-expand release file groups (single-replica view)watch(releaseFileGroups,(newReleaseFileGroups) => {@@ -646,18 +650,18 @@ export const useTaskRunLogSections = (return {sections,- hasMultipleDeploys,+ hasMultipleReplicas,hasReleaseFiles,releaseFileGroups,- deployGroups,+ replicaGroups,expandedSections,- expandedDeploys,+ expandedReplicas,expandedReleaseFiles,toggleSection,- toggleDeploy,+ toggleReplica,toggleReleaseFile,isSectionExpanded,- isDeployExpanded,+ isReplicaExpanded,isReleaseFileExpanded,expandAll,collapseAll,diff --git a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/utils.ts b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/utils.tsindex e64da16b80..1baec2f576 100644--- a/frontend/src/components/RolloutV1/components/TaskRunLogViewer/utils.ts+++ b/frontend/src/components/RolloutV1/components/TaskRunLogViewer/utils.ts@@ -104,8 +104,8 @@ export const groupEntriesByType = (return groups;};-// Get unique deploy IDs from entries, preserving order of first appearance-export const getUniqueDeployIds = (entries: TaskRunLogEntry[]): string[] => {+// Get unique replica IDs from entries, preserving order of first appearance+export const getUniqueReplicaIds = (entries: TaskRunLogEntry[]): string[] => {if (!entries.length) return [];const sortedEntries = [...entries].sort((a, b) => {@@ -113,31 +113,31 @@ export const getUniqueDeployIds = (entries: TaskRunLogEntry[]): string[] => {});const seen = new Set<string>();- const deployIds: string[] = [];+ const replicaIds: string[] = [];for (const entry of sortedEntries) {- const deployId = entry.deployId || "";- if (deployId && !seen.has(deployId)) {- seen.add(deployId);- deployIds.push(deployId);+ const replicaId = entry.replicaId || "";+ if (replicaId && !seen.has(replicaId)) {+ seen.add(replicaId);+ replicaIds.push(replicaId);}}- return deployIds;+ return replicaIds;};-// Group entries by deploy ID, maintaining time order within each group-export const groupEntriesByDeploy = (+// Group entries by replica ID, maintaining time order within each group+export const groupEntriesByReplica = (entries: TaskRunLogEntry[]): Map<string, TaskRunLogEntry[]> => {const result = new Map<string, TaskRunLogEntry[]>();for (const entry of entries) {- const deployId = entry.deployId || "unknown";- if (!result.has(deployId)) {- result.set(deployId, []);+ const replicaId = entry.replicaId || "unknown";+ if (!result.has(replicaId)) {+ result.set(replicaId, []);}- result.get(deployId)!.push(entry);+ result.get(replicaId)!.push(entry);}return result;diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.jsonindex 7d112d1210..c258a08368 100644--- a/frontend/src/locales/en-US.json+++ b/frontend/src/locales/en-US.json@@ -390,8 +390,8 @@"computing": "computing..."},"log-viewer": {- "multiple-deploys-notice": "Server restart detected during execution. Logs are grouped by deployment.",- "deployment-n": "Deployment #{n}",+ "multiple-replicas-notice": "Server restart detected during execution. Logs are grouped by replica.",+ "replica-n": "Replica #{n}","expand-all": "Expand all","collapse-all": "Collapse all","summary": "{sections} sections · {entries} entries"diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.jsonindex f997a42c50..daa539d9f9 100644--- a/frontend/src/locales/es-ES.json+++ b/frontend/src/locales/es-ES.json@@ -390,8 +390,8 @@"computing": "computación..."},"log-viewer": {- "multiple-deploys-notice": "Se detectó un reinicio del servidor durante la ejecución. Los registros están agrupados por despliegue.",- "deployment-n": "Despliegue #{n}",+ "multiple-replicas-notice": "Se detectó un reinicio del servidor durante la ejecución. Los registros están agrupados por réplica.",+ "replica-n": "Réplica #{n}","expand-all": "Expandir todo","collapse-all": "Contraer todo","summary": "{sections} secciones · {entries} entradas"diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.jsonindex 20698e0f2b..b5696804e3 100644--- a/frontend/src/locales/ja-JP.json+++ b/frontend/src/locales/ja-JP.json@@ -390,8 +390,8 @@"computing": "コンピューティング..."},"log-viewer": {- "multiple-deploys-notice": "実行中にサーバーの再起動が検出されました。ログはデプロイごとにグループ化されています。",- "deployment-n": "デプロイ #{n}",+ "multiple-replicas-notice": "実行中にサーバーの再起動が検出されました。ログはレプリカごとにグループ化されています。",+ "replica-n": "レプリカ #{n}","expand-all": "すべて展開","collapse-all": "すべて折りたたむ","summary": "{sections} セクション · {entries} エントリ"diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.jsonindex 66622d0c1e..2a52a2e94e 100644--- a/frontend/src/locales/vi-VN.json+++ b/frontend/src/locales/vi-VN.json@@ -390,8 +390,8 @@"computing": "tính toán..."},"log-viewer": {- "multiple-deploys-notice": "Phát hiện khởi động lại máy chủ trong quá trình thực thi. Nhật ký được nhóm theo triển khai.",- "deployment-n": "Triển khai #{n}",+ "multiple-replicas-notice": "Phát hiện khởi động lại máy chủ trong quá trình thực thi. Nhật ký được nhóm theo bản sao.",+ "replica-n": "Bản sao #{n}","expand-all": "Mở rộng tất cả","collapse-all": "Thu gọn tất cả","summary": "{sections} phần · {entries} mục"diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.jsonindex 25540d4c22..f0bc0041c4 100644--- a/frontend/src/locales/zh-CN.json+++ b/frontend/src/locales/zh-CN.json@@ -390,8 +390,8 @@"computing": "计算中..."},"log-viewer": {- "multiple-deploys-notice": "检测到执行期间服务重启,日志按部署分组显示。",- "deployment-n": "部署 #{n}",+ "multiple-replicas-notice": "检测到执行期间服务重启,日志按副本分组显示。",+ "replica-n": "副本 #{n}","expand-all": "全部展开","collapse-all": "全部收起","summary": "{sections} 个分组 · {entries} 条记录"diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts b/frontend/src/types/proto-es/v1/rollout_service_pb.d.tsindex 8eea771f1e..a2c2b85b8b 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.d.ts@@ -996,11 +996,11 @@ export declare type TaskRunLogEntry = Message<"bytebase.v1.TaskRunLogEntry"> & {logTime?: Timestamp;/**- * The deployment ID for this log entry.+ * The replica ID for this log entry.*- * @generated from field: string deploy_id = 3;+ * @generated from field: string replica_id = 3;*/- deployId: string;+ replicaId: string;/*** Schema dump details (if type is SCHEMA_DUMP).diff --git a/frontend/src/types/proto-es/v1/rollout_service_pb.js b/frontend/src/types/proto-es/v1/rollout_service_pb.jsindex 0d3f9a92e2..65dedd3e8d 100644--- a/frontend/src/types/proto-es/v1/rollout_service_pb.js+++ b/frontend/src/types/proto-es/v1/rollout_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_common } from "./common_pb";* Describes the file v1/rollout_service.proto.*/export const file_v1_rollout_service = /*@__PURE__*/- fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpEBChRCYXRjaFJ1blRhc2tzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1N0YWdlEg0KBXRhc2tzGAIgAygJEjEKCHJ1bl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBQgsKCV9ydW5fdGltZSIXChVCYXRjaFJ1blRhc2tzUmVzcG9uc2UibAoVQmF0Y2hTa2lwVGFza3NSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vU3RhZ2USDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIloKGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzaxIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiYQoUQ3JlYXRlUm9sbG91dFJlcXVlc3QSKQoGcGFyZW50GAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhMKBnRhcmdldBgDIAEoCUgAiAEBQgkKB190YXJnZXQiQAoTTGlzdFRhc2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1Rhc2siPwoUTGlzdFRhc2tSdW5zUmVzcG9uc2USJwoJdGFza19ydW5zGAEgAygLMhQuYnl0ZWJhc2UudjEuVGFza1J1biI/ChFHZXRUYXNrUnVuUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIkQKFEdldFRhc2tSdW5Mb2dSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vVGFza1J1biKEAgoHUm9sbG91dBIMCgRuYW1lGAEgASgJEhIKBXRpdGxlGAMgASgJQgPgQQMSJwoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2VCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpC6kE/ChRieXRlYmFzZS5jb20vUm9sbG91dBIncHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0Iq4BCgVTdGFnZRIMCgRuYW1lGAEgASgJEg8KAmlkGAIgASgJQgPgQQMSEwoLZW52aXJvbm1lbnQYAyABKAkSIAoFdGFza3MYBCADKAsyES5ieXRlYmFzZS52MS5UYXNrOk/qQUwKEmJ5dGViYXNlLmNvbS9TdGFnZRI2cHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9IsQHCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEaHwoORGF0YWJhc2VDcmVhdGUSDQoFc2hlZXQYBCABKAkaPgoORGF0YWJhc2VVcGRhdGUSDwoFc2hlZXQYASABKAlIABIRCgdyZWxlYXNlGAQgASgJSABCCAoGc291cmNlGiMKEkRhdGFiYXNlRGF0YUV4cG9ydBINCgVzaGVldBgCIAEoCSJ8CgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASDwoLTk9UX1NUQVJURUQQARILCgdQRU5ESU5HEAISCwoHUlVOTklORxADEggKBERPTkUQBBIKCgZGQUlMRUQQBRIMCghDQU5DRUxFRBAGEgsKB1NLSVBQRUQQByJpCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESEwoPREFUQUJBU0VfQ1JFQVRFEAISFAoQREFUQUJBU0VfTUlHUkFURRADEhMKD0RBVEFCQVNFX0VYUE9SVBAEOlvqQVgKEWJ5dGViYXNlLmNvbS9UYXNrEkNwcm9qZWN0cy97cHJvamVjdH0vcGxhbnMve3BsYW59L3JvbGxvdXQvc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLsBwoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEhgKEGhhc19wcmlvcl9iYWNrdXAYCyABKAgSPwoOc2NoZWR1bGVyX2luZm8YDCABKAsyIi5ieXRlYmFzZS52MS5UYXNrUnVuLlNjaGVkdWxlckluZm9CA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGsEBCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRo3CgxXYWl0aW5nQ2F1c2USHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIAEIHCgVjYXVzZSJtCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgsKB1JVTk5JTkcQAhIICgRET05FEAMSCgoGRkFJTEVEEAQSDAoIQ0FOQ0VMRUQQBRINCglBVkFJTEFCTEUQBiJVChNFeHBvcnRBcmNoaXZlU3RhdHVzEiUKIUVYUE9SVF9BUkNISVZFX1NUQVRVU19VTlNQRUNJRklFRBAAEgkKBVJFQURZEAESDAoIRVhQT1JURUQQAjpx6kFuChRieXRlYmFzZS5jb20vVGFza1J1bhJWcHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn1CCwoJX3J1bl90aW1lIsMBCgpUYXNrUnVuTG9nEgwKBG5hbWUYASABKAkSLQoHZW50cmllcxgCIAMoCzIcLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeTp46kF1ChdieXRlYmFzZS5jb20vVGFza1J1bkxvZxJacHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIuQTCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIRCglkZXBsb3lfaWQYAyABKAkSPAoLc2NoZW1hX2R1bXAYBCABKAsyJy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuU2NoZW1hRHVtcBJECg9jb21tYW5kX2V4ZWN1dGUYBSABKAsyKy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUSQAoNZGF0YWJhc2Vfc3luYxgGIAEoCzIpLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5EYXRhYmFzZVN5bmMSTAoTdHJhbnNhY3Rpb25fY29udHJvbBgIIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wSPgoMcHJpb3JfYmFja3VwGAkgASgLMiguYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwEjoKCnJldHJ5X2luZm8YCiABKAsyJi5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUmV0cnlJbmZvEj4KDGNvbXB1dGVfZGlmZhgLIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21wdXRlRGlmZhJNChRyZWxlYXNlX2ZpbGVfZXhlY3V0ZRgMIAEoCzIvLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5SZWxlYXNlRmlsZUV4ZWN1dGUaeQoKU2NoZW1hRHVtcBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAyABKAkaxgIKDkNvbW1hbmRFeGVjdXRlEiwKCGxvZ190aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIhCgVyYW5nZRgCIAEoCzISLmJ5dGViYXNlLnYxLlJhbmdlEhEKCXN0YXRlbWVudBgEIAEoCRJNCghyZXNwb25zZRgDIAEoCzI7LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5Db21tYW5kRXhlY3V0ZS5Db21tYW5kUmVzcG9uc2UagAEKD0NvbW1hbmRSZXNwb25zZRIsCghsb2dfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDQoFZXJyb3IYAiABKAkSFQoNYWZmZWN0ZWRfcm93cxgDIAEoAxIZChFhbGxfYWZmZWN0ZWRfcm93cxgEIAMoAxp7CgxEYXRhYmFzZVN5bmMSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGqoBChJUcmFuc2FjdGlvbkNvbnRyb2wSQgoEdHlwZRgBIAEoDjI0LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UcmFuc2FjdGlvbkNvbnRyb2wuVHlwZRINCgVlcnJvchgCIAEoCSJBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVCRUdJThABEgoKBkNPTU1JVBACEgwKCFJPTExCQUNLEAMakgUKC1ByaW9yQmFja3VwEi4KCnN0YXJ0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJXChNwcmlvcl9iYWNrdXBfZGV0YWlsGAMgASgLMjouYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlByaW9yQmFja3VwLlByaW9yQmFja3VwRGV0YWlsEg0KBWVycm9yGAQgASgJGrwDChFQcmlvckJhY2t1cERldGFpbBJOCgVpdGVtcxgBIAMoCzI/LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtGtYCCgRJdGVtElsKDHNvdXJjZV90YWJsZRgBIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlElsKDHRhcmdldF90YWJsZRgCIAEoCzJFLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbC5JdGVtLlRhYmxlEi0KDnN0YXJ0X3Bvc2l0aW9uGAMgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAQgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24aOAoFVGFibGUSEAoIZGF0YWJhc2UYASABKAkSDgoGc2NoZW1hGAIgASgJEg0KBXRhYmxlGAMgASgJGkgKCVJldHJ5SW5mbxINCgVlcnJvchgBIAEoCRITCgtyZXRyeV9jb3VudBgCIAEoBRIXCg9tYXhpbXVtX3JldHJpZXMYAyABKAUaegoLQ29tcHV0ZURpZmYSLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGjgKElJlbGVhc2VGaWxlRXhlY3V0ZRIPCgd2ZXJzaW9uGAEgASgJEhEKCWZpbGVfcGF0aBgCIAEoCSK8AQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASDwoLU0NIRU1BX0RVTVAQARITCg9DT01NQU5EX0VYRUNVVEUQAhIRCg1EQVRBQkFTRV9TWU5DEAMSFwoTVFJBTlNBQ1RJT05fQ09OVFJPTBAFEhAKDFBSSU9SX0JBQ0tVUBAGEg4KClJFVFJZX0lORk8QBxIQCgxDT01QVVRFX0RJRkYQCBIYChRSRUxFQVNFX0ZJTEVfRVhFQ1VURRAJIkgKGEdldFRhc2tSdW5TZXNzaW9uUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4i6wcKDlRhc2tSdW5TZXNzaW9uEgwKBG5hbWUYASABKAkSOAoIcG9zdGdyZXMYAiABKAsyJC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlc0gAGoIGCghQb3N0Z3JlcxI9CgdzZXNzaW9uGAEgASgLMiwuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXMuU2Vzc2lvbhJHChFibG9ja2luZ19zZXNzaW9ucxgCIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRgoQYmxvY2tlZF9zZXNzaW9ucxgDIAMoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24apQQKB1Nlc3Npb24SCwoDcGlkGAEgASgJEhcKD2Jsb2NrZWRfYnlfcGlkcxgCIAMoCRINCgVxdWVyeRgDIAEoCRISCgVzdGF0ZRgEIAEoCUgAiAEBEhwKD3dhaXRfZXZlbnRfdHlwZRgFIAEoCUgBiAEBEhcKCndhaXRfZXZlbnQYBiABKAlIAogBARIUCgdkYXRuYW1lGAcgASgJSAOIAQESFAoHdXNlbmFtZRgIIAEoCUgEiAEBEhgKEGFwcGxpY2F0aW9uX25hbWUYCSABKAkSGAoLY2xpZW50X2FkZHIYCiABKAlIBYgBARIYCgtjbGllbnRfcG9ydBgLIAEoCUgGiAEBEjEKDWJhY2tlbmRfc3RhcnQYDCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjMKCnhhY3Rfc3RhcnQYDSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAeIAQESNAoLcXVlcnlfc3RhcnQYDiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAiIAQFCCAoGX3N0YXRlQhIKEF93YWl0X2V2ZW50X3R5cGVCDQoLX3dhaXRfZXZlbnRCCgoIX2RhdG5hbWVCCgoIX3VzZW5hbWVCDgoMX2NsaWVudF9hZGRyQg4KDF9jbGllbnRfcG9ydEINCgtfeGFjdF9zdGFydEIOCgxfcXVlcnlfc3RhcnQ6gAHqQX0KG2J5dGViYXNlLmNvbS9UYXNrUnVuU2Vzc2lvbhJecHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vc2Vzc2lvbkIJCgdzZXNzaW9uIksKHVByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Rhc2tSdW4iMwoeUHJldmlld1Rhc2tSdW5Sb2xsYmFja1Jlc3BvbnNlEhEKCXN0YXRlbWVudBgBIAEoCTKhEAoOUm9sbG91dFNlcnZpY2USjwEKCkdldFJvbGxvdXQSHi5ieXRlYmFzZS52MS5HZXRSb2xsb3V0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlJvbGxvdXQiS9pBBG5hbWWK6jAPYmIucm9sbG91dHMuZ2V0kOowAYLT5JMCJxIlL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0fRKeAQoMTGlzdFJvbGxvdXRzEiAuYnl0ZWJhc2UudjEuTGlzdFJvbGxvdXRzUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RSb2xsb3V0c1Jlc3BvbnNlIknaQQZwYXJlbnSK6jAQYmIucm9sbG91dHMubGlzdJDqMAGC0+STAiISIC92MS97cGFyZW50PXByb2plY3RzLyp9L3JvbGxvdXRzEqMBCg1DcmVhdGVSb2xsb3V0EiEuYnl0ZWJhc2UudjEuQ3JlYXRlUm9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IlnaQQZwYXJlbnSK6jASYmIucm9sbG91dHMuY3JlYXRlkOowAZjqMAGC0+STAiw6ASoiJy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKn0vcm9sbG91dBK/AQoMTGlzdFRhc2tSdW5zEiAuYnl0ZWJhc2UudjEuTGlzdFRhc2tSdW5zUmVxdWVzdBohLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1Jlc3BvbnNlImraQQZwYXJlbnSK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAkMSQS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyp9L3Rhc2tSdW5zEqwBCgpHZXRUYXNrUnVuEh4uYnl0ZWJhc2UudjEuR2V0VGFza1J1blJlcXVlc3QaFC5ieXRlYmFzZS52MS5UYXNrUnVuImjaQQRuYW1liuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJDEkEvdjEve25hbWU9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfRK9AQoNR2V0VGFza1J1bkxvZxIhLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5Mb2dSZXF1ZXN0GhcuYnl0ZWJhc2UudjEuVGFza1J1bkxvZyJw2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJJEkcvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L2xvZxLNAQoRR2V0VGFza1J1blNlc3Npb24SJS5ieXRlYmFzZS52MS5HZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QaGy5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbiJ02kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJNEksvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9L3Nlc3Npb24SswEKDUJhdGNoUnVuVGFza3MSIS5ieXRlYmFzZS52MS5CYXRjaFJ1blRhc2tzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkJhdGNoUnVuVGFza3NSZXNwb25zZSJb2kEGcGFyZW50kOowApjqMAGC0+STAkQ6ASoiPy92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qfS90YXNrczpiYXRjaFJ1bhK3AQoOQmF0Y2hTa2lwVGFza3MSIi5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1JlcXVlc3QaIy5ieXRlYmFzZS52MS5CYXRjaFNraXBUYXNrc1Jlc3BvbnNlIlzaQQZwYXJlbnSQ6jACmOowAYLT5JMCRToBKiJAL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyp9L3Rhc2tzOmJhdGNoU2tpcBLTAQoTQmF0Y2hDYW5jZWxUYXNrUnVucxInLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0GiguYnl0ZWJhc2UudjEuQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlImnaQQZwYXJlbnSQ6jACmOowAYLT5JMCUjoBKiJNL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKn0vdGFza1J1bnM6YmF0Y2hDYW5jZWwS7gEKFlByZXZpZXdUYXNrUnVuUm9sbGJhY2sSKi5ieXRlYmFzZS52MS5QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVxdWVzdBorLmJ5dGViYXNlLnYxLlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXNwb25zZSJ72kEEbmFtZYrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCVjoBKiJRL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn06cHJldmlld1JvbGxiYWNrQqkBCg9jb20uYnl0ZWJhc2UudjFCE1JvbGxvdXRTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);+ fileDesc("Chh2MS9yb2xsb3V0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIpEBChRCYXRjaFJ1blRhc2tzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL1N0YWdlEg0KBXRhc2tzGAIgAygJEjEKCHJ1bl90aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgAiAEBQgsKCV9ydW5fdGltZSIXChVCYXRjaFJ1blRhc2tzUmVzcG9uc2UibAoVQmF0Y2hTa2lwVGFza3NSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vU3RhZ2USDQoFdGFza3MYAiADKAkSGAoGcmVhc29uGAMgASgJQgi6SAVyAxjoByIYChZCYXRjaFNraXBUYXNrc1Jlc3BvbnNlIloKGkJhdGNoQ2FuY2VsVGFza1J1bnNSZXF1ZXN0EikKBnBhcmVudBgBIAEoCUIZ4EEC+kETChFieXRlYmFzZS5jb20vVGFzaxIRCgl0YXNrX3J1bnMYAiADKAkiHQobQmF0Y2hDYW5jZWxUYXNrUnVuc1Jlc3BvbnNlIj8KEUdldFJvbGxvdXRSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1JvbGxvdXQiegoTTGlzdFJvbGxvdXRzUmVxdWVzdBIsCgZwYXJlbnQYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJIlcKFExpc3RSb2xsb3V0c1Jlc3BvbnNlEiYKCHJvbGxvdXRzGAEgAygLMhQuYnl0ZWJhc2UudjEuUm9sbG91dBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiYQoUQ3JlYXRlUm9sbG91dFJlcXVlc3QSKQoGcGFyZW50GAEgASgJQhngQQL6QRMKEWJ5dGViYXNlLmNvbS9QbGFuEhMKBnRhcmdldBgDIAEoCUgAiAEBQgkKB190YXJnZXQiQAoTTGlzdFRhc2tSdW5zUmVxdWVzdBIpCgZwYXJlbnQYASABKAlCGeBBAvpBEwoRYnl0ZWJhc2UuY29tL1Rhc2siPwoUTGlzdFRhc2tSdW5zUmVzcG9uc2USJwoJdGFza19ydW5zGAEgAygLMhQuYnl0ZWJhc2UudjEuVGFza1J1biI/ChFHZXRUYXNrUnVuUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIkQKFEdldFRhc2tSdW5Mb2dSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vVGFza1J1biKEAgoHUm9sbG91dBIMCgRuYW1lGAEgASgJEhIKBXRpdGxlGAMgASgJQgPgQQMSJwoGc3RhZ2VzGAQgAygLMhIuYnl0ZWJhc2UudjEuU3RhZ2VCA+BBAxI0CgtjcmVhdGVfdGltZRgGIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgHIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAzpC6kE/ChRieXRlYmFzZS5jb20vUm9sbG91dBIncHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0Iq4BCgVTdGFnZRIMCgRuYW1lGAEgASgJEg8KAmlkGAIgASgJQgPgQQMSEwoLZW52aXJvbm1lbnQYAyABKAkSIAoFdGFza3MYBCADKAsyES5ieXRlYmFzZS52MS5UYXNrOk/qQUwKEmJ5dGViYXNlLmNvbS9TdGFnZRI2cHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9IsQHCgRUYXNrEgwKBG5hbWUYASABKAkSDwoHc3BlY19pZBgCIAEoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5UYXNrLlN0YXR1cxIWCg5za2lwcGVkX3JlYXNvbhgEIAEoCRIkCgR0eXBlGAUgASgOMhYuYnl0ZWJhc2UudjEuVGFzay5UeXBlEg4KBnRhcmdldBgGIAEoCRI7Cg9kYXRhYmFzZV9jcmVhdGUYByABKAsyIC5ieXRlYmFzZS52MS5UYXNrLkRhdGFiYXNlQ3JlYXRlSAASOwoPZGF0YWJhc2VfdXBkYXRlGAggASgLMiAuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZVVwZGF0ZUgAEkQKFGRhdGFiYXNlX2RhdGFfZXhwb3J0GAkgASgLMiQuYnl0ZWJhc2UudjEuVGFzay5EYXRhYmFzZURhdGFFeHBvcnRIABI5Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gBiAEBEjYKCHJ1bl90aW1lGAsgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDSAKIAQEaHwoORGF0YWJhc2VDcmVhdGUSDQoFc2hlZXQYBCABKAkaPgoORGF0YWJhc2VVcGRhdGUSDwoFc2hlZXQYASABKAlIABIRCgdyZWxlYXNlGAQgASgJSABCCAoGc291cmNlGiMKEkRhdGFiYXNlRGF0YUV4cG9ydBINCgVzaGVldBgCIAEoCSJ8CgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASDwoLTk9UX1NUQVJURUQQARILCgdQRU5ESU5HEAISCwoHUlVOTklORxADEggKBERPTkUQBBIKCgZGQUlMRUQQBRIMCghDQU5DRUxFRBAGEgsKB1NLSVBQRUQQByJpCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABILCgdHRU5FUkFMEAESEwoPREFUQUJBU0VfQ1JFQVRFEAISFAoQREFUQUJBU0VfTUlHUkFURRADEhMKD0RBVEFCQVNFX0VYUE9SVBAEOlvqQVgKEWJ5dGViYXNlLmNvbS9UYXNrEkNwcm9qZWN0cy97cHJvamVjdH0vcGxhbnMve3BsYW59L3JvbGxvdXQvc3RhZ2VzL3tzdGFnZX0vdGFza3Mve3Rhc2t9QgkKB3BheWxvYWRCDgoMX3VwZGF0ZV90aW1lQgsKCV9ydW5fdGltZSLsBwoHVGFza1J1bhIMCgRuYW1lGAEgASgJEg8KB2NyZWF0b3IYAiABKAkSNAoLY3JlYXRlX3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSKwoGc3RhdHVzGAUgASgOMhsuYnl0ZWJhc2UudjEuVGFza1J1bi5TdGF0dXMSDgoGZGV0YWlsGAYgASgJEjMKCnN0YXJ0X3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSRwoVZXhwb3J0X2FyY2hpdmVfc3RhdHVzGAogASgOMiguYnl0ZWJhc2UudjEuVGFza1J1bi5FeHBvcnRBcmNoaXZlU3RhdHVzEhgKEGhhc19wcmlvcl9iYWNrdXAYCyABKAgSPwoOc2NoZWR1bGVyX2luZm8YDCABKAsyIi5ieXRlYmFzZS52MS5UYXNrUnVuLlNjaGVkdWxlckluZm9CA+BBAxI2CghydW5fdGltZRgOIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBA0gAiAEBGsEBCg1TY2hlZHVsZXJJbmZvEi8KC3JlcG9ydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBJGCg13YWl0aW5nX2NhdXNlGAIgASgLMi8uYnl0ZWJhc2UudjEuVGFza1J1bi5TY2hlZHVsZXJJbmZvLldhaXRpbmdDYXVzZRo3CgxXYWl0aW5nQ2F1c2USHgoUcGFyYWxsZWxfdGFza3NfbGltaXQYAyABKAhIAEIHCgVjYXVzZSJtCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgsKB1JVTk5JTkcQAhIICgRET05FEAMSCgoGRkFJTEVEEAQSDAoIQ0FOQ0VMRUQQBRINCglBVkFJTEFCTEUQBiJVChNFeHBvcnRBcmNoaXZlU3RhdHVzEiUKIUVYUE9SVF9BUkNISVZFX1NUQVRVU19VTlNQRUNJRklFRBAAEgkKBVJFQURZEAESDAoIRVhQT1JURUQQAjpx6kFuChRieXRlYmFzZS5jb20vVGFza1J1bhJWcHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn1CCwoJX3J1bl90aW1lIsMBCgpUYXNrUnVuTG9nEgwKBG5hbWUYASABKAkSLQoHZW50cmllcxgCIAMoCzIcLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeTp46kF1ChdieXRlYmFzZS5jb20vVGFza1J1bkxvZxJacHJvamVjdHMve3Byb2plY3R9L3BsYW5zL3twbGFufS9yb2xsb3V0L3N0YWdlcy97c3RhZ2V9L3Rhc2tzL3t0YXNrfS90YXNrUnVucy97dGFza1J1bn0vbG9nIuUTCg9UYXNrUnVuTG9nRW50cnkSLwoEdHlwZRgBIAEoDjIhLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5UeXBlEiwKCGxvZ190aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBISCgpyZXBsaWNhX2lkGAMgASgJEjwKC3NjaGVtYV9kdW1wGAQgASgLMicuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlNjaGVtYUR1bXASRAoPY29tbWFuZF9leGVjdXRlGAUgASgLMisuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LkNvbW1hbmRFeGVjdXRlEkAKDWRhdGFiYXNlX3N5bmMYBiABKAsyKS5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuRGF0YWJhc2VTeW5jEkwKE3RyYW5zYWN0aW9uX2NvbnRyb2wYCCABKAsyLy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuVHJhbnNhY3Rpb25Db250cm9sEj4KDHByaW9yX2JhY2t1cBgJIAEoCzIoLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cBI6CgpyZXRyeV9pbmZvGAogASgLMiYuYnl0ZWJhc2UudjEuVGFza1J1bkxvZ0VudHJ5LlJldHJ5SW5mbxI+Cgxjb21wdXRlX2RpZmYYCyABKAsyKC5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tcHV0ZURpZmYSTQoUcmVsZWFzZV9maWxlX2V4ZWN1dGUYDCABKAsyLy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUmVsZWFzZUZpbGVFeGVjdXRlGnkKClNjaGVtYUR1bXASLgoKc3RhcnRfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLAoIZW5kX3RpbWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAMgASgJGsYCCg5Db21tYW5kRXhlY3V0ZRIsCghsb2dfdGltZRgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASIQoFcmFuZ2UYAiABKAsyEi5ieXRlYmFzZS52MS5SYW5nZRIRCglzdGF0ZW1lbnQYBCABKAkSTQoIcmVzcG9uc2UYAyABKAsyOy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuQ29tbWFuZEV4ZWN1dGUuQ29tbWFuZFJlc3BvbnNlGoABCg9Db21tYW5kUmVzcG9uc2USLAoIbG9nX3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEg0KBWVycm9yGAIgASgJEhUKDWFmZmVjdGVkX3Jvd3MYAyABKAMSGQoRYWxsX2FmZmVjdGVkX3Jvd3MYBCADKAMaewoMRGF0YWJhc2VTeW5jEi4KCnN0YXJ0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBINCgVlcnJvchgDIAEoCRqqAQoSVHJhbnNhY3Rpb25Db250cm9sEkIKBHR5cGUYASABKA4yNC5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuVHJhbnNhY3Rpb25Db250cm9sLlR5cGUSDQoFZXJyb3IYAiABKAkiQQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCQoFQkVHSU4QARIKCgZDT01NSVQQAhIMCghST0xMQkFDSxADGpIFCgtQcmlvckJhY2t1cBIuCgpzdGFydF90aW1lGAEgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIsCghlbmRfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASVwoTcHJpb3JfYmFja3VwX2RldGFpbBgDIAEoCzI6LmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2dFbnRyeS5QcmlvckJhY2t1cC5QcmlvckJhY2t1cERldGFpbBINCgVlcnJvchgEIAEoCRq8AwoRUHJpb3JCYWNrdXBEZXRhaWwSTgoFaXRlbXMYASADKAsyPy5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUHJpb3JCYWNrdXAuUHJpb3JCYWNrdXBEZXRhaWwuSXRlbRrWAgoESXRlbRJbCgxzb3VyY2VfdGFibGUYASABKAsyRS5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUHJpb3JCYWNrdXAuUHJpb3JCYWNrdXBEZXRhaWwuSXRlbS5UYWJsZRJbCgx0YXJnZXRfdGFibGUYAiABKAsyRS5ieXRlYmFzZS52MS5UYXNrUnVuTG9nRW50cnkuUHJpb3JCYWNrdXAuUHJpb3JCYWNrdXBEZXRhaWwuSXRlbS5UYWJsZRItCg5zdGFydF9wb3NpdGlvbhgDIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uEisKDGVuZF9wb3NpdGlvbhgEIAEoCzIVLmJ5dGViYXNlLnYxLlBvc2l0aW9uGjgKBVRhYmxlEhAKCGRhdGFiYXNlGAEgASgJEg4KBnNjaGVtYRgCIAEoCRINCgV0YWJsZRgDIAEoCRpICglSZXRyeUluZm8SDQoFZXJyb3IYASABKAkSEwoLcmV0cnlfY291bnQYAiABKAUSFwoPbWF4aW11bV9yZXRyaWVzGAMgASgFGnoKC0NvbXB1dGVEaWZmEi4KCnN0YXJ0X3RpbWUYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEiwKCGVuZF90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBINCgVlcnJvchgDIAEoCRo4ChJSZWxlYXNlRmlsZUV4ZWN1dGUSDwoHdmVyc2lvbhgBIAEoCRIRCglmaWxlX3BhdGgYAiABKAkivAEKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEg8KC1NDSEVNQV9EVU1QEAESEwoPQ09NTUFORF9FWEVDVVRFEAISEQoNREFUQUJBU0VfU1lOQxADEhcKE1RSQU5TQUNUSU9OX0NPTlRST0wQBRIQCgxQUklPUl9CQUNLVVAQBhIOCgpSRVRSWV9JTkZPEAcSEAoMQ09NUFVURV9ESUZGEAgSGAoUUkVMRUFTRV9GSUxFX0VYRUNVVEUQCSJIChhHZXRUYXNrUnVuU2Vzc2lvblJlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIusHCg5UYXNrUnVuU2Vzc2lvbhIMCgRuYW1lGAEgASgJEjgKCHBvc3RncmVzGAIgASgLMiQuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24uUG9zdGdyZXNIABqCBgoIUG9zdGdyZXMSPQoHc2Vzc2lvbhgBIAEoCzIsLmJ5dGViYXNlLnYxLlRhc2tSdW5TZXNzaW9uLlBvc3RncmVzLlNlc3Npb24SRwoRYmxvY2tpbmdfc2Vzc2lvbnMYAiADKAsyLC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlcy5TZXNzaW9uEkYKEGJsb2NrZWRfc2Vzc2lvbnMYAyADKAsyLC5ieXRlYmFzZS52MS5UYXNrUnVuU2Vzc2lvbi5Qb3N0Z3Jlcy5TZXNzaW9uGqUECgdTZXNzaW9uEgsKA3BpZBgBIAEoCRIXCg9ibG9ja2VkX2J5X3BpZHMYAiADKAkSDQoFcXVlcnkYAyABKAkSEgoFc3RhdGUYBCABKAlIAIgBARIcCg93YWl0X2V2ZW50X3R5cGUYBSABKAlIAYgBARIXCgp3YWl0X2V2ZW50GAYgASgJSAKIAQESFAoHZGF0bmFtZRgHIAEoCUgDiAEBEhQKB3VzZW5hbWUYCCABKAlIBIgBARIYChBhcHBsaWNhdGlvbl9uYW1lGAkgASgJEhgKC2NsaWVudF9hZGRyGAogASgJSAWIAQESGAoLY2xpZW50X3BvcnQYCyABKAlIBogBARIxCg1iYWNrZW5kX3N0YXJ0GAwgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcBIzCgp4YWN0X3N0YXJ0GA0gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgHiAEBEjQKC3F1ZXJ5X3N0YXJ0GA4gASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEgIiAEBQggKBl9zdGF0ZUISChBfd2FpdF9ldmVudF90eXBlQg0KC193YWl0X2V2ZW50QgoKCF9kYXRuYW1lQgoKCF91c2VuYW1lQg4KDF9jbGllbnRfYWRkckIOCgxfY2xpZW50X3BvcnRCDQoLX3hhY3Rfc3RhcnRCDgoMX3F1ZXJ5X3N0YXJ0OoAB6kF9ChtieXRlYmFzZS5jb20vVGFza1J1blNlc3Npb24SXnByb2plY3RzL3twcm9qZWN0fS9wbGFucy97cGxhbn0vcm9sbG91dC9zdGFnZXMve3N0YWdlfS90YXNrcy97dGFza30vdGFza1J1bnMve3Rhc2tSdW59L3Nlc3Npb25CCQoHc2Vzc2lvbiJLCh1QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9UYXNrUnVuIjMKHlByZXZpZXdUYXNrUnVuUm9sbGJhY2tSZXNwb25zZRIRCglzdGF0ZW1lbnQYASABKAkyoRAKDlJvbGxvdXRTZXJ2aWNlEo8BCgpHZXRSb2xsb3V0Eh4uYnl0ZWJhc2UudjEuR2V0Um9sbG91dFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Sb2xsb3V0IkvaQQRuYW1liuowD2JiLnJvbGxvdXRzLmdldJDqMAGC0+STAicSJS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dH0SngEKDExpc3RSb2xsb3V0cxIgLmJ5dGViYXNlLnYxLkxpc3RSb2xsb3V0c1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0Um9sbG91dHNSZXNwb25zZSJJ2kEGcGFyZW50iuowEGJiLnJvbGxvdXRzLmxpc3SQ6jABgtPkkwIiEiAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9yb2xsb3V0cxKjAQoNQ3JlYXRlUm9sbG91dBIhLmJ5dGViYXNlLnYxLkNyZWF0ZVJvbGxvdXRSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUm9sbG91dCJZ2kEGcGFyZW50iuowEmJiLnJvbGxvdXRzLmNyZWF0ZZDqMAGY6jABgtPkkwIsOgEqIicvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyp9L3JvbGxvdXQSvwEKDExpc3RUYXNrUnVucxIgLmJ5dGViYXNlLnYxLkxpc3RUYXNrUnVuc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0VGFza1J1bnNSZXNwb25zZSJq2kEGcGFyZW50iuowEGJiLnRhc2tSdW5zLmxpc3SQ6jABgtPkkwJDEkEvdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qfS90YXNrUnVucxKsAQoKR2V0VGFza1J1bhIeLmJ5dGViYXNlLnYxLkdldFRhc2tSdW5SZXF1ZXN0GhQuYnl0ZWJhc2UudjEuVGFza1J1biJo2kEEbmFtZYrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCQxJBL3YxL3tuYW1lPXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyovdGFza1J1bnMvKn0SvQEKDUdldFRhc2tSdW5Mb2cSIS5ieXRlYmFzZS52MS5HZXRUYXNrUnVuTG9nUmVxdWVzdBoXLmJ5dGViYXNlLnYxLlRhc2tSdW5Mb2cicNpBBnBhcmVudIrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCSRJHL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfS9sb2cSzQEKEUdldFRhc2tSdW5TZXNzaW9uEiUuYnl0ZWJhc2UudjEuR2V0VGFza1J1blNlc3Npb25SZXF1ZXN0GhsuYnl0ZWJhc2UudjEuVGFza1J1blNlc3Npb24idNpBBnBhcmVudIrqMBBiYi50YXNrUnVucy5saXN0kOowAYLT5JMCTRJLL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9wbGFucy8qL3JvbGxvdXQvc3RhZ2VzLyovdGFza3MvKi90YXNrUnVucy8qfS9zZXNzaW9uErMBCg1CYXRjaFJ1blRhc2tzEiEuYnl0ZWJhc2UudjEuQmF0Y2hSdW5UYXNrc1JlcXVlc3QaIi5ieXRlYmFzZS52MS5CYXRjaFJ1blRhc2tzUmVzcG9uc2UiW9pBBnBhcmVudJDqMAKY6jABgtPkkwJEOgEqIj8vdjEve3BhcmVudD1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKn0vdGFza3M6YmF0Y2hSdW4StwEKDkJhdGNoU2tpcFRhc2tzEiIuYnl0ZWJhc2UudjEuQmF0Y2hTa2lwVGFza3NSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuQmF0Y2hTa2lwVGFza3NSZXNwb25zZSJc2kEGcGFyZW50kOowApjqMAGC0+STAkU6ASoiQC92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qfS90YXNrczpiYXRjaFNraXAS0wEKE0JhdGNoQ2FuY2VsVGFza1J1bnMSJy5ieXRlYmFzZS52MS5CYXRjaENhbmNlbFRhc2tSdW5zUmVxdWVzdBooLmJ5dGViYXNlLnYxLkJhdGNoQ2FuY2VsVGFza1J1bnNSZXNwb25zZSJp2kEGcGFyZW50kOowApjqMAGC0+STAlI6ASoiTS92MS97cGFyZW50PXByb2plY3RzLyovcGxhbnMvKi9yb2xsb3V0L3N0YWdlcy8qL3Rhc2tzLyp9L3Rhc2tSdW5zOmJhdGNoQ2FuY2VsEu4BChZQcmV2aWV3VGFza1J1blJvbGxiYWNrEiouYnl0ZWJhc2UudjEuUHJldmlld1Rhc2tSdW5Sb2xsYmFja1JlcXVlc3QaKy5ieXRlYmFzZS52MS5QcmV2aWV3VGFza1J1blJvbGxiYWNrUmVzcG9uc2Uie9pBBG5hbWWK6jAQYmIudGFza1J1bnMubGlzdJDqMAGC0+STAlY6ASoiUS92MS97bmFtZT1wcm9qZWN0cy8qL3BsYW5zLyovcm9sbG91dC9zdGFnZXMvKi90YXNrcy8qL3Rhc2tSdW5zLyp9OnByZXZpZXdSb2xsYmFja0KpAQoPY29tLmJ5dGViYXNlLnYxQhNSb2xsb3V0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common]);/*** Describes the message bytebase.v1.BatchRunTasksRequest.diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex 50ca97bf8d..70c4479a07 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -14292,9 +14292,9 @@ components:type: stringdescription: The time when the log was recorded.format: date-time- deployId:+ replicaId:type: string- description: The deployment ID for this log entry.+ description: The replica ID for this log entry.schemaDump:allOf:- $ref: '#/components/schemas/TaskRunLogEntry_SchemaDump'diff --git a/proto/gen/grpc-doc/store/README.md b/proto/gen/grpc-doc/store/README.mdindex d24db2a9fb..eff5f999b7 100644--- a/proto/gen/grpc-doc/store/README.md+++ b/proto/gen/grpc-doc/store/README.md@@ -4850,7 +4850,7 @@ Table identifies a database table.| Field | Type | Label | Description || ----- | ---- | ----- | ----------- || type | [TaskRunLog.Type](#bytebase-store-TaskRunLog-Type) | | |-| deploy_id | [string](#string) | | |+| replica_id | [string](#string) | | || schema_dump_start | [TaskRunLog.SchemaDumpStart](#bytebase-store-TaskRunLog-SchemaDumpStart) | | || schema_dump_end | [TaskRunLog.SchemaDumpEnd](#bytebase-store-TaskRunLog-SchemaDumpEnd) | | || command_execute | [TaskRunLog.CommandExecute](#bytebase-store-TaskRunLog-CommandExecute) | | |diff --git a/proto/gen/grpc-doc/store/index.html b/proto/gen/grpc-doc/store/index.htmlindex 83dd786277..4f8c6cc4f2 100644--- a/proto/gen/grpc-doc/store/index.html+++ b/proto/gen/grpc-doc/store/index.html@@ -13017,7 +13017,7 @@ Format: instances/{instance}/databases/{database} </p></td></tr><tr>- <td>deploy_id</td>+ <td>replica_id</td><td><a href="#string">string</a></td><td></td><td><p> </p></td>diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 743eb0fb44..d7f6fe95d2 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -9735,7 +9735,7 @@ Information about why a task run is waiting.| ----- | ---- | ----- | ----------- || type | [TaskRunLogEntry.Type](#bytebase-v1-TaskRunLogEntry-Type) | | The type of this log entry. || log_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The time when the log was recorded. |-| deploy_id | [string](#string) | | The deployment ID for this log entry. |+| replica_id | [string](#string) | | The replica ID for this log entry. || schema_dump | [TaskRunLogEntry.SchemaDump](#bytebase-v1-TaskRunLogEntry-SchemaDump) | | Schema dump details (if type is SCHEMA_DUMP). || command_execute | [TaskRunLogEntry.CommandExecute](#bytebase-v1-TaskRunLogEntry-CommandExecute) | | Command execution details (if type is COMMAND_EXECUTE). || database_sync | [TaskRunLogEntry.DatabaseSync](#bytebase-v1-TaskRunLogEntry-DatabaseSync) | | Database sync details (if type is DATABASE_SYNC). |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 5a5b946241..c4719dbbe4 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -27225,10 +27225,10 @@ This can only be set when creating the task run calling BatchRunTasks. </p></td></tr><tr>- <td>deploy_id</td>+ <td>replica_id</td><td><a href="#string">string</a></td><td></td>- <td><p>The deployment ID for this log entry. </p></td>+ <td><p>The replica ID for this log entry. </p></td></tr><tr>diff --git a/proto/store/store/task_run_log.proto b/proto/store/store/task_run_log.protoindex ec24bd7490..31145b03d5 100644--- a/proto/store/store/task_run_log.proto+++ b/proto/store/store/task_run_log.proto@@ -24,7 +24,7 @@ message TaskRunLog {RELEASE_FILE_EXECUTE = 14;}Type type = 1;- string deploy_id = 12;+ string replica_id = 12;SchemaDumpStart schema_dump_start = 2;SchemaDumpEnd schema_dump_end = 3;CommandExecute command_execute = 4;diff --git a/proto/v1/v1/rollout_service.proto b/proto/v1/v1/rollout_service.protoindex 88170e9cb7..9e163ce2b9 100644--- a/proto/v1/v1/rollout_service.proto+++ b/proto/v1/v1/rollout_service.proto@@ -539,8 +539,8 @@ message TaskRunLogEntry {Type type = 1;// The time when the log was recorded.google.protobuf.Timestamp log_time = 2;- // The deployment ID for this log entry.- string deploy_id = 3;+ // The replica ID for this log entry.+ string replica_id = 3;// Schema dump details (if type is SCHEMA_DUMP).SchemaDump schema_dump = 4;// Command execution details (if type is COMMAND_EXECUTE).