Skip to content

Commit ef7cc0c

Browse files
committed
[#20421] xCluster: Fix SysXClusterOutboundReplicationGroupEntryPB::NamespaceInfoPB name
Summary: All PB messages must have PB suffix. **Upgrade/Rollback safety:** This PB is not yet in use. It is guarded under gflag `TEST_enable_xcluster_api_v2` Jira: DB-9414 Test Plan: Jenkins Reviewers: jhe, xCluster Reviewed By: jhe Subscribers: ybase, bogdan Differential Revision: https://phorge.dev.yugabyte.com/D32880
1 parent 7a4705d commit ef7cc0c

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/yb/master/catalog_entity_info.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ message SysXClusterOutboundReplicationGroupEntryPB {
821821
// Namespace Id -> NamespaceInfoPB
822822
map<string, NamespaceInfoPB> namespace_infos = 1;
823823

824-
message TargetUniverseInfo {
824+
message TargetUniverseInfoPB {
825825
required bytes universe_uuid = 1;
826826

827827
enum State {
@@ -834,7 +834,7 @@ message SysXClusterOutboundReplicationGroupEntryPB {
834834
optional AppStatusPB error_status = 3; // Set when status is FAILED
835835
}
836836

837-
optional TargetUniverseInfo target_universe_info = 2;
837+
optional TargetUniverseInfoPB target_universe_info = 2;
838838

839839
enum State {
840840
READY = 0;

src/yb/master/xcluster/xcluster_outbound_replication_group-test.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ TEST_F(XClusterOutboundReplicationGroupMockedTest, CreateTargetReplicationGroup)
452452
ASSERT_EQ(pb.target_universe_info().universe_uuid(), kTargetUniverseUuid.ToString());
453453
ASSERT_EQ(
454454
pb.target_universe_info().state(),
455-
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfo::CREATING_REPLICATION_GROUP);
455+
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfoPB::CREATING_REPLICATION_GROUP);
456456

457457
EXPECT_CALL(*remote_client, IsSetupUniverseReplicationDone(_))
458458
.WillOnce(Return(IsOperationDoneResult::Done(STATUS(IllegalState, error_str))));
@@ -480,7 +480,7 @@ TEST_F(XClusterOutboundReplicationGroupMockedTest, CreateTargetReplicationGroup)
480480
ASSERT_EQ(pb.target_universe_info().universe_uuid(), kTargetUniverseUuid.ToString());
481481
ASSERT_EQ(
482482
pb.target_universe_info().state(),
483-
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfo::REPLICATING);
483+
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfoPB::REPLICATING);
484484
}
485485

486486
TEST_F(XClusterOutboundReplicationGroupMockedTest, AddTable) {

src/yb/master/xcluster/xcluster_outbound_replication_group.cc

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "yb/client/xcluster_client.h"
1616
#include "yb/master/catalog_entity_info.h"
1717
#include "yb/master/xcluster/xcluster_outbound_replication_group_tasks.h"
18-
#include "yb/master/xcluster_rpc_tasks.h"
1918
#include "yb/util/is_operation_done_result.h"
2019
#include "yb/util/status_log.h"
2120

@@ -570,7 +569,7 @@ Status XClusterOutboundReplicationGroup::CreateXClusterReplication(
570569

571570
target_universe_info->set_universe_uuid(target_uuid.ToString());
572571
target_universe_info->set_state(
573-
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfo::CREATING_REPLICATION_GROUP);
572+
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfoPB::CREATING_REPLICATION_GROUP);
574573

575574
RETURN_NOT_OK(Upsert(l, epoch));
576575

@@ -590,13 +589,13 @@ Result<IsOperationDoneResult> XClusterOutboundReplicationGroup::IsCreateXCluster
590589
auto& target_universe = *outbound_group.mutable_target_universe_info();
591590

592591
if (target_universe.state() ==
593-
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfo::REPLICATING) {
592+
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfoPB::REPLICATING) {
594593
return IsOperationDoneResult::Done();
595594
}
596595

597596
auto setup_result = IsOperationDoneResult::NotDone();
598597
if (target_universe.state() ==
599-
SysXClusterOutboundReplicationGroupEntryPB_TargetUniverseInfo::FAILED) {
598+
SysXClusterOutboundReplicationGroupEntryPB_TargetUniverseInfoPB::FAILED) {
600599
Status status;
601600
if (target_universe.has_error_status()) {
602601
status = StatusFromPB(target_universe.error_status());
@@ -620,7 +619,7 @@ Result<IsOperationDoneResult> XClusterOutboundReplicationGroup::IsCreateXCluster
620619

621620
if (setup_result.status().ok()) {
622621
target_universe.set_state(
623-
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfo::REPLICATING);
622+
SysXClusterOutboundReplicationGroupEntryPB::TargetUniverseInfoPB::REPLICATING);
624623
} else {
625624
LOG_WITH_PREFIX(WARNING) << "Failed to create replication group on target cluster: "
626625
<< setup_result.status();

0 commit comments

Comments
 (0)