vagrant-g5k 0.0.18 → 0.9.0

data/lib/vagrant-g5k/g5k_connection.rb

@@ -0,0 +1,144 @@
+require 'net/ssh/multi'
+require 'net/scp'
+require 'json'
+require 'digest'
+require 'thread'
+
+require 'vagrant/util/retryable'
+
+LAUNCHER_SCRIPT = "util/launch_vm.sh"
+
+STRATEGY_SNAPSHOT = "snapshot"
+STRATEGY_COPY = "copy"
+STRATEGY_COW = "cow"
+STRATEGY_DIRECT = "direct"
+
+module VagrantPlugins
+  module G5K
+    class Connection
+      include Vagrant::Util::Retryable
+      include VagrantPlugins::G5K
+
+      def initialize(env, cwd, driver, oar_driver, net_driver, disk_driver)
+        @logger = Log4r::Logger.new("vagrant::g5k_connection")
+        @ui = env[:ui]
+
+        @provider_config = env[:machine].provider_config 
+        @site = @provider_config.site
+        @walltime = @provider_config.walltime
+        @image= @provider_config.image
+        @oar = "{#{@provider_config.oar}}/" if @provider_config.oar != ""
+
+        @cwd = cwd
+        @driver = driver
+        @oar_driver = oar_driver
+        @net_driver = net_driver
+        @disk_driver = disk_driver
+      end
+
+
+      def create_local_working_dir()
+        exec("mkdir -p #{@cwd}")
+      end
+
+      def check_job(job_id)
+        @oar_driver.check_job(job_id)
+      end
+
+      def check_net(job_id)
+        @net_driver.check_state(job_id)
+      end
+
+      def vm_ssh_info(vmid)
+        @net_driver.vm_ssh_info(vmid)
+      end
+
+      def delete_job(job_id)
+        @ui.info("Soft deleting the associated job")
+        begin
+          @oar_driver.delete_job(job_id, ["-c", "-s 12"])
+        rescue VagrantPlugins::G5K::Errors::CommandError
+          @logger.debug "Checkpointing failed, sending hard deletion"
+          @ui.warn("Soft delete failed : proceeding to hard delete")
+          @oar_driver.delete_job(job_id)
+        ensure
+          @net_driver.detach()
+        end
+      end
+
+      def check_storage(env)
+        # Is the disk image already here ?
+        file = @disk_driver.check_storage()
+        return file if file != ""
+        return nil
+      end
+
+      def launch_vm(env)
+        launcher_path = File.join(File.dirname(__FILE__), LAUNCHER_SCRIPT)
+        @ui.info("Launching the VM on #{@site}")
+        # Checking the subnet job
+        # uploading the launcher
+        launcher_remote_path = File.join(@cwd, File.basename(LAUNCHER_SCRIPT))
+        upload(launcher_path, launcher_remote_path)
+
+        # Generate partial arguments for the kvm command
+        # NOTE: net is first due the the shape of the bridge launcher script
+        net = @net_driver.generate_net()
+        drive = _generate_drive(env)
+        
+        args = [net, drive].join(" ")
+        # Submitting a new job
+        # Getting the job_id as a ruby string
+        options = [
+          "-t allow_classic_ssh",
+          "-l \"#{@oar}nodes=1, walltime=#{@walltime}\"",
+          "--name #{env[:machine].name}",
+          "--checkpoint 60",
+          "--signal 12"
+        ]
+        job_id = @oar_driver.submit_job("#{launcher_remote_path} #{args}", options)
+        # saving the id asap
+        env[:machine].id = job_id
+        wait_for_vm(job_id)
+      end
+     
+      def wait_for_vm(job_id)
+        @oar_driver.wait_for(job_id)
+        @net_driver.attach()
+        @ui.info("ready @#{@site}")
+      end
+
+
+      def delete_disk(env)
+        if [STRATEGY_DIRECT, STRATEGY_SNAPSHOT].include?(@image[:backing])
+          @ui.error("Destroy not support for the strategy #{@image[:backing]}")
+          return
+        end
+        @disk_driver.delete_disk()
+      end
+
+      def exec(cmd)
+        @driver.exec(cmd)
+      end
+
+      def upload(src, dst)
+        @driver.upload(src, dst)
+      end
+
+      def _generate_drive(env)
+        # Depending on the strategy we generate the file location
+        # This code smells a bit better 
+        file = ""
+        snapshot = ""
+        if @image[:backing] == STRATEGY_SNAPSHOT
+          snapshot = "-snapshot"
+        end
+        file = @disk_driver.generate_drive()
+      
+        return "-drive file=#{file},if=virtio #{snapshot}"
+      end
+
+    end
+  end
+end
+

data/lib/vagrant-g5k/network/bridge.rb

