Skip to content

Commit 84a42f7

Browse files
authored
Merge pull request ceph#56336 from pritha-srivastava/wip-rgw-d4n-next
Wip rgw d4n next
2 parents ff2d2a2 + a7166eb commit 84a42f7

26 files changed

+9694
-1538
lines changed

qa/suites/rgw/d4n/tasks/rgw_d4ntests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ tasks:
1313
client.0:
1414
- sudo chmod 0777 /var/lib/ceph
1515
- sudo chmod 0777 /var/lib/ceph/radosgw
16-
- d4ntests:
17-
client.0:
1816
- workunit:
1917
clients:
2018
client.0:

qa/tasks/d4ntests.py

Lines changed: 0 additions & 109 deletions
This file was deleted.

qa/workunits/rgw/run-d4n.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ pip install redis
99
pip install configobj
1010
pip install boto3
1111

12+
# create user
13+
radosgw-admin user create --uid=test3 --display-name=test3 --access-key=test3 --secret-key=test3 2>/dev/null
14+
1215
# run test
1316
$mydir/bin/python3 $mydir/test_rgw_d4n.py
1417

src/common/options/rgw.yaml.in

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3821,6 +3821,18 @@ options:
38213821
services:
38223822
- rgw
38233823
with_legacy: true
3824+
- name: rgw_d4n_l1_write_open_flags
3825+
type: uint
3826+
level: advanced
3827+
desc: cache files write 'man 2 open' 'file status flags' modifiers
3828+
long_desc: For example, to configure synchronized I/O, fcntl-linux.h defines (converted from octal)
3829+
O_SYNC = 1052672
3830+
O_DSYNC = 4096
3831+
(0 for no modification of the flags)
3832+
default: 1052672
3833+
services:
3834+
- rgw
3835+
with_legacy: true
38243836
- name: rgw_d4n_libaio_aio_threads
38253837
type: int
38263838
level: advanced
@@ -3859,6 +3871,18 @@ options:
38593871
default: 60
38603872
services:
38613873
- rgw
3874+
flags:
3875+
- startup
3876+
with_legacy: true
3877+
- name: d4n_writecache_enabled
3878+
type: bool
3879+
level: advanced
3880+
desc: The d4n write cache
3881+
default: false
3882+
services:
3883+
- rgw
3884+
flags:
3885+
- startup
38623886
with_legacy: true
38633887
- name: rgw_backend_store
38643888
type: str
@@ -4123,6 +4147,16 @@ options:
41234147
flags:
41244148
- startup
41254149
with_legacy: true
4150+
- name: rgw_d4n_cache_cleaning_interval
4151+
type: int
4152+
level: advanced
4153+
desc: This is the interval in seconds for invoking write cache cleaning process
4154+
default: 1000
4155+
services:
4156+
- rgw
4157+
flags:
4158+
- startup
4159+
with_legacy: true
41264160
- name: rgw_topic_persistency_time_to_live
41274161
type: uint
41284162
level: advanced
@@ -4304,4 +4338,14 @@ options:
43044338
flags:
43054339
- startup
43064340
see_also:
4307-
with_legacy: true
4341+
with_legacy: true
4342+
- name: rgw_d4n_backend_address
4343+
type: str
4344+
level: advanced
4345+
desc: The backend address used by D4N cache
4346+
default: 127.0.0.1:6379
4347+
services:
4348+
- rgw
4349+
flags:
4350+
- startup
4351+
with_legacy: true

0 commit comments

Comments
 (0)