Merge cockroachdb#127617

127617: crosscluster/logical: rename TargetClusterConnStr r=msbutler a=stevendanna Epic: none Release note: None Co-authored-by: Steven Danna <[email protected]>
sumeerbhola · Aug 1, 2024 · bca0e6c · bca0e6c
2 parents 46a34b6 + 490b4b1
commit bca0e6c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/pkg/ccl/crosscluster/logical/create_logical_replication_stmt.go b/pkg/ccl/crosscluster/logical/create_logical_replication_stmt.go
@@ -216,7 +216,7 @@ func createLogicalReplicationStreamPlanHook(
 				StreamID:                  uint64(spec.StreamID),
 				SourceClusterID:           spec.SourceClusterID,
 				ReplicationStartTime:      replicationStartTime,
-				TargetClusterConnStr:      string(streamAddress),
+				SourceClusterConnStr:      string(streamAddress),
 				ReplicationPairs:          repPairs,
 				TableNames:                srcTableNames,
 				DefaultConflictResolution: defaultConflictResolution,

diff --git a/pkg/ccl/crosscluster/logical/logical_replication_job.go b/pkg/ccl/crosscluster/logical/logical_replication_job.go
@@ -122,7 +122,7 @@ func (r *logicalReplicationResumer) ingest(
 	)
 
 	client, err := streamclient.NewStreamClient(ctx,
-		crosscluster.StreamAddress(payload.TargetClusterConnStr),
+		crosscluster.StreamAddress(payload.SourceClusterConnStr),
 		jobExecCtx.ExecCfg().InternalDB,
 		streamclient.WithStreamID(streampb.StreamID(streamID)),
 		streamclient.WithLogical(),
@@ -391,7 +391,7 @@ func (p *logicalReplicationPlanner) generatePlanWithFrontier(
 	}
 
 	specs, err := constructLogicalReplicationWriterSpecs(ctx,
-		crosscluster.StreamAddress(p.payload.TargetClusterConnStr),
+		crosscluster.StreamAddress(p.payload.SourceClusterConnStr),
 		plan.Topology,
 		destNodeLocalities,
 		p.payload.ReplicationStartTime,

diff --git a/pkg/jobs/jobspb/jobs.proto b/pkg/jobs/jobspb/jobs.proto
@@ -208,10 +208,9 @@ message HistoryRetentionProgress {
 }
 
 message LogicalReplicationDetails {
-  // ID of the protected timestamp record this job is managing.
-  string target_cluster_conn_str = 1 [
-    (gogoproto.customname) = "TargetClusterConnStr"
-  ];
+  // SourceClusterConnStr is the user-provided address of the source
+  // cluster.
+  string source_cluster_conn_str = 1;
 
   // TableNames is the original list of source table names given by the user.
   repeated string table_names = 2;