openstack
/
charms.ceph
Code Issues Proposed changes

Update default CRUSH algorithm to straw2 

straw2 has been the default CRUSH algorithm since hammer
and Ubuntu Xenial ships with Jewel, meaning that straw2
is the default in all current LTS releases.

Change-Id: I6fa4072eb33d763aca5721ee9fdd30b60d468a44
Closes-Bug: #1836092
This commit is contained in:
Chris MacNaughton 2019-07-11 08:00:06 +02:00
parent f29aba7672
commit 5f095b59cd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph/crush_utils.py
View File

@ -24,7 +24,7 @@ from charmhelpers.core.hookenv import (
CRUSH_BUCKET = """root {name} {{ CRUSH_BUCKET = """root {name} {{
id {id} # do not change unnecessarily id {id} # do not change unnecessarily
# weight 0.000 # weight 0.000
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
}} }}

22
unit_tests/test_crush_utils.py
View File

@ -70,7 +70,7 @@ host ip-172-31-30-0 {
root default { root default {
id -1 # do not change unnecessarily id -1 # do not change unnecessarily
# weight 0.009 # weight 0.009
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item ip-172-31-33-152 weight 0.003 item ip-172-31-33-152 weight 0.003
item ip-172-31-54-117 weight 0.003 item ip-172-31-54-117 weight 0.003
@ -120,28 +120,28 @@ type 10 root
host ip-172-31-33-152 { host ip-172-31-33-152 {
id -2 # do not change unnecessarily id -2 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.0 weight 0.003 item osd.0 weight 0.003
} }
host ip-172-31-54-117 { host ip-172-31-54-117 {
id -3 # do not change unnecessarily id -3 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.1 weight 0.003 item osd.1 weight 0.003
} }
host ip-172-31-30-0 { host ip-172-31-30-0 {
id -4 # do not change unnecessarily id -4 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.2 weight 0.003 item osd.2 weight 0.003
} }
root default { root default {
id -1 # do not change unnecessarily id -1 # do not change unnecessarily
# weight 0.009 # weight 0.009
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item ip-172-31-33-152 weight 0.003 item ip-172-31-33-152 weight 0.003
item ip-172-31-54-117 weight 0.003 item ip-172-31-54-117 weight 0.003
@ -191,28 +191,28 @@ type 10 root
host ip-172-31-33-152 { host ip-172-31-33-152 {
id -2 # do not change unnecessarily id -2 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.0 weight 0.003 item osd.0 weight 0.003
} }
host ip-172-31-54-117 { host ip-172-31-54-117 {
id -3 # do not change unnecessarily id -3 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.1 weight 0.003 item osd.1 weight 0.003
} }
host ip-172-31-30-0 { host ip-172-31-30-0 {
id -4 # do not change unnecessarily id -4 # do not change unnecessarily
# weight 0.003 # weight 0.003
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item osd.2 weight 0.003 item osd.2 weight 0.003
} }
root default { root default {
id -1 # do not change unnecessarily id -1 # do not change unnecessarily
# weight 0.009 # weight 0.009
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
item ip-172-31-33-152 weight 0.003 item ip-172-31-33-152 weight 0.003
item ip-172-31-54-117 weight 0.003 item ip-172-31-54-117 weight 0.003
@ -235,7 +235,7 @@ rule replicated_ruleset {
root test { root test {
id -5 # do not change unnecessarily id -5 # do not change unnecessarily
# weight 0.000 # weight 0.000
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
} }
@ -253,7 +253,7 @@ rule test {
CRUSHMAP4 = """root fast { CRUSHMAP4 = """root fast {
id -21 # do not change unnecessarily id -21 # do not change unnecessarily
# weight 0.000 # weight 0.000
alg straw alg straw2
hash 0 # rjenkins1 hash 0 # rjenkins1
} }