@@ -0,0 +1,115 @@
+require 'log4r'
+
+module VagrantPlugins
+  module G5K
+    module Network
+
+      class Bridge
+      
+        include VagrantPlugins::G5K
+
+        def initialize(env, driver, oar_driver)
+          @logger = Log4r::Logger.new("vagrant::network::bridge")
+          # command driver is unused
+          @driver = driver
+          @oar_driver = oar_driver
+          @net = env[:machine].provider_config.net
+          @project_id = env[:machine].provider_config.project_id
+          @walltime = env[:machine].provider_config.walltime
+        end
+
+        def generate_net()
+          lockable(:lock => VagrantPlugins::G5K.subnet_lock) do
+            subnet_job_id = _find_subnet
+            if subnet_job_id.nil? 
+              subnet_job_id = _create_subnet
+              @oar_driver.wait_for(subnet_job_id)
+              # we can't call this inside the launcher script
+              # let's put it in a file instead...
+              @driver.exec("g5k-subnets -j #{subnet_job_id} -im > #{_subnet_file}" )
+              # initialize subnet count
+              @driver.exec("echo 0 > #{_subnet_count}")
+            end
+          return "BRIDGE #{_subnet_file}"
+          end
+        end
+      
+        def check_state(job_id)
+          subnet_job_id = _find_subnet()
+          return :subnet_missing if subnet_job_id.nil?
+          nil
+        end
+
+        def attach()
+          _update_subnet_use("+")
+        end
+
+        def detach()
+          _update_subnet_use("-")
+        end
+
+        def vm_ssh_info(vmid)
+          subnet = @driver.exec("cat  #{_subnet_file}" )
+                        .split("\n")
+                        .map{|macip| macip.split("\t")}
+          # recalculate ip given to this VM
+          macip = subnet[vmid.to_i.modulo(1022)]
+          return {
+            :host => macip[0]
+          }
+        end
+
+
+        def _cwd()
+          # remote working directory
+          File.join(".vagrant", @project_id)
+        end
+
+
+        def _create_subnet()
+          options = []
+          options << "--name '#{@project_id}-net'"
+          options << "-l 'slash_22=1, walltime=#{@walltime}'"
+          @oar_driver.submit_job('sleep 84400', options )
+        end
+
+        def _subnet_file()
+          return File.join(_cwd(), 'subnet')
+        end
+
+        def _subnet_count()
+          return File.join(_cwd(), 'subnet-count')
+        end
+
+        def _find_subnet()
+          job = @oar_driver.look_by_name("#{@project_id}-net")
+          return job["Job_Id"] unless job.nil?
+          nil
+        end
+
+        # Update the subnet use 
+        # op is a string "+" or "-"
+        # if after the update the subnet use is 0 
+        # the subnet in use is also deleted 
+        def _update_subnet_use(op)
+          cmd = []
+          cmd << "c=$(cat #{_subnet_count});"
+          cmd << "echo $(($c #{op} 1)) > #{_subnet_count};"
+          cmd << "cat #{_subnet_count}"
+          count = @driver.exec(cmd.join(" "))
+          @logger.info("subnet_count = #{count}")
+          if count.to_i <= 0 
+            @logger.info("deleteting the associated subnet")
+            subnet_id = _find_subnet()
+            @oar_driver.delete_job(subnet_id)
+
+          end
+
+        end
+
+      end
+    end
+  end
+end
+
+  

data/lib/vagrant-g5k/network/nat.rb

@@ -0,0 +1,65 @@
+require 'log4r'
+
+module VagrantPlugins
+  module G5K
+    module Network
+
+      class Nat
+
+        def initialize(env, driver, oar_driver)
+          @logger = Log4r::Logger.new("vagrant::network::nat")
+          # command driver is unused
+          @env = env
+          @driver = driver
+          @oar_driver = oar_driver
+          @net = env[:machine].provider_config.net
+        end
+
+        def generate_net()
+          fwd_ports = @net[:ports].map do |p|
+            "hostfwd=tcp::#{p}"
+          end.join(',')
+          net = "-net nic,model=virtio -net user,#{fwd_ports}"
+
+          @logger.debug("Generated net string : #{net}")
+          return "NAT #{net}"
+        end
+
+        def check_state(job_id)
+          return nil
+        end
+
+        def attach()
+          # noop
+        end
+
+        def detach()
+          # noop
+        end
+
+        def vm_ssh_info(vmid)
+          # get forwarded port 22
+          ports = @net[:ports]
+          ssh_fwd = ports.select{ |x| x.split(':')[1] == '22'}.first
+          if ssh_fwd.nil?
+            env[:ui].error "SSH port 22 must be forwarded"
+            raise Error "SSh port 22 isn't forwarded"
+          end
+          ssh_fwd = ssh_fwd.split('-:')[0]
+          # get node hosting the vm
+          job = @oar_driver.check_job(@env[:machine].id)
+          ssh_info =  {
+            :host => job["assigned_network_address"].first,
+            :port => ssh_fwd
+          }
+          @logger.debug(ssh_info)
+          ssh_info
+        end
+
+
+      end
+    end
+  end
+end
+
+  

data/lib/vagrant-g5k/oar.rb

