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

issue-23125

Browse source 
Initial effort at making elasticsearch work as master job cache. Not
working yet.
This commit is contained in:
Michael Steed 2015-09-04 19:07:04 -06:00
parent d513acb3e5
commit 9aedc2662e
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/elasticsearch.py
View file

@ -174,7 +174,7 @@ def alias_get(indices=None, aliases=None, hosts=None, profile=None):
return None
def document_create(index, doc_type, body=None, hosts=None, profile=None):
def document_create(index, doc_type, body=None, id=None, hosts=None, profile=None):
'''
Create a document in a specified index
@ -184,7 +184,7 @@ def document_create(index, doc_type, body=None, hosts=None, profile=None):
'''
es = _get_instance(hosts, profile)
try:
result = es.index(index=index, doc_type=doc_type, body=body) # TODO error handling
result = es.index(index=index, doc_type=doc_type, body=body, id=id) # TODO error handling
return True
except elasticsearch.exceptions.NotFoundError:
return None

37
salt/returners/elasticsearch_return.py
View file

@ -117,3 +117,40 @@ def prep_jid(nocache=False, passed_jid=None): # pylint: disable=unused-argument
Do any work necessary to prepare a JID, including sending a custom id
'''
return passed_jid if passed_jid is not None else salt.utils.jid.gen_jid()
def save_load(jid, load):
'''
Save the load to the specified jid id
'''
index = 'salt-master-job-cache'
doc_type = __salt__['config.option']('elasticsearch:master_job_cache_doc_type', 'default')
index_exists = __salt__['elasticsearch.index_exists'](index)
if not index_exists:
number_of_shards = __salt__['config.option']('elasticsearch:number_of_shards', 1)
number_of_replicas = __salt__['config.option']('elasticsearch:number_of_replicas', 0)
index_definition = {'settings': {'number_of_shards': number_of_shards, 'number_of_replicas': number_of_replicas}}
__salt__['elasticsearch.index_create']('{0}-v1'.format(index), index_definition)
__salt__['elasticsearch.alias_create']('{0}-v1'.format(index), index)
data = {
'jid': jid,
'load': load,
}
ret = __salt__['elasticsearch.document_create'](index=index, doc_type=doc_type, id=jid, body=json.dumps(data))
def get_load(jid):
'''
Return the load data that marks a specified jid
'''
index = 'salt-master_job_cache'
doc_type = __salt__['config.option']('elasticsearch:master_job_cache_doc_type', 'default')
data = __salt__['elasticsearch.document_get'](index=index, id=jid, doc_type=doc_type)
if data:
return json.loads(data)
return {}