Skip to content

Commit fb27e63

Browse files
PFZhengPFZheng
authored
Use LOG(INFO) instead of LOG(NOTICE) to fix compile error with glog (#217)
1 parent eeefc95 commit fb27e63

7 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎src/braft/raft_meta.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ butil::Status MixedMetaStorage::init() {
221221
}
222222

223223
_is_inited = true;
224-
LOG(NOTICE) << "Succeed to init MixedMetaStorage, path: " << _path;
224+
LOG(INFO) << "Succeed to init MixedMetaStorage, path: " << _path;
225225
return status;
226226
}
227227

@@ -370,7 +370,7 @@ butil::Status MixedMetaStorage::get_term_and_votedfor(int64_t* term, PeerId* pee
370370
<< ", error: " << status.error_cstr();
371371
return status;
372372
}
373-
LOG(NOTICE) << "node " << group
373+
LOG(INFO) << "node " << group
374374
<< " merged stable storage succeed to set term " << *term
375375
<< " and vote for peer " << *peer_id
376376
<< " when catch up data, path " << _path;
@@ -387,7 +387,7 @@ butil::Status MixedMetaStorage::get_term_and_votedfor(int64_t* term, PeerId* pee
387387
<< ", error: " << status.error_cstr();
388388
return status;
389389
}
390-
LOG(NOTICE) << "node " << group
390+
LOG(INFO) << "node " << group
391391
<< " single stable storage succeed to set term " << *term
392392
<< " and vote for peer " << *peer_id
393393
<< " when catch up data, path " << _path;
@@ -793,7 +793,7 @@ butil::Status KVBasedMergedMetaStorageImpl::get_term_and_votedfor(int64_t* term,
793793
<< ", error " << status.error_cstr();
794794
return status;
795795
}
796-
LOG(NOTICE) << "node " << group
796+
LOG(INFO) << "node " << group
797797
<< " succeed to set initial term and votedfor when first time init"
798798
<< ", path " << _path;
799799
return status;

‎src/braft/storage.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ inline int gc_dir(const std::string& path) {
113113
return -1;
114114
}
115115
} else {
116-
LOG(NOTICE) << "Target path not exist, so no need to gc, path: "
117-
<< target_path.value();
116+
LOG(INFO) << "Target path not exist, so no need to gc, path: "
117+
<< target_path.value();
118118
}
119119
return 0;
120120
}

‎test/test_configuration.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ TEST_F(TestUsageSuits, PeerId) {
3535
ASSERT_TRUE(id1.is_empty());
3636

3737
ASSERT_EQ(0, id1.parse("1.1.1.1:1000:"));
38-
LOG(NOTICE) << "id:" << id1.to_string();
39-
LOG(NOTICE) << "id:" << id1;
38+
LOG(INFO) << "id:" << id1.to_string();
39+
LOG(INFO) << "id:" << id1;
4040

4141
ASSERT_EQ(0, id1.parse("1.1.1.1:1000:0"));
42-
LOG(NOTICE) << "id:" << id1.to_string();
43-
LOG(NOTICE) << "id:" << id1;
42+
LOG(INFO) << "id:" << id1.to_string();
43+
LOG(INFO) << "id:" << id1;
4444

4545
ASSERT_EQ(0, id1.parse("1.1.1.1:1000"));
46-
LOG(NOTICE) << "id:" << id1.to_string();
47-
LOG(NOTICE) << "id:" << id1;
46+
LOG(INFO) << "id:" << id1.to_string();
47+
LOG(INFO) << "id:" << id1;
4848

4949
braft::PeerId id2(id1);
50-
LOG(NOTICE) << "id:" << id2;
50+
LOG(INFO) << "id:" << id2;
5151

5252
braft::PeerId id3("1.2.3.4:1000:0");
53-
LOG(NOTICE) << "id:" << id3;
53+
LOG(INFO) << "id:" << id3;
5454
}
5555

