Commit f0224fcc authored by zhujiashun's avatar zhujiashun

revived_from_all_failed: remove unnecessary code

parent cc381578
...@@ -842,7 +842,7 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_sanity) { ...@@ -842,7 +842,7 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_sanity) {
} }
} }
ASSERT_TRUE(abs(num_ereject - num_ok) < 30); ASSERT_TRUE(abs(num_ereject - num_ok) < 30);
bthread_usleep((2000 + 10) * 1000); bthread_usleep((2000 /* hold_time_ms */ + 10) * 1000);
// After enough waiting time, traffic should be sent to all available servers. // After enough waiting time, traffic should be sent to all available servers.
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
...@@ -921,7 +921,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) { ...@@ -921,7 +921,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) {
lb_algo[butil::fast_rand_less_than(ARRAY_SIZE(lb_algo))], lb_algo[butil::fast_rand_less_than(ARRAY_SIZE(lb_algo))],
&options), 0); &options), 0);
uint64_t request_code = 0;
test::EchoRequest req; test::EchoRequest req;
req.set_message("123"); req.set_message("123");
test::EchoResponse res; test::EchoResponse res;
...@@ -929,14 +928,12 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) { ...@@ -929,14 +928,12 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) {
// trigger one server to health check // trigger one server to health check
{ {
brpc::Controller cntl; brpc::Controller cntl;
cntl.set_request_code(brpc::policy::MurmurHash32(&++request_code, 8));
stub.Echo(&cntl, &req, &res, NULL); stub.Echo(&cntl, &req, &res, NULL);
} }
bthread_usleep(500000); bthread_usleep(500000);
// trigger the other server to health check // trigger the other server to health check
{ {
brpc::Controller cntl; brpc::Controller cntl;
cntl.set_request_code(brpc::policy::MurmurHash32(&++request_code, 8));
stub.Echo(&cntl, &req, &res, NULL); stub.Echo(&cntl, &req, &res, NULL);
} }
...@@ -960,7 +957,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) { ...@@ -960,7 +957,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) {
Done* done = new Done; Done* done = new Done;
done->num_reject = &num_reject; done->num_reject = &num_reject;
done->req.set_message("123"); done->req.set_message("123");
done->cntl.set_request_code(brpc::policy::MurmurHash32(&++request_code, 8));
stub.Echo(&done->cntl, &done->req, &done->res, done); stub.Echo(&done->cntl, &done->req, &done->res, done);
q++; q++;
bthread_usleep(1000); bthread_usleep(1000);
...@@ -973,7 +969,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) { ...@@ -973,7 +969,6 @@ TEST_F(LoadBalancerTest, revived_from_all_failed_intergrated) {
Done* done = new Done; Done* done = new Done;
done->req.set_message("123"); done->req.set_message("123");
done->num_failed = &num_failed; done->num_failed = &num_failed;
done->cntl.set_request_code(brpc::policy::MurmurHash32(&++request_code, 8));
stub.Echo(&done->cntl, &done->req, &done->res, done); stub.Echo(&done->cntl, &done->req, &done->res, done);
bthread_usleep(1000); bthread_usleep(1000);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment