This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new dae91f8 enable circuit breaker for backup request
new d28dab7 Merge pull request #973 from
TousakaRin/enable_cb_for_backup_request
dae91f8 is described below
commit dae91f83d152785432a820605b65a82541977cbd
Author: helei <[email protected]>
AuthorDate: Sun Nov 24 14:34:41 2019 +0800
enable circuit breaker for backup request
---
src/brpc/controller.cpp | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/brpc/controller.cpp b/src/brpc/controller.cpp
index c70fb43..890fea2 100644
--- a/src/brpc/controller.cpp
+++ b/src/brpc/controller.cpp
@@ -20,7 +20,7 @@
// Zhangyi Chen([email protected])
#include <signal.h>
-#include <openssl/md5.h>
+#include <openssl/md5.h>
#include <google/protobuf/descriptor.h>
#include <gflags/gflags.h>
#include "bthread/bthread.h"
@@ -260,6 +260,7 @@ void Controller::ResetPods() {
Controller::Call::Call(Controller::Call* rhs)
: nretry(rhs->nretry)
, need_feedback(rhs->need_feedback)
+ , enable_circuit_breaker(rhs->enable_circuit_breaker)
, peer_id(rhs->peer_id)
, begin_time_us(rhs->begin_time_us)
, sending_sock(rhs->sending_sock.release())
@@ -348,7 +349,7 @@ void Controller::AppendServerIdentiy() {
_error_text.reserve(_error_text.size() + MD5_DIGEST_LENGTH * 2 + 2);
_error_text.push_back('[');
char ipbuf[64];
- int len = snprintf(ipbuf, sizeof(ipbuf), "%s:%d",
+ int len = snprintf(ipbuf, sizeof(ipbuf), "%s:%d",
butil::my_ip_cstr(),
_server->listen_address().port);
unsigned char digest[MD5_DIGEST_LENGTH];
MD5((const unsigned char*)ipbuf, len, digest);
@@ -507,7 +508,7 @@ void Controller::NotifyOnCancel(google::protobuf::Closure*
callback) {
LOG(WARNING) << "Parameter `callback' is NLLL";
return;
}
-
+
ClosureGuard guard(callback);
if (_oncancel_id != INVALID_BTHREAD_ID) {
LOG(FATAL) << "NotifyCancel a single call more than once!";
@@ -627,7 +628,7 @@ void Controller::OnVersionedRPCReturned(const
CompletionInfo& info,
response_attachment().clear();
return IssueRPC(butil::gettimeofday_us());
}
-
+
END_OF_RPC:
if (new_bthread) {
// [ Essential for -usercode_in_pthread=true ]
@@ -710,7 +711,7 @@ void Controller::Call::OnComplete(
}
if (enable_circuit_breaker) {
- sending_sock->FeedbackCircuitBreaker(error_code,
+ sending_sock->FeedbackCircuitBreaker(error_code,
butil::gettimeofday_us() - begin_time_us);
}
}
@@ -877,7 +878,7 @@ void Controller::EndRPC(const CompletionInfo& info) {
const CallId saved_cid = _correlation_id;
if (_done) {
if (!FLAGS_usercode_in_pthread || _done == DoNothing()/*Note*/) {
- // Note: no need to run DoNothing in backup thread when pthread
+ // Note: no need to run DoNothing in backup thread when pthread
// mode is on. Otherwise there's a tricky deadlock:
// void SomeService::CallMethod(...) { // -usercode_in_pthread=true
// ...
@@ -887,7 +888,7 @@ void Controller::EndRPC(const CompletionInfo& info) {
// }
// Join is not signalled when the done does not Run() and the done
// can't Run() because all backup threads are blocked by Join().
-
+
OnRPCEnd(butil::gettimeofday_us());
const bool destroy_cid_in_done =
has_flag(FLAGS_DESTROY_CID_IN_DONE);
_done->Run();
@@ -1292,7 +1293,7 @@ void Controller::HandleStreamConnection(Socket
*host_socket) {
if (_request_stream == INVALID_STREAM_ID) {
CHECK(!has_remote_stream());
return;
- }
+ }
SocketUniquePtr ptr;
if (!FailedInline()) {
if (Socket::Address(_request_stream, &ptr) != 0) {
@@ -1309,7 +1310,7 @@ void Controller::HandleStreamConnection(Socket
*host_socket) {
if (FailedInline()) {
Stream::SetFailed(_request_stream);
if (_remote_stream_settings != NULL) {
- policy::SendStreamRst(host_socket,
+ policy::SendStreamRst(host_socket,
_remote_stream_settings->stream_id());
}
return;
@@ -1363,7 +1364,7 @@ Controller::CreateProgressiveAttachment(StopStyle
stop_style) {
}
SocketUniquePtr httpsock;
_current_call.sending_sock->ReAddress(&httpsock);
-
+
if (stop_style == FORCE_STOP) {
httpsock->fail_me_at_server_stop();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
