better force_default_on_freeze support for slave

This commit is contained in:
2018-02-07 21:39:16 +01:00
parent 821f36ea65
commit d4cf1faff8
2 changed files with 63 additions and 3 deletions

View File

@ -74,8 +74,13 @@ class CacheOptionDescription(BaseOption):
else:
option._set_readonly()
is_multi = option.impl_is_multi()
if not option.impl_is_symlinkoption() and 'force_store_value' in option.impl_getproperties():
force_store_values.append((subpath, option))
if not option.impl_is_symlinkoption():
if 'force_store_value' in option.impl_getproperties():
force_store_values.append((subpath, option))
if 'force_default_on_freeze' in option.impl_getproperties() and \
option.impl_is_master_slaves('master'):
raise ConfigError(_('a master ({0}) cannot have '
'force_default_on_freeze property').format(subpath))
for cons_id, func, all_cons_opts, params in option.get_consistencies():
option._valid_consistencies(all_cons_opts[1:], init=False)
if func not in ALLOWED_CONST_LIST and is_multi: