Skip to content
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

Jump to bottom

Optimize specifing port range with binary mask #153

Merged
merged 27 commits into from
Jul 15, 2023
Merged

Optimize specifing port range with binary mask #153

merged 27 commits into from
Jul 15, 2023

Conversation

hengyoush
Copy link
Contributor

@hengyoush hengyoush commented May 7, 2023 •
edited
Loading

for issue chaosblade-io/chaosblade#885
主要改动如下:

  1. 增加buildMaskForRange函数, 计算表达给定整数区间的掩码.
  2. 端口等参数采用区间列表的形式, 方便计算掩码
  3. 增加TestBuildMaskForRange测试, 用于验证buildMaskForRange函数的正确性

@hengyoush hengyoush force-pushed the feature-tc-mask branch 2 times, most recently from 3781ff3 to ca6277c Compare May 10, 2023 15:28
@tiny-x tiny-x added this to the v1.7.2 milestone May 11, 2023
@tiny-x tiny-x added the type/enhancement New feature or request label May 11, 2023
@tiny-x tiny-x requested a review from MandssS May 11, 2023 06:28
MandssS
MandssS reviewed May 15, 2023
View reviewed changes
exec/network/tc/network_tc.go Outdated
`%s && \
tc filter add dev %s parent 1: prio 4 protocol ip u32 match ip dport %s 0xffff flowid 1:4 && \
tc filter add dev %s parent 1: prio 4 protocol ip u32 match ip sport %s 0xffff flowid 1:4`,
args, netInterface, port, netInterface, port)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里port从哪来的？

Copy link
Contributor Author

@hengyoush hengyoush May 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done
和其他提交的代码冲突了(#149)

MandssS
MandssS reviewed May 15, 2023
View reviewed changes
exec/network/tc/network_tc.go
`%s && \
tc filter add dev %s parent 1: prio 4 protocol ip u32 match ip dport %s 0xffff flowid 1:4 && \
tc filter add dev %s parent 1: prio 4 protocol ip u32 match ip sport %s 0xffff flowid 1:4`,
args, netInterface, port, netInterface, port)
}
return args
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

少了一个 }

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

MandssS and others added 23 commits May 15, 2023 22:52
@MandssS @hengyoush
update verison from 1.6.0 to 1.6.1
8b043c0 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@tiny-x @hengyoush
fix: pod mem exp.
afd5a1e 
Signed-off-by: tiny-x <xf.yefei@gmail.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@Icesource @hengyoush
feat: add time travel experiment
557bafa 
Signed-off-by: Icesource <gonghuajian.ghj@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@edisonX-sudo @hengyoush
feature: made process kill and stop support --pid flag
d1ae2b1 
in some occasion, we still need to kill or stop process by declaring a specified pid explicitly

Signed-off-by: xushunke <387617982@qq.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@MandssS @hengyoush
update version to 1.7.0
e10d9a2 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@MandssS @hengyoush
fix bug: time travel example, cant support uint d duration
7baf504 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@binbin0325 @hengyoush
move file backup
3e49d17 
Signed-off-by: binbin0325 <binbin0325@apache.org>
Signed-off-by: hengyoush <hengyoush1@163.com>
@chengaolin123 @hengyoush
feature: Add tc protocol filter
b9f10d1 
Signed-off-by: chengaolin123 <chengaolin@njzfit.cn>
Signed-off-by: hengyoush <hengyoush1@163.com>
@chengaolin123 @hengyoush
feature: Add tc test file
13dd98c 
Signed-off-by: chengaolin123 <chengaolin@njzfit.cn>
Signed-off-by: hengyoush <hengyoush1@163.com>
@Forestls430 @hengyoush
feature:add multi pid parse
d338c84 
Signed-off-by: Forestls430 <linsen@njzfit.cn>
Signed-off-by: hengyoush <hengyoush1@163.com>
@linsen430 @hengyoush
feature:add multi pid parse(no need if else)
eb7e68c 
Signed-off-by: linsen <linsen430@163.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@Super-long @tiny-x @hengyoush
fix: Change the value pass in slope to a reference pass. (chaosblade-…
28c0b16 
…io#116)

Signed-off-by: Super-long <0x4f4f4f4f@gmail.com>
Co-authored-by: tiny-x <xf.yefei@gmail.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@xxm404 @hengyoush
Fix variable name error, from precpu to percpu.
ec7f86a 
Signed-off-by: xinmian <xinmian404@163.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@MandssS @hengyoush
update version to 1.7.1
ebb2c8a 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@MandssS @hengyoush
update chaosblade-spec-go tag
4049751 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush
Optimize specifing port range with binary mask
9804b90 
Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush
add test for buildMaskForRange
cc77e02 
Signed-off-by: hengyoush <hengyoush1@163.com>
@dependabot @hengyoush
chore(deps): bump golang.org/x/crypto
fae5e16 
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20210711020723-a769d52b0f97 to 0.1.0.
- [Release notes](https://github.com/golang/crypto/releases)
- [Commits](https://github.com/golang/crypto/commits/v0.1.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@Yuaninga @hengyoush
fix: failed to create the systemd experiment
5cd86a6 
Signed-off-by: Yuaninga <1846225041@qq.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush
'resolve confict with https://github.com/chaosblade-io/chaosblade-exe…
107c90b 
…c-os/pull/149/files

Signed-off-by: hengyoush <hengyoush1@163.com>
@lengdanran @hengyoush
fix: Remove unused import pkg path
965ff0b 
Signed-off-by: lengdanran <lengdanran@126.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush
fix file chmod bug
51f7265 
Signed-off-by: hengyoush <hengyoush1@163.com>
@lengdanran @hengyoush
feature: Add dns down
869c823 
Signed-off-by: lengdanran <lengdanran@126.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
MandssS and others added 3 commits May 15, 2023 22:55
@MandssS @hengyoush
update version to 1.7.1
024a5d3 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@MandssS @hengyoush
update chaosblade-spec-go tag
e2efe7c 
Signed-off-by: caimingxia <mingshao.cmx@alibaba-inc.com>
Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush
Signed-off-by: hengyoush <hengyoush1@163.com>
02c499a 
resolve conflict

Signed-off-by: hengyoush <hengyoush1@163.com>
@hengyoush hengyoush requested a review from MandssS May 16, 2023 03:36
@MandssS MandssS modified the milestones: v1.7.2, v1.7.3 Jun 15, 2023
binbin0325
binbin0325 reviewed Jun 29, 2023
View reviewed changes
Copy link
Member

@binbin0325 binbin0325 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ip has the same problem (too long parameters), is there a solution similar to port?

@hengyoush
Copy link
Contributor Author

hengyoush commented Jul 4, 2023 •
edited
Loading

ip has the same problem (too long parameters), is there a solution similar to port?

For ip we can use subnet mask?

@MandssS MandssS merged commit 041a22c into chaosblade-io:master Jul 15, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@binbin0325 binbin0325 binbin0325 left review comments

@MandssS MandssS MandssS approved these changes

Assignees
No one assigned
Labels
type/enhancement New feature or request
Projects
None yet
Milestone
v1.7.3