Skip to content

Commit

Permalink
Agent: XMPP connection not attempted by agent
Browse files Browse the repository at this point in the history 
Agent marks connection to Xmpp-Server DOWN after several attempts and rediscovers controllers.
If the controller list sent by Discovery is already marked DOWN, agent does not honor the
controller connection to be applied.  This happens in the time period where discovery has not
yet marked the controller down (marked when 3 heartbeats are missing) and sends the stale list.
Additionally as discovery client has a checksum so the callbacks are throttled at source and
hence the clients never get called when controllers are UP and the information is lost.

Solution is to honor reponse from discovery irrespective of the state of the publisher
(both Xmpp Server advertised by controller and dns daemon)

Test cases added.

Change-Id: I5c6695f04d3dd4a384f0ea7d0da912475966c6eb
Closes-Bug:1457243
  • Loading branch information
@nipak
nipak committed Jul 2, 2015
1 parent 28835aa commit 65b5285
Show file tree
Hide file tree
Showing 4 changed files with 292 additions and 134 deletions.
9 changes: 6 additions & 3 deletions src/vnsw/agent/controller/controller.sandesh
View file
Expand Up @@ -74,9 +74,12 @@ traceobject sandesh AgentXmppSession {
}

trace sandesh AgentXmppDiscoveryConnection {
1: string servertype;
2: string server;
3: string message;
1: string message;
2: "index =";
3: u16 index;
4: "server =";
5: string server;
6: string data;
}

