Skip to content

Network: set default value for duplicate and corrupt action && fix partition #115

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

Merged
ti-chi-bot merged 3 commits into from
Dec 22, 2021
Merged

Network: set default value for duplicate and corrupt action && fix partition #115

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
9cdc94e
add default value
WangXiangUSTC Dec 20, 2021
32eec58
set default value for corrupt
WangXiangUSTC Dec 20, 2021
4c52ed1
fix partition
WangXiangUSTC Dec 20, 2021
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
16 changes: 16 additions & 0 deletions pkg/core/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ func (n *NetworkCommand) CompleteDefaults() {
n.setDefaultForNetworkLoss()
case NetworkDNSAction:
n.setDefaultForNetworkDNS()
case NetworkDuplicateAction:
n.setDefaultForNetworkDuplicate()
case NetworkCorruptAction:
n.setDefaultForNetworkCorrupt()
}
}

Expand All @@ -230,6 +234,18 @@ func (n *NetworkCommand) setDefaultForNetworkLoss() {
}
}

func (n *NetworkCommand) setDefaultForNetworkDuplicate() {
if len(n.Correlation) == 0 {
n.Correlation = "0"
}
}

func (n *NetworkCommand) setDefaultForNetworkCorrupt() {
if len(n.Correlation) == 0 {
n.Correlation = "0"
}
}

func (n *NetworkCommand) setDefaultForNetworkDNS() {
if len(n.DNSServer) == 0 {
n.DNSServer = "123.123.123.123"
Expand Down
2 changes: 1 addition & 1 deletion pkg/core/network_rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ func toNetem(spec *TcParameter) (*pb.Netem, error) {
for _, spec := range emSpecs {
em, err := spec.ToNetem()
if err != nil {
return nil, err
return nil, errors.WithStack(err)
}
merged = mergeNetem(merged, em)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/chaosd/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (networkAttack) Attack(options core.AttackConfig, env Environment) (err err
case core.NetworkPortOccupiedAction:
return env.Chaos.applyPortOccupied(attack)

case core.NetworkDelayAction, core.NetworkLossAction, core.NetworkCorruptAction, core.NetworkDuplicateAction, core.NetworkBandwidthAction:
case core.NetworkDelayAction, core.NetworkLossAction, core.NetworkCorruptAction, core.NetworkDuplicateAction, core.NetworkBandwidthAction, core.NetworkPartitionAction:
if attack.NeedApplyIPSet() {
ipsetName, err = env.Chaos.applyIPSet(attack, env.AttackUid)
if err != nil {
Expand Down