From fb27e63b67ceb6aed89bce8092f494813e284f9d Mon Sep 17 00:00:00 2001 From: doc001 Date: Thu, 28 May 2020 22:22:48 +0800 Subject: [PATCH] Use LOG(INFO) instead of LOG(NOTICE) to fix compile error with glog (#217) --- src/braft/raft_meta.cpp | 8 ++++---- src/braft/storage.h | 4 ++-- test/test_configuration.cpp | 18 +++++++++--------- test/test_leader_lease.cpp | 16 ++++++++-------- test/test_log.cpp | 6 +++--- test/test_node.cpp | 36 ++++++++++++++++++------------------ test/util.h | 4 ++-- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/braft/raft_meta.cpp b/src/braft/raft_meta.cpp index 2ce73a51..fc791e70 100644 --- a/src/braft/raft_meta.cpp +++ b/src/braft/raft_meta.cpp @@ -221,7 +221,7 @@ butil::Status MixedMetaStorage::init() { } _is_inited = true; - LOG(NOTICE) << "Succeed to init MixedMetaStorage, path: " << _path; + LOG(INFO) << "Succeed to init MixedMetaStorage, path: " << _path; return status; } @@ -370,7 +370,7 @@ butil::Status MixedMetaStorage::get_term_and_votedfor(int64_t* term, PeerId* pee << ", error: " << status.error_cstr(); return status; } - LOG(NOTICE) << "node " << group + LOG(INFO) << "node " << group << " merged stable storage succeed to set term " << *term << " and vote for peer " << *peer_id << " when catch up data, path " << _path; @@ -387,7 +387,7 @@ butil::Status MixedMetaStorage::get_term_and_votedfor(int64_t* term, PeerId* pee << ", error: " << status.error_cstr(); return status; } - LOG(NOTICE) << "node " << group + LOG(INFO) << "node " << group << " single stable storage succeed to set term " << *term << " and vote for peer " << *peer_id << " when catch up data, path " << _path; @@ -793,7 +793,7 @@ butil::Status KVBasedMergedMetaStorageImpl::get_term_and_votedfor(int64_t* term, << ", error " << status.error_cstr(); return status; } - LOG(NOTICE) << "node " << group + LOG(INFO) << "node " << group << " succeed to set initial term and votedfor when first time init" << ", path " << _path; return status; diff --git a/src/braft/storage.h b/src/braft/storage.h index 771d1bf2..c5c53546 100644 --- a/src/braft/storage.h +++ b/src/braft/storage.h @@ -113,8 +113,8 @@ inline int gc_dir(const std::string& path) { return -1; } } else { - LOG(NOTICE) << "Target path not exist, so no need to gc, path: " - << target_path.value(); + LOG(INFO) << "Target path not exist, so no need to gc, path: " + << target_path.value(); } return 0; } diff --git a/test/test_configuration.cpp b/test/test_configuration.cpp index 3becdc56..aa8b17c9 100644 --- a/test/test_configuration.cpp +++ b/test/test_configuration.cpp @@ -35,22 +35,22 @@ TEST_F(TestUsageSuits, PeerId) { ASSERT_TRUE(id1.is_empty()); ASSERT_EQ(0, id1.parse("1.1.1.1:1000:")); - LOG(NOTICE) << "id:" << id1.to_string(); - LOG(NOTICE) << "id:" << id1; + LOG(INFO) << "id:" << id1.to_string(); + LOG(INFO) << "id:" << id1; ASSERT_EQ(0, id1.parse("1.1.1.1:1000:0")); - LOG(NOTICE) << "id:" << id1.to_string(); - LOG(NOTICE) << "id:" << id1; + LOG(INFO) << "id:" << id1.to_string(); + LOG(INFO) << "id:" << id1; ASSERT_EQ(0, id1.parse("1.1.1.1:1000")); - LOG(NOTICE) << "id:" << id1.to_string(); - LOG(NOTICE) << "id:" << id1; + LOG(INFO) << "id:" << id1.to_string(); + LOG(INFO) << "id:" << id1; braft::PeerId id2(id1); - LOG(NOTICE) << "id:" << id2; + LOG(INFO) << "id:" << id2; braft::PeerId id3("1.2.3.4:1000:0"); - LOG(NOTICE) << "id:" << id3; + LOG(INFO) << "id:" << id3; } TEST_F(TestUsageSuits, Configuration) { @@ -61,7 +61,7 @@ TEST_F(TestUsageSuits, Configuration) { peers.push_back(braft::PeerId("1.1.1.1:1000:1")); peers.push_back(braft::PeerId("1.1.1.1:1000:2")); conf1 = peers; - LOG(NOTICE) << conf1; + LOG(INFO) << conf1; ASSERT_TRUE(conf1.contains(braft::PeerId("1.1.1.1:1000:0"))); ASSERT_FALSE(conf1.contains(braft::PeerId("1.1.1.1:2000:0"))); diff --git a/test/test_leader_lease.cpp b/test/test_leader_lease.cpp index ea6b4cc3..a11fe216 100644 --- a/test/test_leader_lease.cpp +++ b/test/test_leader_lease.cpp @@ -77,10 +77,10 @@ void check_if_stale_leader_exist(Cluster* cluster, int line) { continue; } if (lease_valid_num == 0) { - LOG(NOTICE) << "no leader"; + LOG(INFO) << "no leader"; return; } else { - LOG(NOTICE) << "leader with lease: " << leader_node->node_id(); + LOG(INFO) << "leader with lease: " << leader_node->node_id(); return; } } @@ -183,7 +183,7 @@ TEST_F(LeaseTest, triple_node) { braft::FLAGS_raft_enable_leader_lease = true; // stop a follower, lease still valid - LOG(NOTICE) << "stop a follower"; + LOG(INFO) << "stop a follower"; cluster.stop(followers[0]->node_id().peer_id.addr); leader->get_leader_lease_status(&lease_status); @@ -201,7 +201,7 @@ TEST_F(LeaseTest, triple_node) { ASSERT_TRUE(leader->is_leader_lease_valid()); // stop all follwers, lease expired - LOG(NOTICE) << "stop a another"; + LOG(INFO) << "stop a another"; cluster.stop(followers[1]->node_id().peer_id.addr); leader->get_leader_lease_status(&lease_status); @@ -231,7 +231,7 @@ TEST_F(LeaseTest, change_peers) { peers.push_back(peer0); Cluster cluster("unittest", peers, 500, 10); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; // start a thread to check leader lease g_check_lease_in_thread_stop = false; @@ -241,14 +241,14 @@ TEST_F(LeaseTest, change_peers) { cluster.wait_leader(); for (int i = 1; i < 10; ++i) { - LOG(NOTICE) << "start peer " << i; + LOG(INFO) << "start peer " << i; braft::PeerId peer = peer0; peer.addr.port += i; ASSERT_EQ(0, cluster.start(peer.addr, true)); } for (int i = 1; i < 10; ++i) { - LOG(NOTICE) << "add peer " << i; + LOG(INFO) << "add peer " << i; cluster.wait_leader(); braft::Node* leader = cluster.leader(); braft::PeerId peer = peer0; @@ -261,7 +261,7 @@ TEST_F(LeaseTest, change_peers) { } for (int i = 1; i < 10; ++i) { - LOG(NOTICE) << "remove peer " << i; + LOG(INFO) << "remove peer " << i; cluster.wait_leader(); braft::Node* leader = cluster.leader(); braft::PeerId peer = peer0; diff --git a/test/test_log.cpp b/test/test_log.cpp index d68b80f5..4e200673 100644 --- a/test/test_log.cpp +++ b/test/test_log.cpp @@ -851,11 +851,11 @@ TEST_F(LogStorageTest, configuration) { braft::ConfigurationEntry pair; configuration_manager->get(2 + 100000*5, &pair); ASSERT_EQ(2, pair.id.index); - LOG(NOTICE) << pair.conf; + LOG(INFO) << pair.conf; configuration_manager->get(2 + 100000*5 + 1, &pair); ASSERT_EQ(2+100000*5+1, pair.id.index); - LOG(NOTICE) << pair.conf; + LOG(INFO) << pair.conf; storage2->truncate_suffix(400000); configuration_manager->get(400000, &pair); @@ -1212,7 +1212,7 @@ TEST_F(LogStorageTest, append_close_load_append_with_io_metric) { ASSERT_NE(0, metric.append_entry_time_us); ASSERT_NE(0, metric.sync_segment_time_us); - LOG(NOTICE) << metric; + LOG(INFO) << metric; delete storage; delete configuration_manager; diff --git a/test/test_node.cpp b/test/test_node.cpp index 71076d8a..19acce06 100644 --- a/test/test_node.cpp +++ b/test/test_node.cpp @@ -52,7 +52,7 @@ class NodeTest : public testing::TestWithParam { braft::FLAGS_raft_enable_append_entries_cache = true; braft::FLAGS_raft_max_append_entries_cache_size = 8; } - LOG(NOTICE) << "Start unitests: " << GetParam(); + LOG(INFO) << "Start unitests: " << GetParam(); ::system("rm -rf data"); ASSERT_EQ(0, braft::g_num_nodes.get_value()); } @@ -196,7 +196,7 @@ TEST_P(NodeTest, NoLeader) { cond.reset(1); follower->add_peer(peer3, NEW_ADDPEERCLOSURE(&cond, EPERM)); cond.wait(); - LOG(NOTICE) << "add peer " << peer3; + LOG(INFO) << "add peer " << peer3; // remove peer1 braft::PeerId peer0; @@ -207,7 +207,7 @@ TEST_P(NodeTest, NoLeader) { cond.reset(1); follower->remove_peer(peer0, NEW_REMOVEPEERCLOSURE(&cond, EPERM)); cond.wait(); - LOG(NOTICE) << "remove peer " << peer0; + LOG(INFO) << "remove peer " << peer0; } TEST_P(NodeTest, TripleNode) { @@ -276,7 +276,7 @@ TEST_P(NodeTest, TripleNode) { channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/); - LOG(NOTICE) << "http return: \n" << cntl.response_attachment(); + LOG(INFO) << "http return: \n" << cntl.response_attachment(); } { @@ -286,7 +286,7 @@ TEST_P(NodeTest, TripleNode) { channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/); - LOG(NOTICE) << "http return: \n" << cntl.response_attachment(); + LOG(INFO) << "http return: \n" << cntl.response_attachment(); } } @@ -423,7 +423,7 @@ TEST_P(NodeTest, JoinNode) { peers.push_back(peer0); Cluster cluster("unittest", peers); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; cluster.wait_leader(); @@ -453,7 +453,7 @@ TEST_P(NodeTest, JoinNode) { peer1.addr.port = 5006 + 1; peer1.idx = 0; ASSERT_EQ(0, cluster.start(peer1.addr, true)); - LOG(NOTICE) << "start peer " << peer1; + LOG(INFO) << "start peer " << peer1; // wait until started successfully usleep(1000* 1000); @@ -461,7 +461,7 @@ TEST_P(NodeTest, JoinNode) { cond.reset(1); leader->add_peer(peer1, NEW_ADDPEERCLOSURE(&cond, 0)); cond.wait(); - LOG(NOTICE) << "add peer " << peer1; + LOG(INFO) << "add peer " << peer1; cluster.ensure_same(); @@ -479,7 +479,7 @@ TEST_P(NodeTest, JoinNode) { // start peer2 after some seconds wait sleep(2); ASSERT_EQ(0, cluster.start(peer2.addr, true)); - LOG(NOTICE) << "start peer " << peer2; + LOG(INFO) << "start peer " << peer2; usleep(1000 * 1000L); @@ -514,7 +514,7 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) { peers.push_back(peer0); Cluster cluster("unittest", peers, 1000); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; cluster.wait_leader(); @@ -571,13 +571,13 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) { peer1.addr.port = 5006 + 1; peer1.idx = 0; ASSERT_EQ(0, cluster.start(peer1.addr, true)); - LOG(NOTICE) << "start peer " << peer1; + LOG(INFO) << "start peer " << peer1; // wait until started successfully usleep(1000* 1000); // add peer1, leader step down while caught_up cond.reset(1); - LOG(NOTICE) << "add peer: " << peer1; + LOG(INFO) << "add peer: " << peer1; leader->add_peer(peer1, NEW_ADDPEERCLOSURE(&cond, EPERM)); usleep(500 * 1000); @@ -593,11 +593,11 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) { cntl.http_request().uri() = "/raft_stat/unittest"; cntl.http_request().set_method(brpc::HTTP_METHOD_GET); channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/* done*/); - LOG(NOTICE) << "http return: \n" << cntl.response_attachment(); + LOG(INFO) << "http return: \n" << cntl.response_attachment(); } } - LOG(NOTICE) << "leader " << leader->node_id() + LOG(INFO) << "leader " << leader->node_id() << " step_down because of some error"; butil::Status status; status.set_error(braft::ERAFTTIMEDOUT, "Majority of the group dies"); @@ -605,7 +605,7 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) { cond.wait(); // add peer1 again, success - LOG(NOTICE) << "add peer again: " << peer1; + LOG(INFO) << "add peer again: " << peer1; cond.reset(1); cluster.wait_leader(); leader = cluster.leader(); @@ -2514,7 +2514,7 @@ TEST_P(NodeTest, change_peers) { peers.push_back(peer0); Cluster cluster("unittest", peers); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; cluster.wait_leader(); braft::Node* leader = cluster.leader(); bthread::CountdownEvent cond(10); @@ -2564,7 +2564,7 @@ TEST_P(NodeTest, change_peers_add_multiple_node) { peers.push_back(peer0); Cluster cluster("unittest", peers); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; cluster.wait_leader(); braft::Node* leader = cluster.leader(); bthread::CountdownEvent cond(10); @@ -2617,7 +2617,7 @@ TEST_P(NodeTest, change_peers_steps_down_in_joint_consensus) { peers.push_back(peer0); Cluster cluster("unittest", peers); ASSERT_EQ(0, cluster.start(peer0.addr)); - LOG(NOTICE) << "start single cluster " << peer0; + LOG(INFO) << "start single cluster " << peer0; cluster.wait_leader(); braft::Node* leader = cluster.leader(); bthread::CountdownEvent cond(10); diff --git a/test/util.h b/test/util.h index 844b9ff3..f7c7d3f3 100644 --- a/test/util.h +++ b/test/util.h @@ -101,7 +101,7 @@ class MockFSM : public braft::StateMachine { file_path.append("/data"); brpc::ClosureGuard done_guard(done); - LOG(NOTICE) << "on_snapshot_save to " << file_path; + LOG(INFO) << "on_snapshot_save to " << file_path; int fd = ::creat(file_path.c_str(), 0644); if (fd < 0) { @@ -275,7 +275,7 @@ class Cluster { delete node; return ret; } else { - LOG(NOTICE) << "init node " << listen_addr; + LOG(INFO) << "init node " << listen_addr; } {