bughz/predixy
1
0
Fork 0
mirror of https://github.com/joyieldInc/predixy.git synced 2025-12-24 22:46:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.fix issue14, don't add invalid sentinel address

Browse Source 
2.add default compile option -g
3.fix command config get BufSize output
4.ignore online status for ClusterServerPool server
This commit is contained in:
fortrue 2017-12-29 11:27:02 +08:00
parent 996e02fd4d
commit 3207be46ef
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ClusterServerPool.cpp
View File

@ -148,7 +148,6 @@ void ClusterServerPool::handleResponse(Handler* h, ConnectConnection* s, Request
p.master().data(),
serv->dcName().data());
} else {
serv->setOnline(true);
serv->setUpdating(false);
}
serv->setRole(p.role());
@ -192,12 +191,7 @@ void ClusterServerPool::handleResponse(Handler* h, ConnectConnection* s, Request
}
for (auto serv : mServPool) {
if (serv->updating()) {
serv->setOnline(false);
serv->setUpdating(false);
if (ServerGroup* g = serv->group()) {
g->remove(serv);
serv->setGroup(nullptr);
}
continue;
}
if (serv->role() == Server::Master) {

2
src/Handler.cpp
View File

@ -1200,7 +1200,7 @@ void Handler::configGetRequest(Request* req)
Append("Name", "%s", conf->name());
Append("Bind", "%s", conf->bind());
Append("WorkerThreads", "%d", conf->workerThreads());
Append("BufSize", "%d", Buffer::getSize());
Append("BufSize", "%d", Buffer::getSize() + sizeof(Buffer));
Append("LocalDC", "%s", conf->localDC().c_str());
Append("MaxMemory", "%ld", AllocBase::getMaxMemory());
Append("ClientTimeout", "%d", conf->clientTimeout() / 1000000);

2
src/Makefile
View File

@ -1,5 +1,5 @@
CXX ?= g++
LVL ?= -O3
LVL ?= -g -O3
Opts += $(LVL)
ifeq ($(MT), false)

17
src/SentinelServerPool.cpp
View File

@ -275,6 +275,18 @@ AddrParser::Status AddrParser::parse(SString<Const::MaxAddrLen>& addr)
return mState != Invalid ? Done : Error;
}
static bool hasValidPort(const String& addr)
{
const char* p = addr.data() + addr.length();
for (int i = 0; i < addr.length(); ++i) {
if (*(--p) == ':') {
int port = atoi(p + 1);
return port > 0 && port < 65536;
}
}
return false;
}
void SentinelServerPool::handleSentinels(Handler* h, ConnectConnection* s, Request* req, Response* res)
{
if (!res || !res->isArray()) {
@ -286,6 +298,11 @@ void SentinelServerPool::handleSentinels(Handler* h, ConnectConnection* s, Reque
auto st = parser.parse(addr);
if (st == AddrParser::Ok) {
logDebug("sentinel server pool parse sentinel %s", addr.data());
if (!hasValidPort(addr)) {
logNotice("sentinel server pool parse sentienl %s invalid",
addr.data());
continue;
}
auto it = mServs.find(addr);
Server* serv = it == mServs.end() ? nullptr : it->second;
if (!serv) {