Skip to content

Commit dc87053

Browse files
committed
qa: Change default erasure code profile from jerasure to isa
Signed-off-by: Jamie Pryde <[email protected]>
1 parent 753a8ff commit dc87053

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

qa/standalone/erasure-code/test-erasure-code-plugins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ case $arch in
1414
aarch64*|arm*)
1515
legacy_jerasure_plugins=(jerasure_generic jerasure_neon)
1616
legacy_shec_plugins=(shec_generic shec_neon)
17-
plugins=(jerasure shec lrc)
17+
plugins=(jerasure shec lrc isa)
1818
;;
1919
*)
2020
echo "unsupported platform ${arch}."

qa/standalone/mon/osd-erasure-code-profile.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ function TEST_set() {
4646
#
4747
ceph osd erasure-code-profile set $profile 2>&1 || return 1
4848
ceph osd erasure-code-profile get $profile | \
49-
grep plugin=jerasure || return 1
49+
grep plugin=isa || return 1
5050
ceph osd erasure-code-profile rm $profile
5151
#
5252
# key=value pairs override the default
5353
#
5454
ceph osd erasure-code-profile set $profile \
55-
key=value plugin=isa || return 1
55+
key=value plugin=jerasure || return 1
5656
ceph osd erasure-code-profile get $profile | \
57-
grep -e key=value -e plugin=isa || return 1
57+
grep -e key=value -e plugin=jerasure || return 1
5858
#
5959
# --force is required to override an existing profile
6060
#
@@ -115,9 +115,9 @@ function TEST_get() {
115115

116116
local default_profile=default
117117
ceph osd erasure-code-profile get $default_profile | \
118-
grep plugin=jerasure || return 1
118+
grep plugin=isa || return 1
119119
ceph --format xml osd erasure-code-profile get $default_profile | \
120-
grep '<plugin>jerasure</plugin>' || return 1
120+
grep '<plugin>isa</plugin>' || return 1
121121
! ceph osd erasure-code-profile get WRONG > $dir/out 2>&1 || return 1
122122
grep -q "unknown erasure code profile 'WRONG'" $dir/out || return 1
123123
}

qa/standalone/mon/osd-pool-create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function TEST_erasure_crush_stripe_unit_padded() {
9999
local dir=$1
100100
# setting osd_pool_erasure_code_stripe_unit modifies the stripe_width
101101
# and it is padded as required by the default plugin
102-
profile+=" plugin=jerasure"
102+
profile+=" plugin=isa"
103103
profile+=" technique=reed_sol_van"
104104
k=4
105105
profile+=" k=$k"

qa/tasks/ceph.conf.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
mon_warn_on_pool_no_redundancy = false
3333
mon_allow_pool_size_one = true
3434

35-
osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
35+
osd pool default erasure code profile = "plugin=isa technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
3636

3737
osd default data pool replay window = 5
3838

qa/tasks/cephadm.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mon clock drift allowed = 1.000
1111
# replicate across OSDs, not hosts
1212
osd crush chooseleaf type = 0
1313
#osd pool default size = 2
14-
osd pool default erasure code profile = "plugin=jerasure technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
14+
osd pool default erasure code profile = "plugin=isa technique=reed_sol_van k=2 m=1 crush-failure-domain=osd"
1515

1616
# enable some debugging
1717
auth debug = true

qa/tasks/mgr/dashboard/test_erasure_code_profile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_list(self):
4141
'technique': 'reed_sol_van',
4242
'm': 1,
4343
'name': 'default',
44-
'plugin': 'jerasure'
44+
'plugin': 'isa'
4545
}
4646
if 'crush-failure-domain' in default[0]:
4747
default_ecp['crush-failure-domain'] = default[0]['crush-failure-domain']
@@ -59,11 +59,10 @@ def test_create(self):
5959
'crush-device-class': '',
6060
'crush-failure-domain': 'osd',
6161
'crush-root': 'default',
62-
'jerasure-per-chunk-alignment': 'false',
6362
'k': 3,
6463
'm': 2,
6564
'name': 'ecp32',
66-
'plugin': 'jerasure',
65+
'plugin': 'isa',
6766
'technique': 'reed_sol_van',
6867
})
6968

0 commit comments

Comments
 (0)