trace sandesh AgentXmppWalker {
Expand Down
255 changes: 130 additions & 125 deletions src/vnsw/agent/controller/controller_init.cc
View file
Expand Up @@ -50,9 +50,9 @@ void VNController::XmppServerConnect() {
AgentXmppChannel *ch = agent_->controller_xmpp_channel(count);
if (ch) {
// Channel is created, do not disturb
CONTROLLER_TRACE(DiscoveryConnection, "XMPP Server",
ch->GetXmppServer(),
"is already present, ignore discovery response");
CONTROLLER_TRACE(DiscoveryConnection,
"XMPP Server is already present, ignore discovery response",
count, ch->GetXmppServer(), "");
count++;
continue;
}
Expand Down Expand Up @@ -118,9 +118,9 @@ void VNController::DnsXmppServerConnect() {
AgentDnsXmppChannel *ch = agent_->dns_xmpp_channel(count);
if (ch) {
// Channel is up and running, do not disturb
CONTROLLER_TRACE(DiscoveryConnection, "DNS Server",
ch->GetXmppServer(),
"is already present, ignore discovery response");
CONTROLLER_TRACE(DiscoveryConnection,
"DNS Server is already present, ignore discovery response",
count, ch->GetXmppServer(), "");
count++;
continue;
}
Expand Down Expand Up @@ -301,88 +301,99 @@ void VNController::DisConnectControllerIfmapServer(uint8_t idx) {
agent_->reset_controller_ifmap_xmpp_server(idx);
}

bool VNController::AgentXmppServerExists(const std::string &server_ip,
std::vector<DSResponse> resp) {

std::vector<DSResponse>::iterator iter;
for (iter = resp.begin(); iter != resp.end(); iter++) {
DSResponse dr = *iter;
if (dr.ep.address().to_string().compare(server_ip) == 0) {
return true;
}
}
return false;
}

void VNController::ApplyDiscoveryXmppServices(std::vector<DSResponse> resp) {

std::list<AgentXmppChannel *>AgentXmppChannelList;
std::vector<DSResponse>::iterator iter;
int8_t count = -1;
for (iter = resp.begin(); iter != resp.end(); iter++) {
DSResponse dr = *iter;

CONTROLLER_TRACE(DiscoveryConnection, "XMPP Server", dr.ep.address().to_string(),
"Discovery Server Response");
count ++;

CONTROLLER_TRACE(DiscoveryConnection, "XMPP Discovery Server Response",
count, dr.ep.address().to_string(), integerToString(dr.ep.port()));

AgentXmppChannel *chnl = FindAgentXmppChannel(dr.ep.address().to_string());
if (chnl) {
AgentXmppChannelList.push_back(chnl);
if (chnl->GetXmppChannel() &&
chnl->GetXmppChannel()->GetPeerState() == xmps::READY) {
CONTROLLER_TRACE(DiscoveryConnection, "XMPP Server",
chnl->GetXmppServer(), "is UP and running, ignore");
CONTROLLER_TRACE(DiscoveryConnection,
"XMPP Server is READY and running, ignore", count,
chnl->GetXmppServer(), "");
continue;
} else {
CONTROLLER_TRACE(DiscoveryConnection, "XMPP Server",
chnl->GetXmppServer(), "is NOT_READY, ignore");
CONTROLLER_TRACE(DiscoveryConnection,
"XMPP Server is NOT_READY, ignore", count,
chnl->GetXmppServer(), "");
continue;
}
}

} else {
if (agent_->controller_ifmap_xmpp_server(0).empty()) {
agent_->set_controller_ifmap_xmpp_server(dr.ep.address().to_string(), 0);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), 0);
CONTROLLER_TRACE(DiscoveryConnection, "Set Xmpp Channel[0] = ",
dr.ep.address().to_string(), "");
} else if (agent_->controller_ifmap_xmpp_server(1).empty()) {
agent_->set_controller_ifmap_xmpp_server(dr.ep.address().to_string(), 1);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), 1);
CONTROLLER_TRACE(DiscoveryConnection, "Set Xmpp Channel[1] = ",
dr.ep.address().to_string(), "");
} else if (agent_->controller_xmpp_channel(0) &&
(agent_->controller_xmpp_channel(0)->GetXmppChannel()->
GetPeerState() == xmps::NOT_READY)) {

DisConnectControllerIfmapServer(0);

CONTROLLER_TRACE(DiscoveryConnection,
"Refresh Xmpp Channel[0] = ", dr.ep.address().to_string(), "");
agent_->set_controller_ifmap_xmpp_server(dr.ep.address().to_string(),0);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), 0);
for (uint8_t xs_idx = 0; xs_idx < MAX_XMPP_SERVERS; xs_idx++) {

} else if (agent_->controller_xmpp_channel(1) &&
(agent_->controller_xmpp_channel(1)->GetXmppChannel()->
GetPeerState() == xmps::NOT_READY)) {
if (agent_->controller_ifmap_xmpp_server(xs_idx).empty()) {

DisConnectControllerIfmapServer(1);
CONTROLLER_TRACE(DiscoveryConnection, "Set Xmpp Channel",
xs_idx, dr.ep.address().to_string(),
integerToString(dr.ep.port()));

CONTROLLER_TRACE(DiscoveryConnection,
"Refresh Xmpp Channel[1] = ", dr.ep.address().to_string(), "");
agent_->set_controller_ifmap_xmpp_server(dr.ep.address().to_string(), 1);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), 1);
}
agent_->set_controller_ifmap_xmpp_server(
dr.ep.address().to_string(), xs_idx);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), xs_idx);
break;

} else if (agent_->controller_xmpp_channel(xs_idx) &&
(agent_->controller_xmpp_channel(xs_idx)->GetXmppChannel()->
GetPeerState() == xmps::NOT_READY)) {

if (AgentXmppServerExists(
agent_->controller_ifmap_xmpp_server(xs_idx), resp)) {

CONTROLLER_TRACE(DiscoveryConnection,
"Retain Xmpp Channel ", xs_idx,
agent_->controller_ifmap_xmpp_server(xs_idx), "");
continue;
}

CONTROLLER_TRACE(DiscoveryConnection,
"ReSet Xmpp Channel ", xs_idx,
agent_->controller_ifmap_xmpp_server(xs_idx),
dr.ep.address().to_string());

DisConnectControllerIfmapServer(xs_idx);
agent_->set_controller_ifmap_xmpp_server(
dr.ep.address().to_string(),xs_idx);
agent_->set_controller_ifmap_xmpp_port(dr.ep.port(), xs_idx);
break;
}
}
}
}

