From 394dccc958c5bf248c5d25b90e3a10e5545e11d2 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Sun, 9 Mar 2014 07:22:26 -0700 Subject: [PATCH] Mark hash_replicas as experimental This feature was not completed during Icehouse. Change the config option default to '1' and mark it as experimental. Change-Id: I6bcf10d6518d367d637776b8f33f24070863505e --- etc/ironic/ironic.conf.sample | 13 +++++++------ ironic/common/hash_ring.py | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 80a67829ef..3689f51043 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -39,12 +39,13 @@ # partitions is (2^hash_partition_exponent). (integer value) #hash_partition_exponent=16 -# Number of hosts to map onto each hash partition. Setting -# this to more than one will cause additional conductor -# services to prepare deployment environments and potentially -# allow the Ironic cluster to recover more quickly if a -# conductor instance is terminated. (integer value) -#hash_distribution_replicas=2 +# [Experimental Feature] Number of hosts to map onto each hash +# partition. Setting this to more than one will cause +# additional conductor services to prepare deployment +# environments and potentially allow the Ironic cluster to +# recover more quickly if a conductor instance is terminated. +# (integer value) +#hash_distribution_replicas=1 # diff --git a/ironic/common/hash_ring.py b/ironic/common/hash_ring.py index 74bb2c7f3d..bfae5c3d04 100644 --- a/ironic/common/hash_ring.py +++ b/ironic/common/hash_ring.py @@ -30,8 +30,9 @@ hash_opts = [ 'load when rebalancing the ring, but more memory usage. ' 'Number of partitions is (2^hash_partition_exponent).'), cfg.IntOpt('hash_distribution_replicas', - default=2, - help='Number of hosts to map onto each hash partition. ' + default=1, + help='[Experimental Feature] ' + 'Number of hosts to map onto each hash partition. ' 'Setting this to more than one will cause additional ' 'conductor services to prepare deployment environments ' 'and potentially allow the Ironic cluster to recover '