saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make server_id consistent on Python 3

Browse source 
Hashing is randomized using a random seed on Python >= 3.3. This causes
the server_id grain (which uses hash), to be inconsistent. To solve
this, on Python >= 3.3 we now must shell out to Python with the
PYTHONHASHSEED variable set to 0 to get a consistent hash for this
grain.
This commit is contained in:
Erik Johnson 2018-03-21 13:28:15 -05:00
parent 83ed40c06a
commit e82a1aa1ec
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
salt/grains/core.py
View file

@ -2404,7 +2404,30 @@ def get_server_id():
if salt.utils.is_proxy():
return {}
return {'server_id': abs(hash(__opts__.get('id', '')) % (2 ** 31))}
id_ = __opts__.get('id', '')
id_hash = None
py_ver = sys.version_info[:2]
if py_ver >= (3, 3):
# Python 3.3 enabled hash randomization, so we need to shell out to get
# a reliable hash.
py_bin = 'python{0}.{1}'.format(*py_ver)
id_hash = __salt__['cmd.run'](
[py_bin, '-c', 'print(hash("{0}"))'.format(id_)],
env={'PYTHONHASHSEED': '0'}
)
try:
id_hash = int(id_hash)
except (TypeError, ValueError):
log.debug(
'Failed to hash the ID to get the server_id grain. Result of '
'hash command: %s', id_hash
)
id_hash = None
if id_hash is None:
# Python < 3.3 or error encountered above
id_hash = hash(id_)
return {'server_id': abs(id_hash % (2 ** 31))}
def get_master():