5656
TEST_F(TestUsageSuits, Configuration) {
@@ -61,7 +61,7 @@ TEST_F(TestUsageSuits, Configuration) {
6161
peers.push_back(braft::PeerId("1.1.1.1:1000:1"));
6262
peers.push_back(braft::PeerId("1.1.1.1:1000:2"));
6363
conf1 = peers;
64-
LOG(NOTICE) << conf1;
64+
LOG(INFO) << conf1;
6565

6666
ASSERT_TRUE(conf1.contains(braft::PeerId("1.1.1.1:1000:0")));
6767
ASSERT_FALSE(conf1.contains(braft::PeerId("1.1.1.1:2000:0")));

‎test/test_leader_lease.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ void check_if_stale_leader_exist(Cluster* cluster, int line) {
7777
continue;
7878
}
7979
if (lease_valid_num == 0) {
80-
LOG(NOTICE) << "no leader";
80+
LOG(INFO) << "no leader";
8181
return;
8282
} else {
83-
LOG(NOTICE) << "leader with lease: " << leader_node->node_id();
83+
LOG(INFO) << "leader with lease: " << leader_node->node_id();
8484
return;
8585
}
8686
}
@@ -183,7 +183,7 @@ TEST_F(LeaseTest, triple_node) {
183183
braft::FLAGS_raft_enable_leader_lease = true;
184184

185185
// stop a follower, lease still valid
186-
LOG(NOTICE) << "stop a follower";
186+
LOG(INFO) << "stop a follower";
187187
cluster.stop(followers[0]->node_id().peer_id.addr);
188188

189189
leader->get_leader_lease_status(&lease_status);
@@ -201,7 +201,7 @@ TEST_F(LeaseTest, triple_node) {
201201
ASSERT_TRUE(leader->is_leader_lease_valid());
202202

203203
// stop all follwers, lease expired
204-
LOG(NOTICE) << "stop a another";
204+
LOG(INFO) << "stop a another";
205205
cluster.stop(followers[1]->node_id().peer_id.addr);
206206

207207
leader->get_leader_lease_status(&lease_status);
@@ -231,7 +231,7 @@ TEST_F(LeaseTest, change_peers) {
231231
peers.push_back(peer0);
232232
Cluster cluster("unittest", peers, 500, 10);
233233
ASSERT_EQ(0, cluster.start(peer0.addr));
234-
LOG(NOTICE) << "start single cluster " << peer0;
234+
LOG(INFO) << "start single cluster " << peer0;
235235

236236
// start a thread to check leader lease
237237
g_check_lease_in_thread_stop = false;
@@ -241,14 +241,14 @@ TEST_F(LeaseTest, change_peers) {
241241
cluster.wait_leader();
242242

243243
for (int i = 1; i < 10; ++i) {
244-
LOG(NOTICE) << "start peer " << i;
244+
LOG(INFO) << "start peer " << i;
245245
braft::PeerId peer = peer0;
246246
peer.addr.port += i;
247247
ASSERT_EQ(0, cluster.start(peer.addr, true));
248248
}
249249

250250
for (int i = 1; i < 10; ++i) {
251-
LOG(NOTICE) << "add peer " << i;
251+
LOG(INFO) << "add peer " << i;
252252
cluster.wait_leader();
253253
braft::Node* leader = cluster.leader();
254254
braft::PeerId peer = peer0;
@@ -261,7 +261,7 @@ TEST_F(LeaseTest, change_peers) {
261261
}
262262

263263
for (int i = 1; i < 10; ++i) {
264-
LOG(NOTICE) << "remove peer " << i;
264+
LOG(INFO) << "remove peer " << i;
265265
cluster.wait_leader();
266266
braft::Node* leader = cluster.leader();
267267
braft::PeerId peer = peer0;

‎test/test_log.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,11 +851,11 @@ TEST_F(LogStorageTest, configuration) {
851851
braft::ConfigurationEntry pair;
852852
configuration_manager->get(2 + 100000*5, &pair);
853853
ASSERT_EQ(2, pair.id.index);
854-
LOG(NOTICE) << pair.conf;
854+
LOG(INFO) << pair.conf;
855855

856856
configuration_manager->get(2 + 100000*5 + 1, &pair);
857857
ASSERT_EQ(2+100000*5+1, pair.id.index);
858-
LOG(NOTICE) << pair.conf;
858+
LOG(INFO) << pair.conf;
859859

860860
storage2->truncate_suffix(400000);
861861
configuration_manager->get(400000, &pair);
@@ -1212,7 +1212,7 @@ TEST_F(LogStorageTest, append_close_load_append_with_io_metric) {
12121212
ASSERT_NE(0, metric.append_entry_time_us);
12131213
ASSERT_NE(0, metric.sync_segment_time_us);
12141214

1215-
LOG(NOTICE) << metric;
1215+
LOG(INFO) << metric;
12161216

12171217
delete storage;
12181218
delete configuration_manager;

‎test/test_node.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class NodeTest : public testing::TestWithParam<const char*> {
5252
braft::FLAGS_raft_enable_append_entries_cache = true;
5353
braft::FLAGS_raft_max_append_entries_cache_size = 8;
5454
}
55-
LOG(NOTICE) << "Start unitests: " << GetParam();
55+
LOG(INFO) << "Start unitests: " << GetParam();
5656
::system("rm -rf data");
5757
ASSERT_EQ(0, braft::g_num_nodes.get_value());
5858
}
@@ -196,7 +196,7 @@ TEST_P(NodeTest, NoLeader) {
196196
cond.reset(1);
197197
follower->add_peer(peer3, NEW_ADDPEERCLOSURE(&cond, EPERM));
198198
cond.wait();
199-
LOG(NOTICE) << "add peer " << peer3;
199+
LOG(INFO) << "add peer " << peer3;
200200

201201
// remove peer1
202202
braft::PeerId peer0;
@@ -207,7 +207,7 @@ TEST_P(NodeTest, NoLeader) {
207207
cond.reset(1);
208208
follower->remove_peer(peer0, NEW_REMOVEPEERCLOSURE(&cond, EPERM));
209209
cond.wait();
210-
LOG(NOTICE) << "remove peer " << peer0;
210+
LOG(INFO) << "remove peer " << peer0;
211211
}
212212

213213
TEST_P(NodeTest, TripleNode) {
@@ -276,7 +276,7 @@ TEST_P(NodeTest, TripleNode) {
276276

277277
channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/);
278278

279-
LOG(NOTICE) << "http return: \n" << cntl.response_attachment();
279+
LOG(INFO) << "http return: \n" << cntl.response_attachment();
280280
}
281281

282282
{
@@ -286,7 +286,7 @@ TEST_P(NodeTest, TripleNode) {
286286

287287
channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/);
288288

289-
LOG(NOTICE) << "http return: \n" << cntl.response_attachment();
289+
LOG(INFO) << "http return: \n" << cntl.response_attachment();
290290
}
291291
}
292292

@@ -423,7 +423,7 @@ TEST_P(NodeTest, JoinNode) {
423423
peers.push_back(peer0);
424424
Cluster cluster("unittest", peers);
425425
ASSERT_EQ(0, cluster.start(peer0.addr));
426-
LOG(NOTICE) << "start single cluster " << peer0;
426+
LOG(INFO) << "start single cluster " << peer0;
427427

428428
cluster.wait_leader();
429429

@@ -453,15 +453,15 @@ TEST_P(NodeTest, JoinNode) {
453453
peer1.addr.port = 5006 + 1;
454454
peer1.idx = 0;
455455
ASSERT_EQ(0, cluster.start(peer1.addr, true));
456-
LOG(NOTICE) << "start peer " << peer1;
456+
LOG(INFO) << "start peer " << peer1;
457457
// wait until started successfully
458458
usleep(1000* 1000);
459459

460460
// add peer1
461461
cond.reset(1);
462462
leader->add_peer(peer1, NEW_ADDPEERCLOSURE(&cond, 0));
463463
cond.wait();
464-
LOG(NOTICE) << "add peer " << peer1;
464+
LOG(INFO) << "add peer " << peer1;
465465

466466
cluster.ensure_same();
467467

@@ -479,7 +479,7 @@ TEST_P(NodeTest, JoinNode) {
479479
// start peer2 after some seconds wait
480480
sleep(2);
481481
ASSERT_EQ(0, cluster.start(peer2.addr, true));
482-
LOG(NOTICE) << "start peer " << peer2;
482+
LOG(INFO) << "start peer " << peer2;
483483

484484
usleep(1000 * 1000L);
485485

@@ -514,7 +514,7 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) {
514514
peers.push_back(peer0);
515515
Cluster cluster("unittest", peers, 1000);
516516
ASSERT_EQ(0, cluster.start(peer0.addr));
517-
LOG(NOTICE) << "start single cluster " << peer0;
517+
LOG(INFO) << "start single cluster " << peer0;
518518

519519
cluster.wait_leader();
520520

@@ -571,13 +571,13 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) {
571571
peer1.addr.port = 5006 + 1;
572572
peer1.idx = 0;
573573
ASSERT_EQ(0, cluster.start(peer1.addr, true));
574-
LOG(NOTICE) << "start peer " << peer1;
574+
LOG(INFO) << "start peer " << peer1;
575575
// wait until started successfully
576576
usleep(1000* 1000);
577577

578578
// add peer1, leader step down while caught_up
579579
cond.reset(1);
580-
LOG(NOTICE) << "add peer: " << peer1;
580+
LOG(INFO) << "add peer: " << peer1;
581581
leader->add_peer(peer1, NEW_ADDPEERCLOSURE(&cond, EPERM));
582582
usleep(500 * 1000);
583583

@@ -593,19 +593,19 @@ TEST_P(NodeTest, Leader_step_down_during_install_snapshot) {
593593
cntl.http_request().uri() = "/raft_stat/unittest";
594594
cntl.http_request().set_method(brpc::HTTP_METHOD_GET);
595595
channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/* done*/);
596-
LOG(NOTICE) << "http return: \n" << cntl.response_attachment();
596+
LOG(INFO) << "http return: \n" << cntl.response_attachment();
597597
}
598598
}
599599

600-
LOG(NOTICE) << "leader " << leader->node_id()
600+
LOG(INFO) << "leader " << leader->node_id()
601601
<< " step_down because of some error";
602602
butil::Status status;
603603
status.set_error(braft::ERAFTTIMEDOUT, "Majority of the group dies");
604604
leader->_impl->step_down(leader->_impl->_current_term, false, status);
605605
cond.wait();
606606

607607
// add peer1 again, success
608-
LOG(NOTICE) << "add peer again: " << peer1;
608+
LOG(INFO) << "add peer again: " << peer1;
609609
cond.reset(1);
610610
cluster.wait_leader();
611611
leader = cluster.leader();
@@ -2514,7 +2514,7 @@ TEST_P(NodeTest, change_peers) {
25142514
peers.push_back(peer0);
25152515
Cluster cluster("unittest", peers);
25162516
ASSERT_EQ(0, cluster.start(peer0.addr));
2517-
LOG(NOTICE) << "start single cluster " << peer0;
2517+
LOG(INFO) << "start single cluster " << peer0;
25182518
cluster.wait_leader();
25192519
braft::Node* leader = cluster.leader();
25202520
bthread::CountdownEvent cond(10);
@@ -2564,7 +2564,7 @@ TEST_P(NodeTest, change_peers_add_multiple_node) {
25642564
peers.push_back(peer0);
25652565
Cluster cluster("unittest", peers);
25662566
ASSERT_EQ(0, cluster.start(peer0.addr));
2567-
LOG(NOTICE) << "start single cluster " << peer0;
2567+
LOG(INFO) << "start single cluster " << peer0;
25682568
cluster.wait_leader();
25692569
braft::Node* leader = cluster.leader();
25702570
bthread::CountdownEvent cond(10);
@@ -2617,7 +2617,7 @@ TEST_P(NodeTest, change_peers_steps_down_in_joint_consensus) {
26172617
peers.push_back(peer0);
26182618
Cluster cluster("unittest", peers);
26192619
ASSERT_EQ(0, cluster.start(peer0.addr));
2620-
LOG(NOTICE) << "start single cluster " << peer0;
2620+
LOG(INFO) << "start single cluster " << peer0;
26212621
cluster.wait_leader();
26222622
braft::Node* leader = cluster.leader();
26232623
bthread::CountdownEvent cond(10);

‎test/util.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class MockFSM : public braft::StateMachine {
101101
file_path.append("/data");
102102
brpc::ClosureGuard done_guard(done);
103103

104-
LOG(NOTICE) << "on_snapshot_save to " << file_path;
104+
LOG(INFO) << "on_snapshot_save to " << file_path;
105105

106106
int fd = ::creat(file_path.c_str(), 0644);
107107
if (fd < 0) {
@@ -275,7 +275,7 @@ class Cluster {
275275
delete node;
276276
return ret;
277277
} else {
278-
LOG(NOTICE) << "init node " << listen_addr;
278+
LOG(INFO) << "init node " << listen_addr;
279279
}
280280

281281
{

0 commit comments

Comments
 (0)