fix typo about CampaignLeader

charlie0129 · May 7, 2022 · 1f8dd32 · 1f8dd32
1 parent bec8687
commit 1f8dd32
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/curvefs/src/mds/mds.cpp b/curvefs/src/mds/mds.cpp
@@ -301,7 +301,7 @@ void MDS::StartCompaginLeader() {
 
     InitLeaderElection(electionOption);
 
-    while (0 != leaderElection_->CampaginLeader()) {
+    while (0 != leaderElection_->CampaignLeader()) {
         LOG(INFO) << leaderElection_->GetLeaderName()
                   << " compagin for leader again";
     }

diff --git a/src/leader_election/leader_election.cpp b/src/leader_election/leader_election.cpp
@@ -31,7 +31,7 @@ using ::curve::common::Thread;
 
 namespace curve {
 namespace election {
-int LeaderElection::CampaginLeader() {
+int LeaderElection::CampaignLeader() {
     LOG(INFO) << opt_.leaderUniqueName << " start campaign leader prefix: "
         << realPrefix_;
 

diff --git a/src/leader_election/leader_election.h b/src/leader_election/leader_election.h
@@ -61,11 +61,11 @@ class LeaderElection {
     }
 
     /**
-     * @brief CampaginLeader 竞选leader
+     * @brief CampaignLeader 竞选leader
      *
      * @return 0表示竞选成功 -1表示竞选失败
      */
-    int CampaginLeader();
+    int CampaignLeader();
 
     /**
      * @brief StartObserverLeader 启动leader节点监测线程

diff --git a/src/mds/server/mds.cpp b/src/mds/server/mds.cpp
@@ -108,7 +108,7 @@ void MDS::StartCompaginLeader() {
     leaderElectionOp.etcdCli = etcdClient_;
     leaderElectionOp.campaginPrefix = "";
     InitLeaderElection(leaderElectionOp);
-    while (0 != leaderElection_->CampaginLeader()) {
+    while (0 != leaderElection_->CampaignLeader()) {
         LOG(INFO) << leaderElection_->GetLeaderName()
                   << " campaign for leader again";
     }

diff --git a/src/snapshotcloneserver/snapshotclone_server.cpp b/src/snapshotcloneserver/snapshotclone_server.cpp
@@ -222,7 +222,7 @@ void SnapShotCloneServer::StartCompaginLeader(void) {
     leaderElection_ = std::make_shared<LeaderElection>(option);
 
     // compagin leader and observe self then return
-    while (0 != leaderElection_->CampaginLeader()) {
+    while (0 != leaderElection_->CampaignLeader()) {
         LOG(INFO) << option.leaderUniqueName
                   << " campaign for leader again";
     }

diff --git a/test/leaderelection/leader_election_test.cpp b/test/leaderelection/leader_election_test.cpp
@@ -62,7 +62,7 @@ TEST(TestLeaderElection, test_leader_election) {
         _))
         .WillOnce(DoAll(SetArgPointee<4>(1),
         Return(EtcdErrCode::EtcdCampaignLeaderSuccess)));
-    ASSERT_EQ(0, leaderElection->CampaginLeader());
+    ASSERT_EQ(0, leaderElection->CampaignLeader());
 
     EXPECT_CALL(*client, CampaignLeader(
         realPrefix,
@@ -71,7 +71,7 @@ TEST(TestLeaderElection, test_leader_election) {
         opts.electionTimeoutMs,
         _))
         .WillOnce(Return(EtcdErrCode::EtcdCampaignInternalErr));
-    ASSERT_EQ(-1, leaderElection->CampaginLeader());
+    ASSERT_EQ(-1, leaderElection->CampaignLeader());
 
     EXPECT_CALL(*client, LeaderResign(1, 1000 * opts.sessionInterSec))
         .WillOnce(Return(EtcdErrCode::EtcdLeaderResiginSuccess));