@@ -0,0 +1,90 @@
+require 'log4r'
+
+module VagrantPlugins
+  module G5K
+    class Oar
+  
+      include Vagrant::Util::Retryable
+
+      attr_accessor :driver
+
+      def initialize(ui, driver)
+        @logger = Log4r::Logger.new("vagrant::environment")
+        @driver = driver
+        @ui = ui
+      end
+      
+      def submit_job(cmd, options)
+        # prefix by the oarsub command
+        opt = _build_oar_cmd(options)
+        # get the job id returned by the command
+        extra = ["| grep \"job_id\"| cut -d':' -f2"]
+        cmd = ["oarsub --json", opt,"\'#{cmd}\'" , extra].join(" ")
+        @driver.exec(cmd).gsub(/"/,"").strip.to_i
+      end
+
+      def delete_job(job_id, options = [])
+        cmd = _build_oar_cmd(options)
+        cmd = ["oardel", cmd, job_id].join(" ")
+        @driver.exec(cmd) 
+      end
+
+      def check_job(job_id)
+        cmd = ['oarstat']
+        cmd << "--json"
+        cmd << "-j #{job_id}"
+        cmd = cmd.join(" ")
+        job = @driver.exec(cmd)
+        JSON.load(job)["#{job_id}"]
+      end
+
+      def look_by_name(job_name)
+        begin
+          jobs = @driver.exec("oarstat -u --json")
+          jobs = JSON.load(jobs)
+          s = jobs.select{|k,v| v["name"] == "#{job_name}" }.values.first
+          return s
+        rescue Exception => e
+          @logger.debug(e)
+        end
+        nil
+      end
+     
+      def wait_for(job_id)
+        job = nil
+        begin
+          retryable(:on => VagrantPlugins::G5K::Errors::JobNotRunning, :tries => 100, :sleep => 1) do
+            job = check_job(job_id)
+            if !job.nil? and ["Error", "Terminated"].include?(job["state"])
+              _process_errors(job_id)
+            end
+            if job.nil? or (!job.nil? and job["state"] != "Running")
+              @ui.info("Waiting for the job to be running")
+              raise VagrantPlugins::G5K::Errors::JobNotRunning 
+            end
+            break
+          end
+        rescue VagrantPlugins::G5K::Errors::JobNotRunning
+          @ui.error("Tired of waiting")
+          raise VagrantPlugins::G5K::Errors::JobNotRunning
+        end
+        return job
+      end
+
+      def _build_oar_cmd(options)
+        options.join(" ")
+      end
+
+      def _process_errors(job_id)
+        job = check_job(job_id)
+        stderr_file = job["stderr_file"]
+        stderr = exec("cat #{stderr_file}")
+        @ui.error("#{stderr_file}:  #{stderr}")
+        raise VagrantPlugins::G5K::Errors::JobError
+      end
+
+
+    end
+  end
+end
+

data/lib/vagrant-g5k/util/{launch_vm_fwd.sh → launch_vm.sh}

@@ -1,11 +1,41 @@
 #!/bin/bash
 
-# This script is borrowed from pmorrillon.
+# This script is originally borrowed to pmorillo
 # Thanks to him !
+# I've made some addition though :) 
+
+# 
+
+
+function net_bridge() {
+  SUBNET_FILE=$1
+  # As we chose a stateless designe,let's calculate here the ip and mac
+  # assuming we got a slash_22
+  ipnumber=$(($OAR_JOB_ID % 1022))
+  IP_MAC=$(cat $SUBNET_FILE|head -n $((ipnumber + 1))|tail -n 1)
+  IP_ADDR=$(echo $IP_MAC|awk '{print $1}')
+  MAC_ADDR=$(echo $IP_MAC|awk '{print $2}')
+
+  # create tap
+  TAP=$(sudo create_tap)
+
+  # return the specific net string of the kvm command
+  echo "-net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no"
+}
+
+net=""
+if [ "$1" == "BRIDGE" ]
+then
+  shift
+  net=$(net_bridge $@)
+  echo $(hostname)
+  echo $net
+  shift
+else
+  shift
+  net=""
+fi
 
-#OAR -l slash_22=1+{virtual!='none'}/nodes=1,walltime=06:00:00
-#OAR --checkpoint 60
-#OAR --signal 12
 
 # Directory for qcow2 snapshots
 export TMPDIR=/tmp
@@ -28,7 +58,7 @@ trap clean_shutdown 12
 
 # Launch virtual machine
 #kvm -m $VM_MEM -smp $SMP -drive file=$IMAGE,if=virtio -snapshot -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -net nic,model=virtio,macaddr=$MAC_ADDR -net tap,ifname=$TAP,script=no -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm &
-kvm -m $VM_MEM -smp $SMP -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm $@ &
+kvm -m $VM_MEM -smp $SMP -fsdev local,security_model=none,id=fsdev0,path=$HOME -device virtio-9p-pci,id=fs0,fsdev=fsdev0,mount_tag=hostshare -nographic -monitor unix:/tmp/vagrant-g5k.mon,server,nowait -localtime -enable-kvm $net $@ &
 
 wait