Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Periodic ns quit #2123

Merged
merged 3 commits into from
Feb 15, 2023
Merged

Periodic ns quit #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bda7a0
Fix periodic ns thread can not quit
chenBright Feb 11, 2023
ef48e53
Abstract ConsulNamingService into a PeriodicNamingService
chenBright Feb 11, 2023
e099a26
Quit periodic ns when bthread is stopped
chenBright Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/brpc/periodic_naming_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ int PeriodicNamingService::RunNamingService(
const char* service_name, NamingServiceActions* actions) {
std::vector<ServerNode> servers;
bool ever_reset = false;
for (;;) {
while (true) {
servers.clear();
const int rc = GetServers(service_name, &servers);
if (rc == 0) {
Expand All @@ -51,6 +51,10 @@ int PeriodicNamingService::RunNamingService(
actions->ResetServers(servers);
}

if (bthread_stopped(bthread_self())) {
chenBright marked this conversation as resolved.
Show resolved Hide resolved
RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
return 0;
}
if (bthread_usleep(GetNamingServiceAccessIntervalMs() * 1000UL) < 0) {
if (errno == ESTOP) {
RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
Expand Down
2 changes: 1 addition & 1 deletion src/brpc/periodic_naming_service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PeriodicNamingService : public NamingService {
virtual int GetNamingServiceAccessIntervalMs() const;

int RunNamingService(const char* service_name,
NamingServiceActions* actions);
NamingServiceActions* actions) override;
};

} // namespace brpc
Expand Down
46 changes: 8 additions & 38 deletions src/brpc/policy/consul_naming_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ std::string RapidjsonValueToString(const BUTIL_RAPIDJSON_NAMESPACE::Value& value
return buffer.GetString();
}

ConsulNamingService::ConsulNamingService()
: _backup_file_loaded(false), _consul_connected(false) {}

int ConsulNamingService::GetNamingServiceAccessIntervalMs() const {
return FLAGS_consul_retry_interval_ms > 0 ? FLAGS_consul_retry_interval_ms :
PeriodicNamingService::GetNamingServiceAccessIntervalMs();
}

int ConsulNamingService::DegradeToOtherServiceIfNeeded(const char* service_name,
std::vector<ServerNode>* servers) {
if (FLAGS_consul_enable_degrade_to_file_naming_service && !_backup_file_loaded) {
Expand Down Expand Up @@ -209,47 +217,9 @@ int ConsulNamingService::GetServers(const char* service_name,
return 0;
}

int ConsulNamingService::RunNamingService(const char* service_name,
NamingServiceActions* actions) {
std::vector<ServerNode> servers;
bool ever_reset = false;
for (;;) {
servers.clear();
const int rc = GetServers(service_name, &servers);
if (bthread_stopped(bthread_self())) {
RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
return 0;
}
if (rc == 0) {
ever_reset = true;
actions->ResetServers(servers);
} else {
if (!ever_reset) {
// ResetServers must be called at first time even if GetServers
// failed, to wake up callers to `WaitForFirstBatchOfServers'
ever_reset = true;
servers.clear();
actions->ResetServers(servers);
}
if (bthread_usleep(std::max(FLAGS_consul_retry_interval_ms, 1) * butil::Time::kMicrosecondsPerMillisecond) < 0) {
if (errno == ESTOP) {
RPC_VLOG << "Quit NamingServiceThread=" << bthread_self();
return 0;
}
PLOG(FATAL) << "Fail to sleep";
return -1;
}
}
}
CHECK(false);
return -1;
}


void ConsulNamingService::Describe(std::ostream& os,
const DescribeOptions&) const {
os << "consul";
return;
}

NamingService* ConsulNamingService::New() const {
Expand Down
18 changes: 10 additions & 8 deletions src/brpc/policy/consul_naming_service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,23 @@
#ifndef BRPC_POLICY_CONSUL_NAMING_SERVICE
#define BRPC_POLICY_CONSUL_NAMING_SERVICE

#include "brpc/naming_service.h"
#include "brpc/periodic_naming_service.h"
#include "brpc/channel.h"


namespace brpc {
class Channel;
namespace policy {

class ConsulNamingService : public NamingService {
private:
int RunNamingService(const char* service_name,
NamingServiceActions* actions) override;
class ConsulNamingService : public PeriodicNamingService {
public:
ConsulNamingService();

private:
int GetServers(const char* service_name,
std::vector<ServerNode>* servers);
std::vector<ServerNode>* servers) override;

int GetNamingServiceAccessIntervalMs() const override;

void Describe(std::ostream& os, const DescribeOptions&) const override;

Expand All @@ -48,8 +50,8 @@ class ConsulNamingService : public NamingService {
Channel _channel;
std::string _consul_index;
std::string _consul_url;
bool _backup_file_loaded = false;
bool _consul_connected = false;
bool _backup_file_loaded;
bool _consul_connected;
};

} // namespace policy
Expand Down