summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/lbdata.hh6
-rw-r--r--src/lbdatafactory.cc6
-rw-r--r--src/lbdatafactory.hh1
-rw-r--r--src/lbdecision.cc72
-rw-r--r--src/lbdecision.hh7
-rw-r--r--src/loadbalance.cc2
6 files changed, 40 insertions, 54 deletions
diff --git a/src/lbdata.hh b/src/lbdata.hh
index f4ddade..8715ef5 100644
--- a/src/lbdata.hh
+++ b/src/lbdata.hh
@@ -68,13 +68,14 @@ public:
class LBHealth {
public:
- LBHealth() :
+ LBHealth(int interface_index) :
_success_ct(0),
_failure_ct(0),
_ping_resp_time(0),
_hresults(10),
_is_active(true),
- _state_changed(true)
+ _state_changed(true),
+ _interface_index(interface_index)
{}
void put(int rtt);
@@ -99,6 +100,7 @@ class LBHealth {
LBHealthHistory _hresults;
bool _is_active;
bool _state_changed;
+ int _interface_index;
};
diff --git a/src/lbdatafactory.cc b/src/lbdatafactory.cc
index 16203b8..87ce746 100644
--- a/src/lbdatafactory.cc
+++ b/src/lbdatafactory.cc
@@ -22,7 +22,9 @@ using namespace std;
LBDataFactory::LBDataFactory(bool debug) :
- _debug(debug)
+ _debug(debug),
+ _lb_health(0),
+ _interface_index(0)
{
}
@@ -169,7 +171,7 @@ LBDataFactory::process_health(const string &key, const string &value)
if (value.empty() == false) {
LBData::InterfaceHealthIter iter = _lb_data._iface_health_coll.find(key);
if (iter == _lb_data._iface_health_coll.end()) {
- _lb_data._iface_health_coll.insert(pair<string,LBHealth>(value,LBHealth()));
+ _lb_data._iface_health_coll.insert(pair<string,LBHealth>(value,LBHealth(++_interface_index)));
}
_health_iter = _lb_data._iface_health_coll.find(value);
}
diff --git a/src/lbdatafactory.hh b/src/lbdatafactory.hh
index 6f5a11a..1ba6b58 100644
--- a/src/lbdatafactory.hh
+++ b/src/lbdatafactory.hh
@@ -78,6 +78,7 @@ private:
LBHealth _lb_health;
LBRule _lb_rule;
LBData _lb_data;
+ int _interface_index;
LBData::LBRuleIter _rule_iter;
LBData::InterfaceHealthIter _health_iter;
diff --git a/src/lbdecision.cc b/src/lbdecision.cc
index b265acb..e51530a 100644
--- a/src/lbdecision.cc
+++ b/src/lbdecision.cc
@@ -71,7 +71,6 @@ LBDecision::LBDecision(bool debug) :
**/
LBDecision::~LBDecision()
{
- shutdown();
}
/**
@@ -90,7 +89,6 @@ LBDecision::init(LBData &lbdata)
*/
char buf[20];
- int ct = 1;
/*
do we need:
@@ -125,6 +123,8 @@ if so then this stuff goes here!
LBData::InterfaceHealthIter iter = lbdata._iface_health_coll.begin();
while (iter != lbdata._iface_health_coll.end()) {
string iface = iter->first;
+
+ int ct = iter->second._interface_index;
sprintf(buf,"%d",ct);
@@ -135,10 +135,11 @@ if so then this stuff goes here!
//NOTE, WILL NEED A WAY TO CLEAN UP THIS RULE ON RESTART...
execute(string("iptables -t mangle -A ISP_") + buf + " -j ACCEPT", stdout);
-
- insert_default(string("ip route replace table ") + buf + " default dev " + iface + " via " + iter->second._nexthop, ct);
- _iface_mark_coll.insert(pair<string,int>(iface,ct));
+ // insert_default(string("ip route replace table ") + buf + " default dev " + iface + " via " + iter->second._nexthop, ct);
+ //need to force the entry on restart as the configuration may have changed.
+ execute(string("ip route replace table ") + buf + " default dev " + iface + " via " + iter->second._nexthop, stdout);
+
execute(string("ip rule delete table ") + buf, stdout);
char hex_buf[40];
@@ -148,8 +149,6 @@ if so then this stuff goes here!
if (lbdata._disable_source_nat == false) {
execute(string("iptables -t nat -A WANLOADBALANCE -m connmark --mark ") + buf + " -j SNAT --to-source " + fetch_iface_addr(iface), stdout);
}
-
- ++ct;
++iter;
}
execute("ip route flush cache", stdout);
@@ -182,21 +181,14 @@ LBDecision::run(LBData &lb_data)
//now reapply the routing tables.
LBData::InterfaceHealthIter h_iter = lb_data._iface_health_coll.begin();
while (h_iter != lb_data._iface_health_coll.end()) {
- string route_str;
- InterfaceMarkIter m_iter = _iface_mark_coll.find(h_iter->first);
- if (m_iter != _iface_mark_coll.end()) {
- route_str = m_iter->second;
-
- if (h_iter->second._is_active == true) {
- char buf[40];
- sprintf(buf,"%d",m_iter->second);
- insert_default(string("ip route replace table ") + buf + " default dev " + h_iter->first + " via " + h_iter->second._nexthop, m_iter->second);
- }
- else {
- //right now replace route, but don't delete until race condition is resolved
-
- // execute(string("ip route delete ") + route_str);
- }
+ if (h_iter->second._is_active == true) {
+ char buf[40];
+ sprintf(buf,"%d",h_iter->second._interface_index);
+ insert_default(string("ip route replace table ") + buf + " default dev " + h_iter->first + " via " + h_iter->second._nexthop, h_iter->second._interface_index);
+ }
+ else {
+ //right now replace route, but don't delete until race condition is resolved
+ // execute(string("ip route delete ") + route_str);
}
++h_iter;
}
@@ -220,29 +212,19 @@ LBDecision::run(LBData &lb_data)
}
else {
map<int,float> weights = get_new_weights(lb_data,iter->second);
- map<int,float>::iterator w_iter = weights.begin();
- char fbuf[20],dbuf[20];
if (weights.empty()) {
//no rules here!
}
- else if (weights.size() == 1) {
- sprintf(dbuf,"%d",w_iter->first);
- execute(string("iptables -t mangle -A PREROUTING ") + app_cmd + " -m state --state NEW -j ISP_" + dbuf, stdout);
- execute(string("iptables -t mangle -A PREROUTING ") + app_cmd + " -j CONNMARK --restore-mark", stdout);
- }
else {
- map<int,float>::iterator w_end = weights.end();
- --w_end;
- while (w_iter != w_end) {
+ char fbuf[20],dbuf[20];
+ map<int,float>::iterator w_iter = weights.begin();
+ for (w_iter = weights.begin(); w_iter != (--weights.end()); w_iter++) {
sprintf(fbuf,"%f",w_iter->second);
sprintf(dbuf,"%d",w_iter->first);
execute(string("iptables -t mangle -A PREROUTING ") + app_cmd + " -m state --state NEW -m statistic --mode random --probability " + fbuf + " -j ISP_" + dbuf, stdout);
- ++w_iter;
}
- //last one is special case, the catch all rule
- ++w_iter;
- sprintf(dbuf,"%d",w_iter->first);
+ sprintf(dbuf,"%d",(--weights.end())->first);
execute(string("iptables -t mangle -A PREROUTING ") + app_cmd + " -m state --state NEW -j ISP_" + dbuf, stdout);
execute(string("iptables -t mangle -A PREROUTING ") + app_cmd + " -j CONNMARK --restore-mark", stdout);
}
@@ -257,7 +239,7 @@ LBDecision::run(LBData &lb_data)
*
**/
void
-LBDecision::shutdown()
+LBDecision::shutdown(LBData &data)
{
string stdout;
@@ -270,16 +252,16 @@ LBDecision::shutdown()
//remove the policy entries
- InterfaceMarkIter iter = _iface_mark_coll.begin();
- while (iter != _iface_mark_coll.end()) {
+ LBData::InterfaceHealthIter h_iter = data._iface_health_coll.begin();
+ while (h_iter != data._iface_health_coll.end()) {
char buf[40];
- sprintf(buf,"%d",iter->second);
+ sprintf(buf,"%d",h_iter->second._interface_index);
execute(string("ip rule del table ") + buf, stdout);
//need to delete ip rule here as well!
- ++iter;
+ ++h_iter;
}
}
@@ -328,13 +310,18 @@ LBDecision::get_new_weights(LBData &data, LBRule &rule)
{
map<int,float> weights;
int group = 0;
- int ct = 1;
LBRule::InterfaceDistIter iter = rule._iface_dist_coll.begin();
while (iter != rule._iface_dist_coll.end()) {
if (_debug) {
cout << "LBDecision::get_new_weights(): " << iter->first << " is active: " << (data.is_active(iter->first) ? "true" : "false") << endl;
}
+ int ct = 0;
+ LBData::InterfaceHealthIter h_iter = data._iface_health_coll.find(iter->first);
+ if (h_iter != data._iface_health_coll.end()) {
+ ct = h_iter->second._interface_index;
+ }
+
if (rule._failover == true) { //add single entry if active
if (data.is_active(iter->first)) {
//select the active interface that has the highest weight
@@ -361,7 +348,6 @@ LBDecision::get_new_weights(LBData &data, LBRule &rule)
weights.insert(pair<int,float>(ct,0.));
}
}
- ++ct;
++iter;
}
diff --git a/src/lbdecision.hh b/src/lbdecision.hh
index 76869fa..abac5db 100644
--- a/src/lbdecision.hh
+++ b/src/lbdecision.hh
@@ -17,10 +17,6 @@ using namespace std;
class LBDecision
{
public:
- typedef map<string,int> InterfaceMarkColl;
- typedef map<string,int>::iterator InterfaceMarkIter;
-
-public:
LBDecision(bool debug);
~LBDecision();
@@ -31,7 +27,7 @@ public:
run(LBData &lbdata);
void
- shutdown();
+ shutdown(LBData &lbdata);
private:
int
@@ -51,7 +47,6 @@ private:
private:
bool _debug;
- InterfaceMarkColl _iface_mark_coll;
};
#endif //__LBDECISION_HH__
diff --git a/src/loadbalance.cc b/src/loadbalance.cc
index d24c0f0..57d602d 100644
--- a/src/loadbalance.cc
+++ b/src/loadbalance.cc
@@ -29,7 +29,7 @@ LoadBalance::LoadBalance(bool debug, string &output_path) :
**/
LoadBalance::~LoadBalance()
{
- _decision.shutdown();
+ _decision.shutdown(_lbdata);
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 05:59:30 +0000