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

minor fixes to gluster: - removed functions from main scope - renamed rebalance function to disambiguate from variable - updated docs with defaults - added exception handling to command execution

Browse source
This commit is contained in:
Brian Coca 2015-03-30 20:15:40 -04:00 committed by Matt Clay
parent 2ff3a8d35f
commit bb418095a3
1 changed files with 149 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

285
lib/ansible/modules/extras/system/gluster_volume.py
View file

@ -38,27 +38,33 @@ options:
use started/stopped to control it's availability. use started/stopped to control it's availability.
cluster: cluster:
required: false required: false
default: null
description: description:
- List of hosts to use for probing and brick setup - List of hosts to use for probing and brick setup
host: host:
required: false required: false
default: null
description: description:
- Override local hostname (for peer probing purposes) - Override local hostname (for peer probing purposes)
replicas: replicas:
required: false required: false
default: null
description: description:
- Replica count for volume - Replica count for volume
stripes: stripes:
required: false required: false
default: null
description: description:
- Stripe count for volume - Stripe count for volume
transport: transport:
required: false required: false
choices: [ 'tcp', 'rdma', 'tcp,rdma' ] choices: [ 'tcp', 'rdma', 'tcp,rdma' ]
default: 'tcp'
description: description:
- Transport type for volume - Transport type for volume
brick: brick:
required: false required: false
default: null
description: description:
- Brick path on servers - Brick path on servers
start_on_create: start_on_create:
@ -69,22 +75,27 @@ options:
rebalance: rebalance:
choices: [ 'yes', 'no'] choices: [ 'yes', 'no']
required: false required: false
default: 'no'
description: description:
- Controls whether the cluster is rebalanced after changes - Controls whether the cluster is rebalanced after changes
directory: directory:
required: false required: false
default: null
description: description:
- Directory for limit-usage - Directory for limit-usage
options: options:
required: false required: false
default: null
description: description:
- A dictionary/hash with options/settings for the volume - A dictionary/hash with options/settings for the volume
quota: quota:
required: false required: false
default: null
description: description:
- Quota value for limit-usage (be sure to use 10.0MB instead of 10MB, see quota list) - Quota value for limit-usage (be sure to use 10.0MB instead of 10MB, see quota list)
force: force:
required: false required: false
default: null
description: description:
- If brick is being created in the root partition, module will fail. - If brick is being created in the root partition, module will fail.
Set force to true to override this behaviour Set force to true to override this behaviour
@ -119,165 +130,167 @@ import shutil
import time import time
import socket import socket
def main():
def run_gluster(gargs, **kwargs):
def run_gluster(gargs, **kwargs): args = [glusterbin]
args = [glusterbin] args.extend(gargs)
args.extend(gargs) try:
rc, out, err = module.run_command(args, **kwargs) rc, out, err = module.run_command(args, **kwargs)
if rc != 0: if rc != 0:
module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out if out != '' else err)) module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out if out != '' else err))
return out except Exception, e:
module.fail_json(msg='error running gluster (%s) command: %s' % (' '.join(args), str(e))
return out
def run_gluster_nofail(gargs, **kwargs): def run_gluster_nofail(gargs, **kwargs):
args = [glusterbin] args = [glusterbin]
args.extend(gargs) args.extend(gargs)
rc, out, err = module.run_command(args, **kwargs) rc, out, err = module.run_command(args, **kwargs)
if rc != 0: if rc != 0:
return None return None
return out return out
def run_gluster_yes(gargs): def run_gluster_yes(gargs):
args = [glusterbin] args = [glusterbin]
args.extend(gargs) args.extend(gargs)
rc, out, err = module.run_command(args, data='y\n') rc, out, err = module.run_command(args, data='y\n')
if rc != 0: if rc != 0:
module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out if out != '' else err)) module.fail_json(msg='error running gluster (%s) command (rc=%d): %s' % (' '.join(args), rc, out if out != '' else err))
return out return out
def get_peers(): def get_peers():
out = run_gluster([ 'peer', 'status']) out = run_gluster([ 'peer', 'status'])
i = 0 i = 0
peers = {} peers = {}
hostname = None hostname = None
uuid = None uuid = None
state = None state = None
for row in out.split('\n'): for row in out.split('\n'):
if ': ' in row: if ': ' in row:
key, value = row.split(': ') key, value = row.split(': ')
if key.lower() == 'hostname': if key.lower() == 'hostname':
hostname = value hostname = value
if key.lower() == 'uuid': if key.lower() == 'uuid':
uuid = value uuid = value
if key.lower() == 'state': if key.lower() == 'state':
state = value state = value
peers[hostname] = [ uuid, state ] peers[hostname] = [ uuid, state ]
return peers return peers
def get_volumes(): def get_volumes():
out = run_gluster([ 'volume', 'info' ]) out = run_gluster([ 'volume', 'info' ])
volumes = {} volumes = {}
volume = {} volume = {}
for row in out.split('\n'): for row in out.split('\n'):
if ': ' in row: if ': ' in row:
key, value = row.split(': ') key, value = row.split(': ')
if key.lower() == 'volume name': if key.lower() == 'volume name':
volume['name'] = value volume['name'] = value
volume['options'] = {}
volume['quota'] = False
if key.lower() == 'volume id':
volume['id'] = value
if key.lower() == 'status':
volume['status'] = value
if key.lower() == 'transport-type':
volume['transport'] = value
if key.lower() != 'bricks' and key.lower()[:5] == 'brick':
if not 'bricks' in volume:
volume['bricks'] = []
volume['bricks'].append(value)
# Volume options
if '.' in key:
if not 'options' in volume:
volume['options'] = {} volume['options'] = {}
volume['quota'] = False volume['options'][key] = value
if key.lower() == 'volume id': if key == 'features.quota' and value == 'on':
volume['id'] = value volume['quota'] = True
if key.lower() == 'status':
volume['status'] = value
if key.lower() == 'transport-type':
volume['transport'] = value
if key.lower() != 'bricks' and key.lower()[:5] == 'brick':
if not 'bricks' in volume:
volume['bricks'] = []
volume['bricks'].append(value)
# Volume options
if '.' in key:
if not 'options' in volume:
volume['options'] = {}
volume['options'][key] = value
if key == 'features.quota' and value == 'on':
volume['quota'] = True
else:
if row.lower() != 'bricks:' and row.lower() != 'options reconfigured:':
if len(volume) > 0:
volumes[volume['name']] = volume
volume = {}
return volumes
def get_quotas(name, nofail):
quotas = {}
if nofail:
out = run_gluster_nofail([ 'volume', 'quota', name, 'list' ])
if not out:
return quotas
else: else:
out = run_gluster([ 'volume', 'quota', name, 'list' ]) if row.lower() != 'bricks:' and row.lower() != 'options reconfigured:':
for row in out.split('\n'): if len(volume) > 0:
if row[:1] == '/': volumes[volume['name']] = volume
q = re.split('\s+', row) volume = {}
quotas[q[0]] = q[1] return volumes
return quotas
def wait_for_peer(host): def get_quotas(name, nofail):
for x in range(0, 4): quotas = {}
peers = get_peers() if nofail:
if host in peers and peers[host][1].lower().find('peer in cluster') != -1: out = run_gluster_nofail([ 'volume', 'quota', name, 'list' ])
return True if not out:
time.sleep(1) return quotas
return False else:
out = run_gluster([ 'volume', 'quota', name, 'list' ])
for row in out.split('\n'):
if row[:1] == '/':
q = re.split('\s+', row)
quotas[q[0]] = q[1]
return quotas
def probe(host): def wait_for_peer(host):
run_gluster([ 'peer', 'probe', host ]) for x in range(0, 4):
if not wait_for_peer(host): peers = get_peers()
module.fail_json(msg='failed to probe peer %s' % host) if host in peers and peers[host][1].lower().find('peer in cluster') != -1:
changed = True return True
time.sleep(1)
return False
def probe_all_peers(hosts, peers, myhostname): def probe(host):
for host in hosts: run_gluster([ 'peer', 'probe', host ])
if host not in peers: if not wait_for_peer(host):
# dont probe ourselves module.fail_json(msg='failed to probe peer %s' % host)
if myhostname != host: changed = True
probe(host)
def create_volume(name, stripe, replica, transport, hosts, brick, force): def probe_all_peers(hosts, peers, myhostname):
args = [ 'volume', 'create' ] for host in hosts:
args.append(name) if host not in peers:
if stripe: # dont probe ourselves
args.append('stripe') if myhostname != host:
args.append(str(stripe)) probe(host)
if replica:
args.append('replica')
args.append(str(replica))
args.append('transport')
args.append(transport)
for host in hosts:
args.append(('%s:%s' % (host, brick)))
if force:
args.append('force')
run_gluster(args)
def start_volume(name): def create_volume(name, stripe, replica, transport, hosts, brick, force):
run_gluster([ 'volume', 'start', name ]) args = [ 'volume', 'create' ]
args.append(name)
if stripe:
args.append('stripe')
args.append(str(stripe))
if replica:
args.append('replica')
args.append(str(replica))
args.append('transport')
args.append(transport)
for host in hosts:
args.append(('%s:%s' % (host, brick)))
if force:
args.append('force')
run_gluster(args)
def stop_volume(name): def start_volume(name):
run_gluster_yes([ 'volume', 'stop', name ]) run_gluster([ 'volume', 'start', name ])
def set_volume_option(name, option, parameter): def stop_volume(name):
run_gluster([ 'volume', 'set', name, option, parameter ]) run_gluster_yes([ 'volume', 'stop', name ])
def add_brick(name, brick, force): def set_volume_option(name, option, parameter):
args = [ 'volume', 'add-brick', name, brick ] run_gluster([ 'volume', 'set', name, option, parameter ])
if force:
args.append('force')
run_gluster(args)
def rebalance(name): def add_brick(name, brick, force):
run_gluster(['volume', 'rebalance', name, 'start']) args = [ 'volume', 'add-brick', name, brick ]
if force:
args.append('force')
run_gluster(args)
def enable_quota(name): def do_rebalance(name):
run_gluster([ 'volume', 'quota', name, 'enable' ]) run_gluster(['volume', 'rebalance', name, 'start'])
def set_quota(name, directory, value): def enable_quota(name):
run_gluster([ 'volume', 'quota', name, 'limit-usage', directory, value ]) run_gluster([ 'volume', 'quota', name, 'enable' ])
def set_quota(name, directory, value):
run_gluster([ 'volume', 'quota', name, 'limit-usage', directory, value ])
def main():
### MAIN ### ### MAIN ###
module = AnsibleModule( module = AnsibleModule(
@ -403,7 +416,7 @@ def main():
if changed: if changed:
volumes = get_volumes() volumes = get_volumes()
if rebalance: if rebalance:
rebalance(volume_name) do_rebalance(volume_name)
facts = {} facts = {}
facts['glusterfs'] = { 'peers': peers, 'volumes': volumes, 'quotas': quotas } facts['glusterfs'] = { 'peers': peers, 'volumes': volumes, 'quotas': quotas }