From 378b34f62f52d8cf1e4ee3bd5e034363c77c6acc Mon Sep 17 00:00:00 2001 From: Harshavardhana Ranganath Date: Wed, 25 Nov 2009 14:33:55 +0000 Subject: Volgen supporting multidisks and booster configuration for nfs and cifs Signed-off-by: Harshavardhana Signed-off-by: Anand V. Avati BUG: 396 (Volgen multiple export directory support) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=396 --- extras/volgen/CreateBooster.py | 56 ++++++++++ extras/volgen/CreateVolfile.py | 238 +++++++++++++++++++++++++++++++++++++++++ extras/volgen/Makefile.am | 8 ++ extras/volgen/glusterfs-volgen | 184 +++++++++++++++++++++++++++++++ 4 files changed, 486 insertions(+) create mode 100644 extras/volgen/CreateBooster.py create mode 100644 extras/volgen/CreateVolfile.py create mode 100644 extras/volgen/Makefile.am create mode 100755 extras/volgen/glusterfs-volgen (limited to 'extras/volgen') diff --git a/extras/volgen/CreateBooster.py b/extras/volgen/CreateBooster.py new file mode 100644 index 000000000..9051f4401 --- /dev/null +++ b/extras/volgen/CreateBooster.py @@ -0,0 +1,56 @@ +GLUSTERFS_BOOSTER_FSTAB = "/etc/gluster/booster.fstab" +GLUSTERFS_UNFS3_EXPORTS = "/etc/gluster/boosterexports" +GLUSTERFS_CIFS_CONFIG = "/etc/gluster/boostersmb.conf" +LOGDIR = "/var/log/glusterfs" +CONFDIR = "/etc/gluster" +fstype = "glusterfs" + +class CreateBooster: + + def __init__ (self, main_name, export_dir): + + self.volume_name = main_name + self.export = export_dir + + def configure_booster_fstab (self): + if self.volume_name is None or self.export is None: + sys.exit(1) + + booster_fstab_fd = file (GLUSTERFS_BOOSTER_FSTAB, "a") + _fstab = "%s/%s.vol %s" % (CONFDIR, self.volume_name, self.export) + _options = "%s subvolume=io-cache" % fstype + _options_log = "logfile=%s/%s.log" % (LOGDIR, self.volume_name) + _options_ext = "loglevel=ERROR,attr_timeout=0" + booster_fstab_fd.write ("%s %s,%s,%s\n" % + (_fstab, + _options, + _options_log, + _options_ext)) + + return + + def configure_nfs_booster (self): + if self.volume_name is None or self.export is None: + sys.exit(1) + + nfs_exports_fd = file (GLUSTERFS_UNFS3_EXPORTS, "a") + nfs_exports_fd.write ("%s 0.0.0.0/0(rw,no_root_squash)\n" % + self.export) + return + + def configure_cifs_booster (self): + + if self.volume_name is None or self.export is None: + sys.exit(1) + + cifs_config_fd = file (GLUSTERFS_CIFS_CONFIG, "a") + cifs_config_fd.write ("[%s]\n" % self.volume_name) + cifs_config_fd.write ("comment = %s volume served by Gluster\n" % + self.volume_name) + cifs_config_fd.write ("path = %s\n" % self.export) + cifs_config_fd.write ("guest ok = yes\n") + cifs_config_fd.write ("public = yes\n") + cifs_config_fd.write ("writable = yes\n") + cifs_config_fd.write ("admin users = gluster\n") + cifs_config_fd.close() + return diff --git a/extras/volgen/CreateVolfile.py b/extras/volgen/CreateVolfile.py new file mode 100644 index 000000000..1d22e8fb1 --- /dev/null +++ b/extras/volgen/CreateVolfile.py @@ -0,0 +1,238 @@ +import os, sys, string +import subprocess + +num_replica = 2 +num_stripe = 4 +cache_size = "1GB" + +class CreateVolfile: + + def __init__ (self, servers, server, volume_name, + transport, transports, port, auth_param, + ib_port, confdir, args): + self.hosts = servers + self.host = server + self.volume_name = volume_name + self.transport = transport + self.transports = transports + self.gfs_port = port + self.gfs_ib_port = port + 1 + self.auth_parameters = auth_param + self.ib_devport = ib_port + self.num_servers = len (self.hosts.keys()) + self.conf_dir = confdir + self.arguments = args + + def create_mount_volfile (self, raid_type): + + + if self.conf_dir: + mount_fd = file ("%s/%s-%s.vol" % (self.conf_dir, + str(self.volume_name), + str(self.transport)), "w") + else: + mount_fd = file ("%s-%s.vol" % (str(self.volume_name), + str(self.transport)), "w") + + print "Generating client volfiles.. for transport '%s'" % (self.transport) + + num_stripe = 4 + num_replica = 2 + + + cmdline = string.join (sys.argv, ' ') + mount_fd.write ("## file auto generated by %s (mount.vol)\n" % + sys.argv[0]) + mount_fd.write ("# Cmd line:\n") + mount_fd.write ("# $ %s\n\n" % cmdline) + + if raid_type is not None: + # Used for later usage + mount_fd.write ("# RAID %d\n" % raid_type) + + mount_fd.write ("# TRANSPORT-TYPE %s\n" % self.transport) + subvolumes = [] + for host in self.hosts.keys(): + i = 1 + for exports in self.hosts[host]: + mount_fd.write ("volume %s-%s\n" % (host,i)) + mount_fd.write (" type protocol/client\n") + mount_fd.write (" option transport-type %s\n" % + self.transport) + command = "dig %s | grep '^%s'" % (host, host) + ps = subprocess.Popen(command, + shell=True, + stdout=subprocess.PIPE, + stdin=subprocess.PIPE, + stderr=subprocess.PIPE, + close_fds=True) + ipaddress = host + if ps.wait() == 0: + output = ps.communicate() + ipaddress = output[0].split()[-1] + + mount_fd.write (" option remote-host %s\n" % ipaddress) + if self.transport == 'ib-verbs': + mount_fd.write (" option transport.ib-verbs.port %d\n" % + self.ib_devport) + mount_fd.write (" option transport.remote-port %d\n" % + self.gfs_ib_port) + if self.transport == 'tcp': + mount_fd.write (" option transport.socket.nodelay on\n") + mount_fd.write (" option transport.remote-port %d\n" % + self.gfs_port) + + mount_fd.write (" option remote-subvolume brick%s\n" % + i) + mount_fd.write ("end-volume\n\n") + i += 1 + + exportlist = {} + for entry in self.arguments: + node = entry.split(':')[0] + if not exportlist.has_key(node): + exportlist[node] = 1 + else: + exportlist[node] += 1 + subvolumes.append(str(node) + '-' + str(exportlist[node])) + + + if raid_type == 1: + if (len(subvolumes) % num_replica) != 0: + print "raid type (%d) and number of volumes (%d) invalid" % (raid_type, len(subvolumes)) + sys.exit (1) + + if raid_type == 0: + if (len(subvolumes) % num_stripe) != 0: + print "raid type (%d) and number of volumes (%d) invalid" % (raid_type, len(subvolumes)) + sys.exit (1) + + # Stripe section.. if given + if raid_type is 0: + max_stripe_idx = len (subvolumes) / num_stripe + stripe_idx = 0 + index = 0 + while index < max_stripe_idx: + mount_fd.write ("volume stripe-%d\n" % index) + mount_fd.write (" type cluster/stripe\n") + mount_fd.write (" subvolumes %s %s %s %s\n" % + (subvolumes[stripe_idx], + subvolumes[stripe_idx+1], + subvolumes[stripe_idx+2], + subvolumes[stripe_idx+3])) + mount_fd.write ("end-volume\n\n") + stripe_idx += 4 + index +=1 + + # Replicate section + if raid_type is 1: + max_mirror_idx = len (subvolumes) / num_replica + mirror_idx = 0 + index = 0 + while index < max_mirror_idx: + mount_fd.write ("volume mirror-%d\n" % index) + mount_fd.write (" type cluster/replicate\n") + mount_fd.write (" subvolumes %s %s\n" % + (subvolumes[mirror_idx], + subvolumes[mirror_idx+1])) + mount_fd.write ("end-volume\n\n") + mirror_idx += 2 + index += 1 + + # Distribute section + if raid_type is 0: + subvolumes = [] + flag = 0 + while flag < index: + subvolumes.append ("stripe-%d" % flag) + flag += 1 + if raid_type is 1: + subvolumes = [] + flag = 0 + while flag < index: + subvolumes.append ("mirror-%d" % flag) + flag += 1 + + if len (subvolumes) > 1: + mount_fd.write ("volume distribute\n") + mount_fd.write (" type cluster/distribute\n") + mount_fd.write (" subvolumes %s\n" % + string.join (subvolumes,' ')) + mount_fd.write ("end-volume\n\n") + subvolumes[0] = "distribute" + + mount_fd.write ("volume writebehind\n") + mount_fd.write (" type performance/write-behind\n") + mount_fd.write (" option cache-size 4MB\n") + mount_fd.write (" subvolumes %s\n" % subvolumes[0]) + mount_fd.write ("end-volume\n\n") + + mount_fd.write ("volume io-cache\n") + mount_fd.write (" type performance/io-cache\n") + mount_fd.write (" option cache-size %s\n" % cache_size) + mount_fd.write (" subvolumes writebehind\n") + mount_fd.write ("end-volume\n\n") + + return + + def create_export_volfile (self): + + cmdline = string.join (sys.argv, ' ') + + if self.conf_dir: + exp_fd = file ("%s/%s-export.vol" % + (self.conf_dir, + str(self.host + '-' + self.volume_name)),"w") + else: + exp_fd = file ("%s-export.vol" % + (str(self.host + '-' + self.volume_name)),"w") + + print "Generating server volfiles.. for server '%s'" % (self.host) + + exp_fd.write ("## file auto generated by %s (export.vol)\n" % + sys.argv[0]) + exp_fd.write ("# Cmd line:\n") + exp_fd.write ("# $ %s\n\n" % cmdline) + total_bricks = [] + i=1 + for export in self.hosts[self.host]: + exp_fd.write ("volume posix%d\n" % i) + exp_fd.write (" type storage/posix\n") + exp_fd.write (" option directory %s\n" % export) + exp_fd.write ("end-volume\n\n") + + exp_fd.write ("volume locks%d\n" % i) + exp_fd.write (" type features/locks\n") + exp_fd.write (" subvolumes posix%d\n" % i) + exp_fd.write ("end-volume\n\n") + + exp_fd.write ("volume brick%d\n" % i) + exp_fd.write (" type performance/io-threads\n") + exp_fd.write (" option thread-count 8\n") + exp_fd.write (" subvolumes locks%d\n" % i) + exp_fd.write ("end-volume\n\n") + + total_bricks.append("brick%s" % i) + i += 1 + + for transport in self.transports: + exp_fd.write ("volume server-%s\n" % transport) + exp_fd.write (" type protocol/server\n") + exp_fd.write (" option transport-type %s\n" % transport) + for brick in total_bricks: + exp_fd.write (" option auth.addr.%s.allow %s\n" % + (brick, self.auth_parameters)) + + if transport == 'ib-verbs': + exp_fd.write (" option transport.ib-verbs.listen-port %d\n" % self.gfs_ib_port) + exp_fd.write (" option transport.ib-verbs.port %d\n" % + self.ib_devport) + if transport == 'tcp': + exp_fd.write (" option transport.socket.listen-port %d\n" % self.gfs_port) + exp_fd.write (" option transport.socket.nodelay on\n") + + exp_fd.write (" subvolumes %s\n" % + string.join(total_bricks, ' ')) + exp_fd.write ("end-volume\n\n") + + return diff --git a/extras/volgen/Makefile.am b/extras/volgen/Makefile.am new file mode 100644 index 000000000..73b62356e --- /dev/null +++ b/extras/volgen/Makefile.am @@ -0,0 +1,8 @@ + +volgendir = $(datadir)/glusterfs +dist_volgen_DATA = CreateVolfile.py CreateBooster.py + +dist_bin_SCRIPTS = glusterfs-volgen + +CLEANFILES = + diff --git a/extras/volgen/glusterfs-volgen b/extras/volgen/glusterfs-volgen new file mode 100755 index 000000000..1151053ac --- /dev/null +++ b/extras/volgen/glusterfs-volgen @@ -0,0 +1,184 @@ +#!/usr/bin/python + +import getopt, sys, os, string +import subprocess + +if not "/usr/share/glusterfs" in sys.path: + sys.path.append("/usr/share/glusterfs") + +from CreateVolfile import * +from CreateBooster import * + +def print_usage (name): + spaces = ' ' * (len(name) + 1) + print name, "--name " + print "%s[--raid 0|1]" % spaces + print "%s[--transport tcp,ib-verbs]" % spaces + print "%s[--port ]" % spaces + print "%s[--ibdev ]" % spaces + print "%s[--auth ]" % spaces + print "%s[--conf-dir ]" % spaces + print "%s[--usage]" % spaces + print "%s[--nfs]" % spaces + print "%s[--cifs]" % spaces + print "%s[--version]" % spaces + print "%shost1: host2: ... hostN:" % spaces + return + +def print_version (version): + print "glusterfs-volgen %s: A tool to generate volume files for GlusterFS." % version + print "Copyright (C) 2009 Gluster, Inc. " + print """License GPLv3+: GNU GPL version 3 or later +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law.""" + + +def main (): + + needs_upgrade = None + needs_nfs = None + needs_cifs = None + version_num ="3.0" + _volume_name = None + _server_chain = {} + _server = None + _transports = ['tcp'] + _transport = None + _port = 6996 + _auth_param = "*" + _ib_dev = 1 + _raid_type = None + node = None + _conf_dir = None + + try: + (opt, args) = getopt.getopt (sys.argv[1:], "r:t:p:n:a:i:ch", + ["raid=", + "transport=", + "port=", + "name=", + "auth=", + "ibdev=", + "conf-dir=", + "nfs", + "cifs", + "usage", + "version", + "help"]) + + except getopt.GetoptError, (msg, opt): + print msg + sys.exit (1) + + for (o, val) in opt: + if o == '--usage' or o == '--help': + print_usage (sys.argv[0]) + sys.exit (0) + + if o == '-n' or o == '--name': + _volume_name = val + + if o == '--nfs': + needs_nfs = 1 + + if o == '--cifs': + needs_cifs = 1 + + if o == '-t' or o == '--transport': + if not val: + print "--transport: option " + val + \ + " is not valid transport type" + sys.exit (1) + _transports = val.split(',') + + if o == '-a' or o == '--auth': + _auth_param = val + + if o == '-p' or o == '--port': + _port = int(val) + + if o == '-r' or o == '--raid': + if (val != "1" and val != "0"): + print "--raid: option " + val + " is not valid raid type" + sys.exit (1) + _raid_type = int (val) + + if o == '-i' or o == '--ibdev': + _ib_dev = int(val) + + if o == '-v' or o == '--version': + print_version (version_num) + sys.exit (0) + + if o == '-c' or o == '--conf-dir': + _conf_dir = val + + if _volume_name is None: + print "Volume name is mandatory, please provide volume name.. exiting" + print_usage(sys.argv[0]) + sys.exit(1) + + _tmp = [] + for server in args: + if server not in _tmp: + _tmp.append (server) + else: + print "Duplicate arguments detected (%s)" % server + sys.exit(1) + + node = server.split(':')[0] + _server_chain[node] = [] + + for server in args: + node = server.split(':')[0] + if server.split(':')[1] not in _server_chain [node]: + if server.split(':')[1][0] != '/': + print "Absolute export path required for %s" % server + sys.exit(1) + _server_chain [node].append (server.split(':')[1]) + + num_servers = len (_server_chain.keys()) + + if num_servers is 0: + print "no servers provided, exiting" + print_usage(sys.argv[0]) + sys.exit (1) + + print num_servers + + + for _server in _server_chain.keys(): + create_exp = CreateVolfile (_server_chain, _server, + _volume_name, None, + _transports, _port, + _auth_param, _ib_dev, + _conf_dir, None) + try: + create_exp.create_export_volfile () + except IOError, (errno, strerror): + print "Got %s creating server volfiles for %s" % (strerror, _server) + + for _transport in _transports: + create_mnt = CreateVolfile (_server_chain, None, + _volume_name, _transport, + _transports, _port, + _auth_param, _ib_dev, + _conf_dir, args) + try: + create_mnt.create_mount_volfile (_raid_type) + except IOError, (errno, strerror): + print "Got %s creating client volfiles for transport '%s'" % (strerror, _transport) + + + for _server in _server_chain.keys(): + for export_dir in _server_chain[_server]: + commonobj = CreateBooster (_volume_name, export_dir) + if needs_nfs is 1 or needs_cifs is 1: + commonobj.configure_booster_fstab () + if needs_nfs is 1: + commonobj.configure_nfs_booster () + if needs_cifs is 1: + commonobj.configure_cifs_booster () + return + +main () -- cgit