mirror of
https://github.com/ZeroTier/ZeroTierOne
synced 2025-08-21 05:43:59 -07:00
Adjust terminology
This commit is contained in:
Joseph Henry
parent
5f0ee4fc78
commit
a33a494d60
13 changed files with 440 additions and 442 deletions
|
|
@ -1,17 +1,17 @@
|
|||
### **2.1.5.** Link aggregation
|
||||
### Bonding (link aggregation)
|
||||
|
||||
Link aggregation allows the simultaneous (or conditional) use of multiple physical links to enable increased throughput, load balancing, redundancy, and fault tolerance. There are a variety of standard policies available that can be used right out of the box with little to no configuration. These policies are directly inspired by [the policies offered by the Linux kernel](https://www.kernel.org/doc/Documentation/networking/bonding.txt).
|
||||
Link aggregation allows the simultaneous (or conditional) use of multiple physical links to enable increased throughput, load balancing, redundancy, and fault tolerance. There are a variety of standard policies available that can be used right out of the box with little to no configuration. These policies are directly inspired by [the policies offered by the Linux kernel](https://www.kernel.org/doc/Documentation/networking/bonding.txt) but are now offered in user-space and hence available on all platforms that ZeroTier supports.
|
||||
|
||||
#### Standard Policies
|
||||
#### Standard policies
|
||||
|
||||
| Policy name | Fault tolerance | Min. failover (sec.) | Default Failover (sec.) | Balancing | Aggregation efficiency | Redundancy | Sequence Reordering |
|
||||
|--------------------|:---------------------:|---------------------:|---------------------:|----------------------:|-----------------------:|-----------:|--------------------:|
|
||||
| `none` | None | `60+` | `60+` | none | `none` |1 | No
|
||||
| `active-backup` | Brief interruption | `0.25` | `10` | none | `low` |1 | Only during failover
|
||||
| `broadcast` | Fully tolerant | `N/A` | `N/A` | none | `very low` |N | Often
|
||||
| `balance-rr` | Self-healing | `0.25` | `10` | packet-based | `high` |1 | Often
|
||||
| `balance-xor` | Self-healing | `0.25` | `10` | flow-based | `very high` |1 | Only during failover
|
||||
| `balance-aware` | Self-healing | `0.25` | `10` | *adaptive* flow-based | `very high` |1 | Only during failover and re-balance
|
||||
| Policy name | Fault tolerance | Min. failover (sec.) | Default Failover (sec.)| Balancing | Aggregation efficiency | Redundancy | Sequence Reordering |
|
||||
|--------------------|:---------------------:|---------------------:|-----------------------:|----------------------:|-----------------------:|-----------:|--------------------:|
|
||||
| `none` | None | `60+` | `60+` | none | `none` |1 | No
|
||||
| `active-backup` | Brief interruption | `0.25` | `10` | none | `low` |1 | Only during failover
|
||||
| `broadcast` | Fully tolerant | `N/A` | `N/A` | none | `very low` |N | Often
|
||||
| `balance-rr` | Self-healing | `0.25` | `10` | packet-based | `high` |1 | Often
|
||||
| `balance-xor` | Self-healing | `0.25` | `10` | flow-based | `very high` |1 | Only during failover
|
||||
| `balance-aware` | Self-healing | `0.25` | `10` | *adaptive* flow-based | `very high` |1 | Only during failover and re-balance
|
||||
|
||||
A policy can be used easily without specifying any additional parameters:
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ A policy can be used easily without specifying any additional parameters:
|
|||
}
|
||||
```
|
||||
|
||||
#### Custom Policies
|
||||
#### Custom policies
|
||||
|
||||
To customize a bonding policy for your use-case simply specify a `basePolicy` and override chosen parameters. For example, to create a more aggressive `active-backup` policy with low monitoring overhead that will failover `0.250` seconds after it detects a link failure, one could do the following:
|
||||
|
||||
|
|
@ -45,11 +45,11 @@ To customize a bonding policy for your use-case simply specify a `basePolicy` an
|
|||
}
|
||||
```
|
||||
|
||||
#### Specifying Slave interfaces
|
||||
#### Specifying links
|
||||
|
||||
Available system network interfaces are referred to as `slaves`. Different sets of slaves can be constructed for different bonding policies and used simultaneously. One can specify the links that ZeroTier should use in any given bonding policy simply by providing an array of slaves with names corresponding to interface names. If a user doesn't specify a set of interfaces to use, ZeroTier will assume every system interface is available for use. However, if the user **does** specify a set of interfaces, ZeroTier will only use what is specified. The same applies to failover rules, if none are specified, ZeroTier will failover to any operational slave. On the other hand, if the user does specify failover rules and there is ever a situation where a slave is available for usage but does not fit within the rules specified by the user, it will go unused.
|
||||
Bonds are composed of multiple `links`. Different sets of links can be constructed for different bonding policies and used simultaneously. One can specify the links that ZeroTier should use in any given bonding policy simply by providing an array of links with names corresponding to interface names. If a user doesn't specify a set of interfaces to use, ZeroTier will assume every system interface is available for use. However, if the user **does** specify a set of interfaces, ZeroTier will only use what is specified. The same applies to failover rules, if none are specified, ZeroTier will failover to any operational link. On the other hand, if the user does specify failover rules and there is ever a situation where a link is available for usage but does not fit within the rules specified by the user, it will go unused.
|
||||
|
||||
To specify that ZeroTier should only use `eth0` and `eth1` as primary slaves, and `eth2` as a backup spare and that it should prefer IPv4 over IPv6 except on `eth2` where only IPv6 is allowed:
|
||||
To specify that ZeroTier should only use `eth0` and `eth1` as primary links, and `eth2` as a backup spare and that it should prefer IPv4 over IPv6 except on `eth2` where only IPv6 is allowed:
|
||||
|
||||
```
|
||||
{
|
||||
|
|
@ -57,7 +57,7 @@ To specify that ZeroTier should only use `eth0` and `eth1` as primary slaves, an
|
|||
"defaultBondingPolicy": "aggressive-active-backup",
|
||||
"policies": {
|
||||
"aggressive-active-backup": {
|
||||
"slaves": {
|
||||
"links": {
|
||||
"eth0": {
|
||||
"ipvPref": 46,
|
||||
"failoverTo": "eth2",
|
||||
|
|
@ -79,27 +79,27 @@ To specify that ZeroTier should only use `eth0` and `eth1` as primary slaves, an
|
|||
}
|
||||
```
|
||||
|
||||
Additional slave-specific parameters:
|
||||
Additional link-specific parameters:
|
||||
|
||||
```
|
||||
"slaves":
|
||||
"links":
|
||||
{
|
||||
"interfaceName": /* System-name of the network interface. */
|
||||
{
|
||||
"failoverInterval": 0-65535, /* (optional) How quickly a path on this slave should failover after a detected failure. */
|
||||
"ipvPref": [0,4,6,46,64], /* (optional) IP version preference for detected paths on a slave. */
|
||||
"speed": 0-1000000, /* (optional) How fast this slave is (in arbitrary units). This is a useful way to manually allocate a bond. */
|
||||
"failoverInterval": 0-65535, /* (optional) How quickly a path on this link should failover after a detected failure. */
|
||||
"ipvPref": [0,4,6,46,64], /* (optional) IP version preference for detected paths on a link. */
|
||||
"speed": 0-1000000, /* (optional) How fast this link is (in arbitrary units). This is a useful way to manually allocate a bond. */
|
||||
"alloc": 0-255, /* (optional) A relative value representing a desired allocation. */
|
||||
"upDelay": 0-65535, /* (optional) How long after a path becomes alive before it is added to the bond. */
|
||||
"downDelay": 0-65535, /* (optional) How long after a path fails before it is removed from the bond. */
|
||||
"failoverTo": "spareInterfaceName", /* (optional) Which slave should be used next after a failure of this slave. */
|
||||
"enabled": true|false, /* (optional) Whether any paths on this slave are allowed to be used this bond. */
|
||||
"mode": "primary"|"spare" /* (optional) Whether this slave is used by default or only after failover events. */
|
||||
"failoverTo": "spareInterfaceName", /* (optional) Which link should be used next after a failure of this link. */
|
||||
"enabled": true|false, /* (optional) Whether any paths on this link are allowed to be used this bond. */
|
||||
"mode": "primary"|"spare" /* (optional) Whether this link is used by default or only after failover events. */
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### Peer-specific Bonds
|
||||
#### Peer-specific bonds
|
||||
|
||||
It is possible to direct ZeroTier to form a certain type of bond with specific peers of your choice. For instance, if one were to want `active-backup` by default but for certain peers to be bonded with a custom load-balanced bond such as `my-custom-balance-aware` one could do the following:
|
||||
|
||||
|
|
@ -127,17 +127,17 @@ It is possible to direct ZeroTier to form a certain type of bond with specific p
|
|||
}
|
||||
```
|
||||
|
||||
#### Active Backup (`active-backup`)
|
||||
#### Active backup (`active-backup`)
|
||||
|
||||
Traffic is sent only on (one) path at any given time. A different path becomes active if the current path fails. This mode provides fault tolerance with a nearly immediate fail-over. This mode **does not** increase total throughput.
|
||||
|
||||
- `mode`: `primary, spare` Slave option which specifies which slave is the primary device. The specified device is intended to always be the active slave while it is available. There are exceptions to this behavior when using different `slaveSelectMethod` modes. There can only be one `primary` slave in this bonding policy.
|
||||
- `mode`: `primary, spare` Link option which specifies which link is the primary device. The specified device is intended to always be the active link while it is available. There are exceptions to this behavior when using different `linkSelectMethod` modes. There can only be one `primary` link in this bonding policy.
|
||||
|
||||
- `slaveSelectMethod`: Specifies the selection policy for the active slave during failure and/or recovery events. This is similar to the Linux Kernel's `primary_reselect` option but with a minor extension:
|
||||
- `optimize`: **(default if user provides no failover guidance)** The primary slave can change periodically if a superior path is detected.
|
||||
- `always`: **(default when slaves are explicitly specified)**: Primary slave regains status as active slave whenever it comes back up.
|
||||
- `better`: Primary slave regains status as active slave when it comes back up and (if) it is better than the currently-active slave.
|
||||
- `failure`: Primary slave regains status as active slave only if the currently-active slave fails.
|
||||
- `linkSelectMethod`: Specifies the selection policy for the active link during failure and/or recovery events. This is similar to the Linux Kernel's `primary_reselect` option but with a minor extension:
|
||||
- `optimize`: **(default if user provides no failover guidance)** The primary link can change periodically if a superior path is detected.
|
||||
- `always`: **(default when links are explicitly specified)**: Primary link regains status as active link whenever it comes back up.
|
||||
- `better`: Primary link regains status as active link when it comes back up and (if) it is better than the currently-active link.
|
||||
- `failure`: Primary link regains status as active link only if the currently-active link fails.
|
||||
|
||||
```
|
||||
{
|
||||
|
|
@ -146,8 +146,8 @@ Traffic is sent only on (one) path at any given time. A different path becomes a
|
|||
"defaultBondingPolicy": "active-backup",
|
||||
"active-backup":
|
||||
{
|
||||
"slaveSelectMethod": "always",
|
||||
"slaves":
|
||||
"linkSelectMethod": "always",
|
||||
"links":
|
||||
{
|
||||
"eth0": { "failoverTo": "eth1", "mode": "primary" },
|
||||
"eth1": { "mode": "spare" },
|
||||
|
|
@ -163,17 +163,17 @@ Traffic is sent only on (one) path at any given time. A different path becomes a
|
|||
|
||||
Traffic is sent on (all) available paths simultaneously. This mode provides fault tolerance and effectively immediate failover due to transmission redundancy. This mode is a poor utilization of throughput resources and will **not** increase throughput but can prevent packet loss during a link failure. The only option available is `dedup` which will de-duplicate all packets on the receiving end if set to `true`.
|
||||
|
||||
#### Balance Round Robin (`balance-rr`)
|
||||
#### Balance round robin (`balance-rr`)
|
||||
|
||||
Traffic is striped across multiple paths. Offers partial fault tolerance immediately, full fault tolerance eventually. This policy is unaware of protocols and is primarily intended for use with protocols that are not sensitive to reordering delays. The only option available for this policy is `packetsPerSlave` which specifies the number of packets to transmit via a path before moving to the next in the RR sequence. When set to `0` a path is chosen at random for each outgoing packet. The default value is `8`, low values can begin to add overhead to packet processing.
|
||||
Traffic is striped across multiple paths. Offers partial fault tolerance immediately, full fault tolerance eventually. This policy is unaware of protocols and is primarily intended for use with protocols that are not sensitive to reordering delays. The only option available for this policy is `packetsPerLink` which specifies the number of packets to transmit via a path before moving to the next in the RR sequence. When set to `0` a path is chosen at random for each outgoing packet. The default value is `8`, low values can begin to add overhead to packet processing.
|
||||
|
||||
#### Balance XOR (`balance-xor`, similar to the Linux kernel's [balance-xor](https://www.kernel.org/doc/Documentation/networking/bonding.txt) with `xmit_hash_policy=layer3+4`)
|
||||
|
||||
Traffic is categorized into *flows* based on *source port*, *destination port*, and *protocol type* these flows are then hashed onto available slaves. Each flow will persist on its assigned slave interface for its entire life-cycle. Traffic that does not have an assigned port (such as ICMP pings) will be randomly distributed across slaves. The hash function is simply: `src_port ^ dst_port ^ proto`.
|
||||
Traffic is categorized into *flows* based on *source port*, *destination port*, and *protocol type* these flows are then hashed onto available links. Each flow will persist on its assigned link interface for its entire life-cycle. Traffic that does not have an assigned port (such as ICMP pings) will be randomly distributed across links. The hash function is simply: `src_port ^ dst_port ^ proto`.
|
||||
|
||||
#### Balance Aware (`balance-aware`, similar to Linux kernel's [`balance-*lb`](https://www.kernel.org/doc/Documentation/networking/bonding.txt) modes)
|
||||
#### Balance aware (`balance-aware`, similar to Linux kernel's [`balance-*lb`](https://www.kernel.org/doc/Documentation/networking/bonding.txt) modes)
|
||||
|
||||
Traffic is dynamically allocated and balanced across multiple slaves simultaneously according to the target allocation. Options allow for *packet* or *flow-based* processing, and active-flow reassignment. Flows mediated over a recently failed slaves will be reassigned in a manner that respects the target allocation of the bond. An optional `balancePolicy` can be specified with the following effects: `flow-dynamic` (default) will hash flows onto slaves according to target allocation and may perform periodic re-assignments in order to preserve balance. `flow-static`, will hash flows onto slaves according to target allocation but will not re-assign flows unless a failure occurs or the slave is no longer operating within acceptable parameters. And lastly `packet` which simply load balances packets across slaves according to target allocation but with no concern for sequence reordering.
|
||||
Traffic is dynamically allocated and balanced across multiple links simultaneously according to the target allocation. Options allow for *packet* or *flow-based* processing, and active-flow reassignment. Flows mediated over a recently failed links will be reassigned in a manner that respects the target allocation of the bond. An optional `balancePolicy` can be specified with the following effects: `flow-dynamic` (default) will hash flows onto links according to target allocation and may perform periodic re-assignments in order to preserve balance. `flow-static`, will hash flows onto links according to target allocation but will not re-assign flows unless a failure occurs or the link is no longer operating within acceptable parameters. And lastly `packet` which simply load balances packets across links according to target allocation but with no concern for sequence reordering.
|
||||
|
||||
```
|
||||
{
|
||||
|
|
@ -187,21 +187,21 @@ Traffic is dynamically allocated and balanced across multiple slaves simultaneou
|
|||
}
|
||||
```
|
||||
|
||||
#### Link Quality
|
||||
#### Link quality
|
||||
|
||||
ZeroTier measures various properties of a link (such as latency, throughput, jitter, packet loss ratio, etc) in order to arrive at a quality estimate. This estimate is used by bonding policies to make allocation and failover decisions:
|
||||
|
||||
| Policy name | Role |
|
||||
|:---------------|:-----|
|
||||
|`active-backup` | Determines the order of the failover queue. And if `activeReselect=optimize` whether a new active slave is selected. |
|
||||
|`active-backup` | Determines the order of the failover queue. And if `activeReselect=optimize` whether a new active link is selected. |
|
||||
|`broadcast` | Does not use quality measurements. |
|
||||
|`balance-rr` | May trigger removal of slave from bond. |
|
||||
|`balance-xor` | May trigger removal of slave from bond. |
|
||||
|`balance-aware` | Informs flow assignments and (re-)assignments. May trigger removal of slave from bond. |
|
||||
|`balance-rr` | May trigger removal of link from bond. |
|
||||
|`balance-xor` | May trigger removal of link from bond. |
|
||||
|`balance-aware` | Informs flow assignments and (re-)assignments. May trigger removal of link from bond. |
|
||||
|
||||
A slave's eligibility for being included in a bond is dependent on more than perceived quality. If a path on a slave begins to exhibit disruptive behavior such as extremely high packet loss, corruption, or periodic inability to process traffic it will be removed from the bond, its traffic will be appropriately reallocated and it will be punished. Punishments gradually fade and a slave can be readmitted to the bond over time. However, punishments increase exponentially if applied more than once within a given window of time.
|
||||
A link's eligibility for being included in a bond is dependent on more than perceived quality. If a path on a link begins to exhibit disruptive behavior such as extremely high packet loss, corruption, or periodic inability to process traffic it will be removed from the bond, its traffic will be appropriately reallocated and it will be punished. Punishments gradually fade and a link can be readmitted to the bond over time. However, punishments increase exponentially if applied more than once within a given window of time.
|
||||
|
||||
#### Asymmetric Links
|
||||
#### Asymmetric links
|
||||
|
||||
In cases where it is necessary to bond physical links that vary radically in terms of cost, throughput, latency, and or reliability, there are a couple of ways to automatically (or manually) allocate traffic among them. Traffic distribution and balancing can be either `packet` or `flow` based. Where packet-based is suitable for protocols not susceptible to reordering penalties and flow-based is suitable for protocols such as TCP where it is desirable to keep a conversation on a single link unless we can't avoid having to re-assign it. Additionally, a *target allocation* of traffic used by the bonding policy can be derived/specified in the following ways:
|
||||
|
||||
|
|
@ -215,9 +215,6 @@ In cases where it is necessary to bond physical links that vary radically in ter
|
|||
"pdv": 0.3, /* Packet delay variance in milliseconds. Similar to jitter */
|
||||
"plr": 0.1, /* Packet loss ratio */
|
||||
"per": 0.1, /* Packet error ratio */
|
||||
"thr": 0.0, /* Mean throughput */
|
||||
"thm": 0.0, /* Maximum observed throughput */
|
||||
"thv": 0.0, /* Variance of throughput */
|
||||
"avl": 0.0, /* Availability */
|
||||
}
|
||||
}
|
||||
|
|
@ -225,24 +222,24 @@ In cases where it is necessary to bond physical links that vary radically in ter
|
|||
In the absence of user guidance ZeroTier will attempt to form an understanding of each link's speed and capacity but this value can be inaccurate if the links are not routinely saturated. Therefore we provide a way to explicitly signal the capacity of each link in terms of arbitrary but relative values:
|
||||
|
||||
```
|
||||
"slaves": {
|
||||
"links": {
|
||||
"eth0": { "speed": 10000 },
|
||||
"eth1": { "speed": 1000 },
|
||||
"eth2": { "speed": 100 }
|
||||
}
|
||||
```
|
||||
|
||||
The user specifies allocation percentages (totaling `1.0`). In this case quality measurements will only be used to determine a slave's eligibility to be a member of a bond, now how much traffic it will carry:
|
||||
The user specifies allocation percentages (totaling `1.0`). In this case quality measurements will only be used to determine a link's eligibility to be a member of a bond, now how much traffic it will carry:
|
||||
|
||||
```
|
||||
"slaves": {
|
||||
"links": {
|
||||
"eth0": { "alloc": 0.50 },
|
||||
"eth1": { "alloc": 0.25 },
|
||||
"eth2": { "alloc": 0.25 }
|
||||
}
|
||||
```
|
||||
|
||||
#### Performance and Overhead Considerations
|
||||
#### Performance and overhead considerations
|
||||
|
||||
- Only packets with internal IDs divisible by `16` are included in measurements, this amounts to about `6.25%` of all traffic.
|
||||
- `failoverInterval` specifies how quickly failover should occur during a link failure. In order to accomplish this a combination of active and passive measurement techniques are employed which may result in `VERB_HELLO` probes being sent every `failoverInterval / 4` time units. As a mitigation `monitorStrategy` may be set to `dynamic` so that probe frequency directly correlates with native application traffic.
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
#include "../osdep/Binder.hpp"
|
||||
#include "../osdep/ManagedRoute.hpp"
|
||||
#include "../osdep/BlockingQueue.hpp"
|
||||
#include "../osdep/Slave.hpp"
|
||||
#include "../osdep/Link.hpp"
|
||||
|
||||
#include "OneService.hpp"
|
||||
#include "SoftwareUpdater.hpp"
|
||||
|
|
@ -307,7 +307,7 @@ static void _peerBondToJson(nlohmann::json &pj,const ZT_Peer *peer)
|
|||
//j["ifname"] = peer->paths[i].ifname;
|
||||
pa.push_back(j);
|
||||
}
|
||||
pj["slaves"] = pa;
|
||||
pj["links"] = pa;
|
||||
}
|
||||
|
||||
static void _moonToJson(nlohmann::json &mj,const World &world)
|
||||
|
|
@ -1623,58 +1623,61 @@ public:
|
|||
newTemplateBond->setDownDelay(OSUtils::jsonInt(customPolicy["downDelay"],-1));
|
||||
newTemplateBond->setFlowRebalanceStrategy(OSUtils::jsonInt(customPolicy["flowRebalanceStrategy"],(uint64_t)0));
|
||||
newTemplateBond->setFailoverInterval(OSUtils::jsonInt(customPolicy["failoverInterval"],(uint64_t)0));
|
||||
newTemplateBond->setPacketsPerSlave(OSUtils::jsonInt(customPolicy["packetsPerSlave"],-1));
|
||||
std::string slaveMonitorStrategyStr(OSUtils::jsonString(customPolicy["slaveMonitorStrategy"],""));
|
||||
uint8_t slaveMonitorStrategy = ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_DEFAULT;
|
||||
if (slaveMonitorStrategyStr == "passive") { newTemplateBond->setSlaveMonitorStrategy(ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_PASSIVE); }
|
||||
if (slaveMonitorStrategyStr == "active") { newTemplateBond->setSlaveMonitorStrategy(ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_ACTIVE); }
|
||||
if (slaveMonitorStrategyStr == "dynamic") { newTemplateBond->setSlaveMonitorStrategy(ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_DYNAMIC); }
|
||||
// Policy-Specific slave set
|
||||
json &slaves = customPolicy["slaves"];
|
||||
for (json::iterator slaveItr = slaves.begin(); slaveItr != slaves.end();++slaveItr) {
|
||||
fprintf(stderr, "\t--- slave (%s)\n", slaveItr.key().c_str());
|
||||
std::string slaveNameStr(slaveItr.key());
|
||||
json &slave = slaveItr.value();
|
||||
newTemplateBond->setPacketsPerLink(OSUtils::jsonInt(customPolicy["packetsPerLink"],-1));
|
||||
|
||||
bool enabled = OSUtils::jsonInt(slave["enabled"],true);
|
||||
uint32_t speed = OSUtils::jsonInt(slave["speed"],0);
|
||||
float alloc = (float)OSUtils::jsonDouble(slave["alloc"],0);
|
||||
std::string linkMonitorStrategyStr(OSUtils::jsonString(customPolicy["linkMonitorStrategy"],""));
|
||||
uint8_t linkMonitorStrategy = ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_DEFAULT;
|
||||
if (linkMonitorStrategyStr == "passive") { linkMonitorStrategy = ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_PASSIVE; }
|
||||
if (linkMonitorStrategyStr == "active") { linkMonitorStrategy = ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_ACTIVE; }
|
||||
if (linkMonitorStrategyStr == "dynamic") { linkMonitorStrategy = ZT_MULTIPATH_SLAVE_MONITOR_STRATEGY_DYNAMIC; }
|
||||
newTemplateBond->setLinkMonitorStrategy(linkMonitorStrategy);
|
||||
|
||||
// Policy-Specific link set
|
||||
json &links = customPolicy["links"];
|
||||
for (json::iterator linkItr = links.begin(); linkItr != links.end();++linkItr) {
|
||||
fprintf(stderr, "\t--- link (%s)\n", linkItr.key().c_str());
|
||||
std::string linkNameStr(linkItr.key());
|
||||
json &link = linkItr.value();
|
||||
|
||||
bool enabled = OSUtils::jsonInt(link["enabled"],true);
|
||||
uint32_t speed = OSUtils::jsonInt(link["speed"],0);
|
||||
float alloc = (float)OSUtils::jsonDouble(link["alloc"],0);
|
||||
|
||||
if (speed && alloc) {
|
||||
fprintf(stderr, "error: cannot specify both speed (%d) and alloc (%f) for slave (%s), pick one, slave disabled.\n",
|
||||
speed, alloc, slaveNameStr.c_str());
|
||||
fprintf(stderr, "error: cannot specify both speed (%d) and alloc (%f) for link (%s), pick one, link disabled.\n",
|
||||
speed, alloc, linkNameStr.c_str());
|
||||
enabled = false;
|
||||
}
|
||||
uint32_t upDelay = OSUtils::jsonInt(slave["upDelay"],-1);
|
||||
uint32_t downDelay = OSUtils::jsonInt(slave["downDelay"],-1);
|
||||
uint8_t ipvPref = OSUtils::jsonInt(slave["ipvPref"],0);
|
||||
uint32_t slaveMonitorInterval = OSUtils::jsonInt(slave["monitorInterval"],(uint64_t)0);
|
||||
std::string failoverToStr(OSUtils::jsonString(slave["failoverTo"],""));
|
||||
uint32_t upDelay = OSUtils::jsonInt(link["upDelay"],-1);
|
||||
uint32_t downDelay = OSUtils::jsonInt(link["downDelay"],-1);
|
||||
uint8_t ipvPref = OSUtils::jsonInt(link["ipvPref"],0);
|
||||
uint32_t linkMonitorInterval = OSUtils::jsonInt(link["monitorInterval"],(uint64_t)0);
|
||||
std::string failoverToStr(OSUtils::jsonString(link["failoverTo"],""));
|
||||
// Mode
|
||||
std::string slaveModeStr(OSUtils::jsonString(slave["mode"],"spare"));
|
||||
uint8_t slaveMode = ZT_MULTIPATH_SLAVE_MODE_SPARE;
|
||||
if (slaveModeStr == "primary") { slaveMode = ZT_MULTIPATH_SLAVE_MODE_PRIMARY; }
|
||||
if (slaveModeStr == "spare") { slaveMode = ZT_MULTIPATH_SLAVE_MODE_SPARE; }
|
||||
std::string linkModeStr(OSUtils::jsonString(link["mode"],"spare"));
|
||||
uint8_t linkMode = ZT_MULTIPATH_SLAVE_MODE_SPARE;
|
||||
if (linkModeStr == "primary") { linkMode = ZT_MULTIPATH_SLAVE_MODE_PRIMARY; }
|
||||
if (linkModeStr == "spare") { linkMode = ZT_MULTIPATH_SLAVE_MODE_SPARE; }
|
||||
// ipvPref
|
||||
if ((ipvPref != 0) && (ipvPref != 4) && (ipvPref != 6) && (ipvPref != 46) && (ipvPref != 64)) {
|
||||
fprintf(stderr, "error: invalid ipvPref value (%d), slave disabled.\n", ipvPref);
|
||||
fprintf(stderr, "error: invalid ipvPref value (%d), link disabled.\n", ipvPref);
|
||||
enabled = false;
|
||||
}
|
||||
if (slaveMode == ZT_MULTIPATH_SLAVE_MODE_SPARE && failoverToStr.length()) {
|
||||
fprintf(stderr, "error: cannot specify failover slaves for spares, slave disabled.\n");
|
||||
if (linkMode == ZT_MULTIPATH_SLAVE_MODE_SPARE && failoverToStr.length()) {
|
||||
fprintf(stderr, "error: cannot specify failover links for spares, link disabled.\n");
|
||||
failoverToStr = "";
|
||||
enabled = false;
|
||||
}
|
||||
_node->bondController()->addCustomSlave(customPolicyStr, new Slave(slaveNameStr,ipvPref,speed,slaveMonitorInterval,upDelay,downDelay,enabled,slaveMode,failoverToStr,alloc));
|
||||
_node->bondController()->addCustomLink(customPolicyStr, new Link(linkNameStr,ipvPref,speed,linkMonitorInterval,upDelay,downDelay,enabled,linkMode,failoverToStr,alloc));
|
||||
}
|
||||
// TODO: This is dumb
|
||||
std::string slaveSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"optimize"));
|
||||
if (slaveSelectMethodStr == "always") { newTemplateBond->setSlaveSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_ALWAYS); }
|
||||
if (slaveSelectMethodStr == "better") { newTemplateBond->setSlaveSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_BETTER); }
|
||||
if (slaveSelectMethodStr == "failure") { newTemplateBond->setSlaveSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_FAILURE); }
|
||||
if (slaveSelectMethodStr == "optimize") { newTemplateBond->setSlaveSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_OPTIMIZE); }
|
||||
if (newTemplateBond->getSlaveSelectMethod() < 0 || newTemplateBond->getSlaveSelectMethod() > 3) {
|
||||
fprintf(stderr, "warning: invalid value (%s) for slaveSelectMethod, assuming mode: always\n", slaveSelectMethodStr.c_str());
|
||||
std::string linkSelectMethodStr(OSUtils::jsonString(customPolicy["activeReselect"],"optimize"));
|
||||
if (linkSelectMethodStr == "always") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_ALWAYS); }
|
||||
if (linkSelectMethodStr == "better") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_BETTER); }
|
||||
if (linkSelectMethodStr == "failure") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_FAILURE); }
|
||||
if (linkSelectMethodStr == "optimize") { newTemplateBond->setLinkSelectMethod(ZT_MULTIPATH_RESELECTION_POLICY_OPTIMIZE); }
|
||||
if (newTemplateBond->getLinkSelectMethod() < 0 || newTemplateBond->getLinkSelectMethod() > 3) {
|
||||
fprintf(stderr, "warning: invalid value (%s) for linkSelectMethod, assuming mode: always\n", linkSelectMethodStr.c_str());
|
||||
}
|
||||
/*
|
||||
newBond->setPolicy(_node->bondController()->getPolicyCodeByStr(basePolicyStr));
|
||||
|
|
@ -1693,7 +1696,7 @@ public:
|
|||
}
|
||||
// Check settings
|
||||
if (defaultBondingPolicyStr.length() && !defaultBondingPolicy && !_node->bondController()->inUse()) {
|
||||
fprintf(stderr, "error: unknown policy (%s) specified by defaultBondingPolicy, slave disabled.\n", defaultBondingPolicyStr.c_str());
|
||||
fprintf(stderr, "error: unknown policy (%s) specified by defaultBondingPolicy, link disabled.\n", defaultBondingPolicyStr.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue