Skip to content

Commit

Permalink
Use LOG(INFO) instead of LOG(NOTICE) to fix compile error with glog (#…
Browse files Browse the repository at this point in the history 
…217)
  • Loading branch information
@PFZheng
PFZheng committed May 28, 2020
1 parent eeefc95 commit fb27e63
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 46 deletions.
8 changes: 4 additions & 4 deletions src/braft/raft_meta.cpp
View file
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/braft/storage.h
View file
Expand Up @@ -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;
}
Expand Down
18 changes: 9 additions & 9 deletions test/test_configuration.cpp
View file
Expand Up @@ -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) {
Expand All @@ -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")));
Expand Down
16 changes: 8 additions & 8 deletions test/test_leader_lease.cpp
View file
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions test/test_log.cpp
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
36 changes: 18 additions & 18 deletions test/test_node.cpp
View file
Expand Up @@ -52,7 +52,7 @@ class NodeTest : public testing::TestWithParam<const char*> {
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());
}
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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();
}

{
Expand All @@ -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();
}
}

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -453,15 +453,15 @@ 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);

// add peer1
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();

Expand All @@ -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);

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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);

Expand All @@ -593,19 +593,19 @@ 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");
leader->_impl->step_down(leader->_impl->_current_term, false, status);
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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions test/util.h
View file
Expand Up @@ -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) {
Expand Down Expand Up @@ -275,7 +275,7 @@ class Cluster {
delete node;
return ret;
} else {
LOG(NOTICE) << "init node " << listen_addr;
LOG(INFO) << "init node " << listen_addr;
}

{
Expand Down

0 comments on commit fb27e63

Please sign in to comment.