Add support for filed in the vlmc tool
authorStratos Psomadakis <psomas@grnet.gr>
Sun, 19 Feb 2012 23:34:33 +0000 (01:34 +0200)
committerStratos Psomadakis <psomas@grnet.gr>
Sun, 19 Feb 2012 23:34:33 +0000 (01:34 +0200)
xseg/tools/helpers.sh
xseg/tools/vlmc-filed.py [new file with mode: 0755]
xseg/tools/xseg_setup.sh

index c71e0c4..57e2765 100755 (executable)
@@ -21,7 +21,11 @@ function parse_config {
        [ -n "${SPEC}" ] || SPEC="xsegdev:xsegbd:128:8192:64:1024:12"
        [ -n "${REQS}" ] || REQS=128
        [ -n "${PORTS}" ] || PORTS=128
-
+       [ -n "${FILED_PORT}" || FILED_PORT=0
+       [ -n "${IMAGES}" ] || IMAGES="/srv/pithos/archip-data/images/"
+       [ -n "${BLOCKD_LOGS}" ] || BLOCKD_LOGS="/srv/pithos/archip-data/logs/"
+       [ -n "${DEVICE_PREFIX}" ] || DEVICE_PREFIX="/dev/xsegbd"
+       [ -n "${XSEGBD_SYSFS}" ] || XSEGBD_SYSFS="/sys/bus/xsegbd"
        [ -n "${CHRDEV_NAME}" ] || CHRDEV_NAME="/dev/xsegdev"
        [ -n "${CHRDEV_MAJOR}" ] || CHRDEV_MAJOR=60
 }
@@ -58,20 +62,25 @@ function load_all {
 # @param $1            target/volume name
 # @param $2            xseg port
 function spawn_blockd {
-       "${XSEG_HOME}/peers/blockd" "$1" -p "$2" -g "$SPEC"
+       "${XSEG_HOME}/peers/blockd" "$1" -p "$2" -g "$SPEC" &> "${BLOCKD_LOGS}/$1"
+}
+
+function spawn_filed {
+       "${XSEG_HOME}/peers/filed" "$1" -p "$2" -g "${SPEC}" &> "${BLOCKD_LOGS}/filed"
 }
 
 # map_volume - Map a volume to an xsegbd device
 #
 # @param $1            target/volume name
-# @param $2            (blockd) xseg port
+# @param $2            src port
+# @param $3            dst port
 function map_volume {
-       echo "$1 $(($2 + PORTS/2)):$2:${REQS}" > /sys/bus/xsegbd/add
+       echo "$1 $2:$3:${REQS}" > "${XSEGBD_SYSFS}add"
 }
 
 # unmap_device - Unmap an xsegbd device/volume
 #
 # @param $1            xsegbd device id
 function unmap_device {
-       echo "$1" > /sys/bus/xsegbd/remove
+       echo "$1" > "${XSEGBD_SYSFS}remove"
 }
diff --git a/xseg/tools/vlmc-filed.py b/xseg/tools/vlmc-filed.py
new file mode 100755 (executable)
index 0000000..661d29d
--- /dev/null
@@ -0,0 +1,184 @@
+#!/usr/bin/env python2.7
+#
+# vlmc tool for filed
+
+import os, sys, subprocess, shutil, re, argparse
+
+XSEG_HOME="/root/archip/xseg/"
+IMAGES="/srv/pithos/archip-data/images/"
+XSEGBD_SYSFS="/sys/bus/xsegbd/"
+DEVICE_PREFIX="/dev/xsegbd"
+BLOCKD_LOGS="/srv/pithos/archip-data/logs/"
+FILED_PORT=0
+
+def vlmc_list(args):
+    print "name\t\t\t\tsize"
+    try:
+        for f in os.listdir(IMAGES):
+            print "%s\t\t\t\t%dM" % (f, os.stat(IMAGES + f).st_size / 1024 / 1024)
+
+        sys.exit(0)
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+        
+def vlmc_create(args):
+    name = args.name[0]
+    size = args.size
+    snap = args.snap
+
+    try:
+        old_dir = os.getcwd()
+        os.chdir(IMAGES)
+
+        try:
+            os.stat(name)
+            print "file exists"
+            os.chdir(old_dir)
+            sys.exit(-1)
+        except:
+            pass
+        
+        if snap:
+            shutil.copyfile(snap, name)
+        else:
+            f = os.open(name, os.O_CREAT | os.O_WRONLY, 0755)
+            size *= 1024*1024
+            os.lseek(f, size - 1, os.SEEK_SET)
+            os.write(f, "1")
+            os.close(f)
+
+        os.chdir(old_dir)
+        sys.exit(0)
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+
+def vlmc_remove(args):
+    name = args.name[0]
+
+    try:
+        old_dir = os.getcwd()
+        os.chdir(IMAGES)
+
+        try:
+            os.stat(name)
+        except:
+            print "file doesn't exist"
+            os.chdir(old_dir)
+            sys.exit(-1)
+        
+        os.unlink(IMAGES + '/' + name)
+
+        os.chdir(old_dir)
+        sys.exit(0)
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+
+def vlmc_map(args):
+    name = args.name[0]
+    prev = 0
+    try:
+        for f in os.listdir(XSEGBD_SYSFS + "devices/"):
+            p = open(XSEGBD_SYSFS + "devices/" + f + "/port").read().strip()
+            if p - prev > 1:
+                break
+            else:
+                prev = p
+
+        port = prev + 1
+        fd = os.open(XSEGBD_SYSFS + "add", os.O_WRONLY)
+        os.write(fd, "%s %d:%d:128" % (name, port, FILED_PORT))
+        os.close(fd)
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+
+def vlmc_unmap(args):
+    device = args.name[0]
+    try:
+        for f in os.listdir(XSEGBD_SYSFS + "devices/"):
+            d_id = open(XSEGBD_SYSFS + "devices/" + f + "/id").read().strip()
+            name = open(XSEGBD_SYSFS + "devices/"+ f + "/name").read().strip()
+            if device == DEVICE_PREFIX + d_id:
+                fd = os.open(XSEGBD_SYSFS + "remove", os.O_WRONLY)
+                os.write(fd, d_id)
+                os.close(fd)
+
+                break
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+
+def vlmc_showmapped(args):
+    print "id\tpool\timage\tsnap\tdevice"
+    try:
+        for f in os.listdir(XSEGBD_SYSFS + "devices/"):
+            d_id = open(XSEGBD_SYSFS + "devices/" + f + "/id").read().strip()
+            name = open(XSEGBD_SYSFS + "devices/"+ f + "/name").read().strip()
+
+            print "%s\t%s\t%s\t%s\t%s" % (d_id, '-', name, '-', DEVICE_PREFIX +
+            d_id)
+    except Exception, reason:
+        print >> sys.stderr, reason
+        sys.exit(-1)
+
+if __name__ == "__main__":
+    # parse arguments and discpatch to the correct func
+    parser = argparse.ArgumentParser(description='vlmc tool')
+    parser.add_argument('-c', '--config', type=str, nargs='?', help='config file')
+    subparsers = parser.add_subparsers()
+
+    create_parser = subparsers.add_parser('create', help='Create volume')
+    group = create_parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('-s', '--size', type=int, nargs='?', help='requested size in MB for create')
+    group.add_argument('--snap', type=str, nargs='?', help='create from snapshot')
+    create_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+    create_parser.add_argument('name', type=str, nargs=1, help='volume/device name')
+    create_parser.set_defaults(func=vlmc_create)
+
+    remove_parser = subparsers.add_parser('remove', help='Delete volume')
+    remove_parser.add_argument('name', type=str, nargs=1, help='volume/device name')
+    remove_parser.set_defaults(func=vlmc_remove)
+    remove_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    rm_parser = subparsers.add_parser('rm', help='Delete volume')
+    rm_parser.add_argument('name', type=str, nargs=1, help='volume/device name')
+    rm_parser.set_defaults(func=vlmc_remove)
+    rm_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    map_parser = subparsers.add_parser('map', help='Map volume')
+    map_parser.add_argument('name', type=str, nargs=1, help='volume/device name')
+    map_parser.set_defaults(func=vlmc_map)
+    map_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    unmap_parser = subparsers.add_parser('unmap', help='Unmap volume')
+    unmap_parser.add_argument('name', type=str, nargs=1, help='volume/device name')
+    unmap_parser.set_defaults(func=vlmc_unmap)
+    unmap_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    showmapped_parser = subparsers.add_parser('showmapped', help='Show mapped volumes')
+    showmapped_parser.set_defaults(func=vlmc_showmapped)
+    showmapped_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    list_parser = subparsers.add_parser('list', help='List volumes')
+    list_parser.set_defaults(func=vlmc_list)
+    list_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    ls_parser = subparsers.add_parser('ls', help='List volumes')
+    ls_parser.set_defaults(func=vlmc_list)
+    ls_parser.add_argument('-p', '--pool', type=str, nargs='?', help='for backwards compatiblity with rbd')
+
+    args = parser.parse_args()    
+
+    #FIXME
+    try:
+        if args.config == None:
+            execfile(os.path.expanduser("~/.xsegrc"))
+        else:
+            execfile(args.config)
+    except:
+        pass
+
+    args.func(args)
index a887e66..32049e9 100755 (executable)
@@ -5,15 +5,25 @@
 
 source "`dirname $0`/helpers.sh"
 
-[ -n "${1}" ] && usage
+[ -n "${1}" ] || usage "[blockd | filed]"
 
 parse_config
 
 if [ `basename "$0"` == "xseg_setup.sh" ]
 then
        load_all
+
+       if [ "${1}" == "filed" ]
+       then
+               spawn_filed ${IMAGES} ${FILED_PORT}
+       fi
 elif [ `basename "$0"` == "xseg_cleanup.sh" ]
 then
+       if [ "${1}" == "filed" ]
+       then
+               pkill filed
+       fi
+
        unload_all
 fi