/* Remove stale Servers */
for (uint8_t idx = 0; idx < MAX_XMPP_SERVERS; idx++) {
if (agent_->controller_xmpp_channel(idx) != NULL) {
std::list<AgentXmppChannel *>::iterator it;
for (it = AgentXmppChannelList.begin();
it != AgentXmppChannelList.end(); it++) {

if (agent_->controller_xmpp_channel(idx) == *it) {
// in the list, nothing to do
break;
}
}

if (it == AgentXmppChannelList.end()) {
// not in list, cleanup only if DOWN as new set of hints from
// discovery shud take effect only if agent detects the server DOWN
if (agent_->controller_xmpp_channel(idx)->GetXmppChannel()->
GetPeerState() == xmps::NOT_READY) {
CONTROLLER_TRACE(DiscoveryConnection, "Cleanup Older Xmpp ",
agent_->controller_ifmap_xmpp_server(idx), "");
DisConnectControllerIfmapServer(idx);
agent_->reset_controller_ifmap_xmpp_server(idx);
}

if (!AgentXmppServerExists(
agent_->controller_ifmap_xmpp_server(idx), resp)) {

CONTROLLER_TRACE(DiscoveryConnection, "Cleanup Older Xmpp ",
idx, agent_->controller_ifmap_xmpp_server(idx), "");
DisConnectControllerIfmapServer(idx);
agent_->reset_controller_ifmap_xmpp_server(idx);
}
}
}
Expand Down Expand Up @@ -432,88 +443,82 @@ void VNController::DisConnectDnsServer(uint8_t idx) {

void VNController::ApplyDiscoveryDnsXmppServices(std::vector<DSResponse> resp) {

std::list<AgentDnsXmppChannel *>AgentDnsXmppChannelList;
std::vector<DSResponse>::iterator iter;
int8_t count = -1;
for (iter = resp.begin(); iter != resp.end(); iter++) {
DSResponse dr = *iter;

CONTROLLER_TRACE(DiscoveryConnection, "DNS Server", dr.ep.address().to_string(),
"Discovery Server Response");
count++;

CONTROLLER_TRACE(DiscoveryConnection, "DNS Discovery Server Response", count,
dr.ep.address().to_string(), integerToString(dr.ep.port()));

AgentDnsXmppChannel *chnl = FindAgentDnsXmppChannel(dr.ep.address().to_string());
if (chnl) {
AgentDnsXmppChannelList.push_back(chnl);
if (chnl->GetXmppChannel() &&
chnl->GetXmppChannel()->GetPeerState() == xmps::READY) {
CONTROLLER_TRACE(DiscoveryConnection, "DNS Server",
chnl->GetXmppServer(), "is UP and running, ignore");
CONTROLLER_TRACE(DiscoveryConnection,
"DNS Server is READY and running, ignore", count,
chnl->GetXmppServer(), "");
continue;
} else {
CONTROLLER_TRACE(DiscoveryConnection, "DNS Server",
chnl->GetXmppServer(), "is NOT_READY, ignore");
CONTROLLER_TRACE(DiscoveryConnection,
"DNS Server is NOT_READY, ignore", count,
chnl->GetXmppServer(), "");
continue;
}

} else {
if (agent_->dns_server(0).empty()) {
agent_->set_dns_server(dr.ep.address().to_string(), 0);
agent_->set_dns_server_port(dr.ep.port(), 0);
CONTROLLER_TRACE(DiscoveryConnection, "Set Dns Xmpp Channel[0] = ",
dr.ep.address().to_string(), integerToString(dr.ep.port()));
} else if (agent_->dns_server(1).empty()) {
agent_->set_dns_server(dr.ep.address().to_string(), 1);
agent_->set_dns_server_port(dr.ep.port(), 1);
CONTROLLER_TRACE(DiscoveryConnection, "Set Dns Xmpp Channel[1] = ",
dr.ep.address().to_string(), integerToString(dr.ep.port()));
} else if (agent_->dns_xmpp_channel(0) &&
(agent_->dns_xmpp_channel(0)->GetXmppChannel()->GetPeerState()
== xmps::NOT_READY)) {

DisConnectDnsServer(0);

CONTROLLER_TRACE(DiscoveryConnection,
"Refresh Dns Xmpp Channel[0] = ",
dr.ep.address().to_string(), integerToString(dr.ep.port()));
agent_->set_dns_server(dr.ep.address().to_string(), 0);
agent_->set_dns_server_port(dr.ep.port(), 0);

} else if (agent_->dns_xmpp_channel(1) &&
(agent_->dns_xmpp_channel(1)->GetXmppChannel()->GetPeerState()
== xmps::NOT_READY)) {

DisConnectDnsServer(1);

CONTROLLER_TRACE(DiscoveryConnection,
"Refresh Dns Xmpp Channel[1] = ",
dr.ep.address().to_string(), integerToString(dr.ep.port()));
agent_->set_dns_server(dr.ep.address().to_string(), 1);
agent_->set_dns_server_port(dr.ep.port(), 1);
for (uint8_t xs_idx = 0; xs_idx < MAX_XMPP_SERVERS; xs_idx++) {

if (agent_->dns_server(xs_idx).empty()) {

CONTROLLER_TRACE(DiscoveryConnection,
"Set Dns Xmpp Channel ", xs_idx,
dr.ep.address().to_string(), integerToString(dr.ep.port()));

agent_->set_dns_server(dr.ep.address().to_string(), xs_idx);
agent_->set_dns_server_port(dr.ep.port(), xs_idx);
break;

} else if (agent_->dns_xmpp_channel(xs_idx) &&
(agent_->dns_xmpp_channel(xs_idx)->GetXmppChannel()->GetPeerState()
== xmps::NOT_READY)) {

if (AgentXmppServerExists(
agent_->dns_server(xs_idx), resp)) {

CONTROLLER_TRACE(DiscoveryConnection,
"Retain Dns Xmpp Channel ", xs_idx,
agent_->dns_server(xs_idx), "");
continue;
}

CONTROLLER_TRACE(DiscoveryConnection,
"ReSet Dns Xmpp Channel ", xs_idx,
agent_->dns_server(xs_idx),
dr.ep.address().to_string());

DisConnectDnsServer(xs_idx);
agent_->set_dns_server(dr.ep.address().to_string(), xs_idx);
agent_->set_dns_server_port(dr.ep.port(), xs_idx);
break;
}
}
}
}

/* Remove stale Servers */
for (uint8_t idx = 0; idx < MAX_XMPP_SERVERS; idx++) {
if (agent_->dns_xmpp_channel(idx) != NULL) {
std::list<AgentDnsXmppChannel *>::iterator it;
for (it = AgentDnsXmppChannelList.begin();
it != AgentDnsXmppChannelList.end(); it++) {

if (agent_->dns_xmpp_channel(idx) == *it) {
// in the list, nothing to do
break;
}
}

if (it == AgentDnsXmppChannelList.end()) {
// not in list, cleanup only if DOWN as new set of hints from
// discovery shud take effect only if agent detects the server DOWN
if (agent_->dns_xmpp_channel(idx)->GetXmppChannel()->GetPeerState()
== xmps::NOT_READY) {
CONTROLLER_TRACE(DiscoveryConnection, "Cleanup Older Dns Xmpp ",
agent_->dns_server(idx), "");
DisConnectDnsServer(idx);
agent_->reset_dns_server(idx);
}

if (AgentXmppServerExists(
agent_->dns_server(idx), resp)) {

CONTROLLER_TRACE(DiscoveryConnection, "Cleanup Older Dns Xmpp",
idx, agent_->dns_server(idx), "");
DisConnectDnsServer(idx);
agent_->reset_dns_server(idx);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/vnsw/agent/controller/controller_init.h
View file
Expand Up @@ -78,6 +78,8 @@ class VNController {
AgentDnsXmppChannel *FindAgentDnsXmppChannel(const std::string &server_ip);
void DeleteConnectionInfo(const std::string &addr, bool is_dns) const;
const std::string MakeConnectionPrefix(bool is_dns) const;
bool AgentXmppServerExists(const std::string &server_ip,
std::vector<DSResponse> resp);

Agent *agent_;
uint64_t multicast_sequence_number_;
Expand Down

0 comments on commit 65b5285

Please sign in to comment.