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

Backport for release1.2 #444

Merged
merged 2 commits into from
Jul 20, 2021
Merged

Backport for release1.2 #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c27774c
client/chunkserver/curve-nbd: support 512 aligned IO requests
wu-hanqing Jun 23, 2021
b9dd1dc
nebd: support different instance for different user
wu-hanqing Jun 24, 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
2 changes: 2 additions & 0 deletions conf/chunkserver.conf.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ global.chunk_size=16777216
global.meta_page_size=4096
# clone chunk允许的最长location长度
global.location_limit=3000
# minimum alignment for io request
global.min_io_alignment=512

#
# MDS settings
Expand Down
7 changes: 7 additions & 0 deletions conf/client.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@ global.metricDummyServerStartPort=9000

# 是否关闭健康检查: true/关闭 false/不关闭
global.turnOffHealthCheck=true

##### alignment #####
# default alignment
global.alignment.commonVolume=512
# alignment for clone volume
# default is 4096, because lazy clone chunk bitmap granularity is 4096
global.alignment.cloneVolume=4096
7 changes: 7 additions & 0 deletions conf/cs_client.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@ global.metricDummyServerStartPort=9000
# session map文件，存储打开文件的filename到path的映射
#
global.sessionMapPath=./session_map.json

##### alignment #####
# default alignment
global.alignment.commonVolume=512
# alignment for clone volume
# default is 4096, because lazy clone chunk bitmap granularity is 4096
global.alignment.cloneVolume=4096
7 changes: 7 additions & 0 deletions conf/py_client.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,3 +136,10 @@ global.metricDummyServerStartPort=10000
# session map文件，存储打开文件的filename到path的映射
#
global.sessionMapPath=./session_map.json

##### alignment #####
# default alignment
global.alignment.commonVolume=512
# alignment for clone volume
# default is 4096, because lazy clone chunk bitmap granularity is 4096
global.alignment.cloneVolume=4096
7 changes: 7 additions & 0 deletions conf/snap_client.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,3 +142,10 @@ global.metricDummyServerStartPort=9000
# session map文件，存储打开文件的filename到path的映射
#
global.sessionMapPath=./session_map.json

##### alignment #####
# default alignment
global.alignment.commonVolume=512
# alignment for clone volume
# default is 4096, because lazy clone chunk bitmap granularity is 4096
global.alignment.cloneVolume=4096
3 changes: 3 additions & 0 deletions curve-ansible/roles/generate_config/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ chunkserver_walfilepool_retry_times: 5
chunkserver_trash_expire_after_sec: 300
chunkserver_trash_scan_period_sec: 120
chunkserver_common_log_dir: ./runlog/
chunkserver_min_io_alignment: 512

# 快照克隆配置默认值
snap_client_config_path: /etc/curve/snap_client.conf
Expand Down Expand Up @@ -205,6 +206,8 @@ client_turn_off_health_check: true
client_session_map_path: ./session_map.json
client_closefd_timeout_sec: 300
client_closefd_time_interval_sec: 600
client_alignment_common: 512
client_alignment_clone: 4096

# nebd默认配置
client_config_path: /etc/curve/client.conf
Expand Down
2 changes: 2 additions & 0 deletions curve-ansible/roles/generate_config/templates/chunkserver.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ global.chunk_size={{ chunk_size }}
global.meta_page_size={{ chunkserver_meta_page_size }}
# clone chunk允许的最长location长度
global.location_limit={{ chunkserver_location_limit }}
# minimum alignment for io request
global.min_io_alignment={{ chunkserver_min_io_alignment }}

#
# MDS settings
Expand Down
7 changes: 7 additions & 0 deletions curve-ansible/roles/generate_config/templates/client.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,3 +153,10 @@ global.turnOffHealthCheck={{ client_turn_off_health_check }}
# session map文件，存储打开文件的filename到path的映射
#
global.sessionMapPath={{ client_session_map_path }}

##### alignment #####
# default alignment
global.alignment.commonVolume={{ client_alignment_common }}
# alignment for clone volume
# default is 4096, because lazy clone chunk bitmap granularity is 4096
global.alignment.cloneVolume={{ client_alignment_clone }}
Loading