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

octopus: mon: calculate min_size on osd pool set size #34528

Merged
merged 2 commits into from May 7, 2020
Merged

octopus: mon: calculate min_size on osd pool set size #34528

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
a95a070
mon: calculate min_size on osd pool set size
Apr 1, 2020
d2ae92c
qa/workunits/mon: add check for min_size
Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 38 additions & 0 deletions qa/workunits/mon/pool_ops.sh
View file
Open in desktop
Expand Up @@ -8,6 +8,41 @@ function expect_false()
if "$@"; then return 1; else return 0; fi
}

function get_config_value_or_die()
{
local pool_name config_opt raw val

pool_name=$1
config_opt=$2

raw="`$SUDO ceph osd pool get $pool_name $config_opt 2>/dev/null`"
if [[ $? -ne 0 ]]; then
echo "error obtaining config opt '$config_opt' from '$pool_name': $raw"
exit 1
fi

raw=`echo $raw | sed -e 's/[{} "]//g'`
val=`echo $raw | cut -f2 -d:`

echo "$val"
return 0
}

function expect_config_value()
{
local pool_name config_opt expected_val val
pool_name=$1
config_opt=$2
expected_val=$3

val=$(get_config_value_or_die $pool_name $config_opt)

if [[ "$val" != "$expected_val" ]]; then
echo "expected '$expected_val', got '$val'"
exit 1
fi
}

# note: we need to pass the other args or ceph_argparse.py will take
# 'invalid' that is not replicated|erasure and assume it is the next
# argument, which is a string.
Expand All @@ -20,8 +55,11 @@ ceph osd pool create foooo 123
ceph osd pool create foo 123 # idempotent

ceph osd pool set foo size 1
expect_config_value "foo" "min_size" 1
ceph osd pool set foo size 4
expect_config_value "foo" "min_size" 2
ceph osd pool set foo size 10
expect_config_value "foo" "min_size" 5
expect_false ceph osd pool set foo size 0
expect_false ceph osd pool set foo size 20

Expand Down
3 changes: 1 addition & 2 deletions src/mon/OSDMonitor.cc
View file
Open in desktop
Expand Up @@ -7937,8 +7937,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap,
return r;
}
p.size = n;
if (n < p.min_size)
p.min_size = n;
p.min_size = g_conf().get_osd_pool_default_min_size(p.size);
} else if (var == "min_size") {
if (p.has_flag(pg_pool_t::FLAG_NOSIZECHANGE)) {
ss << "pool min size change is disabled; you must unset nosizechange flag for the pool first";
Expand Down