cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3453 from jsmartin/cleanup

Browse source 
Fixed #3433. Using get_bin_path, removed uneeded imports, "module" is in...
This commit is contained in:
Michael DeHaan 2013-07-11 06:03:19 -07:00
commit aa17420fc2
1 changed files with 38 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
database/riak
View file

@ -70,7 +70,7 @@ options:
description: description:
- Waits for a riak service to come online before continuing. - Waits for a riak service to come online before continuing.
required: false required: false
default: kv default: None
aliases: [] aliases: []
choices: ['kv'] choices: ['kv']
''' '''
@ -86,25 +86,23 @@ EXAMPLES = '''
- riak: wait_for_service=kv - riak: wait_for_service=kv
''' '''
import re
import os.path
import urllib2 import urllib2
import json import json
import time import time
import socket
def ring_check(module, riak_admin_bin):
def ring_check(): cmd = '%s ringready 2> /dev/null' % riak_admin_bin
rc, out, err = module.run_command('riak-admin ringready 2> /dev/null') rc, out, err = module.run_command(cmd)
if rc == 0 and out.find('TRUE All nodes agree on the ring') != -1: if rc == 0 and 'TRUE All nodes agree on the ring' in out:
return True return True
else: else:
return False return False
def main(): def main():
ansible_facts = {} module = AnsibleModule(
arg_spec = dict( argument_spec=dict(
command=dict(required=False, default=None, choices=[ command=dict(required=False, default=None, choices=[
'ping', 'kv_test', 'join', 'plan', 'commit']), 'ping', 'kv_test', 'join', 'plan', 'commit']),
config_dir=dict(default='/etc/riak'), config_dir=dict(default='/etc/riak'),
@ -115,8 +113,7 @@ def main():
wait_for_service=dict( wait_for_service=dict(
required=False, default=None, choices=['kv']) required=False, default=None, choices=['kv'])
) )
global module )
module = AnsibleModule(argument_spec=arg_spec)
command = module.params.get('command') command = module.params.get('command')
@ -127,18 +124,13 @@ def main():
wait_for_ring = module.params.get('wait_for_ring') wait_for_ring = module.params.get('wait_for_ring')
wait_for_service = module.params.get('wait_for_service') wait_for_service = module.params.get('wait_for_service')
rc = 0
err = ''
out = ''
#make sure riak commands are on the path #make sure riak commands are on the path
for item in ['riak', 'riak-admin']: riak_bin = module.get_bin_path('riak')
rc, out, err = module.run_command('which %s' % item) riak_admin_bin = module.get_bin_path('riak-admin')
if rc == 1:
module.fail_json(msg='Could not find path to %s executable' % item)
rc, out, err = module.run_command( cmd = "%s version 2> /dev/null |grep ^riak|cut -f2 -d' '|tr -d '('" % riak_bin
"riak version 2> /dev/null |grep ^riak|cut -f2 -d' '|tr -d '('") rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
version = out.strip() version = out.strip()
else: else:
@ -157,35 +149,38 @@ def main():
time.sleep(5) time.sleep(5)
except urllib2.URLError, e: except urllib2.URLError, e:
time.sleep(5) time.sleep(5)
except socket.timeout:
time.sleep(5)
except Exception, e: except Exception, e:
module.fail_json(msg='Could not fetch Riak stats: %s' % e) module.fail_json(msg='Could not fetch Riak stats: %s' % e)
# here we attempt to load those stats, # here we attempt to load those stats,
try: try:
stats = json.loads(stats_raw) stats = json.loads(stats_raw)
except: except:
module.fail_json(msg='Timeout, could not parse Riak stats.') module.fail_json(msg='Could not parse Riak stats.')
node_name = stats['nodename'] node_name = stats['nodename']
nodes = stats['ring_members'] nodes = stats['ring_members']
ring_size = stats['ring_creation_size'] ring_size = stats['ring_creation_size']
result = {'node_name': node_name, result = dict(node_name=node_name,
'nodes': nodes, nodes=nodes,
'ring_size': ring_size, ring_size=ring_size,
'version': version} version=version)
if command == 'ping': if command == 'ping':
rc, out, err = module.run_command('riak ping %s' % target_node) cmd = '%s ping %s' % ( riak_bin, target_node )
rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
result['ping'] = out result['ping'] = out
else: else:
module.fail_json(msg=out) module.fail_json(msg=out)
elif command == 'kv_test': elif command == 'kv_test':
rc, out, err = module.run_command('riak-admin test') cmd = '%s test' % riak_admin_bin
rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
result['kv_test'] = out result['kv_test'] = out
else: else:
@ -195,7 +190,8 @@ def main():
if nodes.count(node_name) == 1 and len(nodes) > 1: if nodes.count(node_name) == 1 and len(nodes) > 1:
result['join'] = 'Node is already in cluster or staged to be in cluster.' result['join'] = 'Node is already in cluster or staged to be in cluster.'
else: else:
rc, out, err = module.run_command('riak-admin cluster join %s' % target_node) cmd = '%s cluster join %s' % (riak_admin_bin, target_node)
rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
result['join'] = out result['join'] = out
result['changed'] = True result['changed'] = True
@ -203,57 +199,52 @@ def main():
module.fail_json(msg=out) module.fail_json(msg=out)
elif command == 'plan': elif command == 'plan':
rc, out, err = module.run_command('riak-admin cluster plan %s' % target_node) cmd = '%s cluster plan' % riak_admin_bin
rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
result['plan'] = out result['plan'] = out
if out.find('Staged Changes') != -1: if 'Staged Changes' in out:
result['changed'] = True result['changed'] = True
else: else:
module.fail_json(msg=out) module.fail_json(msg=out)
elif command == 'commit': elif command == 'commit':
cmd = '%s cluster commit' % riak_admin_bin
rc, out, err = module.run_command('riak-admin cluster commit %s' % target_node) rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
result['commit'] = out result['commit'] = out
result['changed'] = True result['changed'] = True
else: else:
module.fail_json(msg=out) module.fail_json(msg=out)
rc = 0
err = ''
out = ''
# this could take a while, recommend to run in async mode # this could take a while, recommend to run in async mode
if wait_for_handoffs: if wait_for_handoffs:
timeout = time.time() + wait_for_handoffs timeout = time.time() + wait_for_handoffs
while True: while True:
rc, out, err = module.run_command('riak-admin transfers 2> /dev/null') cmd = '%s transfers 2> /dev/null' % riak_admin_bin
if out.find('No transfers active') != -1: rc, out, err = module.run_command(cmd)
if 'No transfers active' in out:
result['handoffs'] = 'No transfers active.' result['handoffs'] = 'No transfers active.'
break break
time.sleep(10) time.sleep(10)
if time.time() > timeout: if time.time() > timeout:
module.fail_json(msg='Timeout waiting for handoffs.') module.fail_json(msg='Timeout waiting for handoffs.')
# this could take a while, recommend to run in async mode
if wait_for_service: if wait_for_service:
rc, out, err = module.run_command('riak-admin wait_for_service riak_%s %s' % ( cmd = '%s wait_for_service riak_%s %s' % ( riak_admin_bin, wait_for_service, node_name)
wait_for_service, node_name)) rc, out, err = module.run_command(cmd)
result['service'] = out result['service'] = out
if wait_for_ring: if wait_for_ring:
timeout = time.time() + wait_for_ring timeout = time.time() + wait_for_ring
while True: while True:
if ring_check(): if ring_check(module, riak_admin_bin):
break break
time.sleep(10) time.sleep(10)
wait += 10
if time.time() > timeout: if time.time() > timeout:
module.fail_json(msg='Timeout waiting for nodes to agree on ring.') module.fail_json(msg='Timeout waiting for nodes to agree on ring.')
result['ring_ready'] = ring_check() result['ring_ready'] = ring_check(module, riak_admin_bin)
module.exit_json(**result) module.exit_json(**result)