vagrant-g5k 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaeed73b05202f3f4877d8b66401981199f0cafb
-  data.tar.gz: 91014ed7c211013ce70fb7fc6fa58bd77cd9d336
+  metadata.gz: 4bb98de93c858a960bbdbc3918b688c7c053b642
+  data.tar.gz: 4f05183a56b167b8bb535e91646e386c4fd58463
 SHA512:
-  metadata.gz: 0b0874066b83dfc35b9ff5fed4eedbe9a4746266c43d24f40a1aa5db8ca3821d5b4857b5bc119657f4e727dd4312c0837d881d346f6f346579635ea16653e466
-  data.tar.gz: 5ad397d2195e17abac2199953ced8b7674823cecec82084fd8dd5f9e5c804b7371cfa53a5287da4a78a077330721c6cf5066454b66ddb1d17a541ae153ed6a4e
+  metadata.gz: 4d1dd22b192c8eff2c6a77991ce555bf877b1c6970bd9f43721e960dc473a0f68459a5f699f2456285edf50d3b9a9ca8b5d654c38de130bacf9f11283bfda8dd
+  data.tar.gz: f326dc3f70a5b63ced19f3d8562ae8e8b8c72e786e2b498d1e9f6ca8f5e75bb78b7572c11af0496c70976248c37fafc83be867b977d62cba3777738fc73372f7

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+# 0.0.15
+
+  * Allow parallel boot
+
 # 0.0.14
 
-  * current
+  * Add custom oar properties
+  * Display the name of the node
 
 # 0.0.13
 

data/Vagrantfile

@@ -3,69 +3,52 @@
 #
 # Testing purpose only
 #Vagrant.require_plugin "vagrant-g5k"
+NB_G5K=1
+NB_IGRIDA=1
 
 Vagrant.configure(2) do |config|
-    # box isn't used
-    config.vm.define "vm" do |my|
-      my.vm.box = "dummy"
-    end
+    (0..NB_G5K-1).each do |i|
+      config.vm.define "vm-g5k-#{i}" do |my|
+        my.vm.box = "dummy"
+
+        my.ssh.username = "root"
+        my.ssh.password = ""
+
+        my.vm.provider "g5k" do |g5k|
+          g5k.project_id = "vagrant-g5k"
+          g5k.site = "nancy"
+          g5k.gateway = "access.grid5000.fr" 
+          g5k.image = { 
+             "pool"     => "msimonin_rbds",
+             "rbd"      => "bases/alpine_docker",
+             "snapshot" => "parent",
+             "id"       => "$USER",
+             "conf"     => "$HOME/.ceph/config",
+             "backing"  => "snapshot"
+           }
+          g5k.ports = ['2222-:22']
+        end #g5k
+      end #vm
+    end # each
+
+
+    (0..NB_IGRIDA-1).each do |i|
+      config.vm.define "vm-igrida-#{i}" do |my|
+        my.vm.box = "dummy"
+
+        my.vm.provider "g5k" do |g5k|
+          g5k.project_id = "vagrant-g5k"
+          g5k.site = "igrida-oar-frontend"
+          g5k.gateway = "transit.irisa.fr" 
+          g5k.image = { 
+            "path" => "/udd/msimonin/precise.qcow2",
+            "backing" => "snapshot"
+           }
+          g5k.ports = ['2222-:22']
+        end #g5k
+      end # vm
+    end # each
 
-    # user to log with inside the vm
-    config.ssh.username = "root"
-    # password to use to log inside the vm 
-    config.ssh.password = ""
-    
-    config.vm.provider "g5k" do |g5k|
-      # The project id. 
-      # It is used to generate uniq remote storage for images
-      # It must be uniq accros all project managed by vagrant.
-      g5k.project_id = "vagrant-g5k"
-
-      # user name used to connect to g5k
-      # default to ENV["USER"]
-      # g5k.username = "john"
-
-      # private key to use
-      # g5k.private_key = File.join(ENV['HOME'], ".ssh/id_rsa_discovery")
-
-      # site to use
-      # g5k.site = "igrida-oar-frontend"
-      g5k.site = "rennes"
-
-      # gateway to use (if needed)
-      g5k.gateway = "access.grid5000.fr" 
-      # g5k.gateway = "transit.irisa.fr"
-
-      # walltime to use
-      # g5k.walltime = "02:00:00" 
-
-      # image location 
-      #g5k.image = {
-      #  "path" => "/udd/msimonin/precise.qcow2",
-      #  "backing" => "copy"
-      #}
-
-      # it could be backed by the ceph
-      g5k.image = { 
-         "pool"     => "msimonin_rbds",
-         "rbd"      => "bases/alpine_docker",
-         "snapshot" => "parent",
-         "id"       => "$USER",
-         "conf"     => "$HOME/.ceph/config",
-         "backing"  => "snapshot"
-       }
-
-      # ports to expose (at least ssh has to be forwarded)
-      g5k.ports = ['2222-:22']
-
-      # Custom oar ressource filtering
-      # This may be specific on the oar ressource declaration 
-      # of the used platform
-      # g5k.oar = "virtual != 'none'"
-    end
-
-
-     
 end
 
 

data/lib/vagrant-g5k/action/connect_g5k.rb

@@ -1,31 +1,69 @@
 require "log4r"
 require "vagrant-g5k/util/g5k_utils"
+require "vagrant-g5k/driver"
+require 'thread'
+
 
 module VagrantPlugins
   module G5K
+
+    class << self
+      attr_accessor :g5k_lock
+      attr_accessor :pool
+    end
+    @g5k_lock = Mutex.new
+    @pool = {}
+
     module Action
       # This action connects to G5K, verifies credentials work, and
       # puts the G5K connection object into the `:g5k_connection` key
       # in the environment.
       class ConnectG5K
+
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant_g5k::action::connect_g5k")
         end
 
         def call(env)
-          # This is a hack to make the connection persistent
-          # even after environment unload is called
-          if Connection.instance.nil?
-            @logger.debug("Creating new connection")
-            env[:g5k_connection] = Connection.new(env)
-          else
-            @logger.debug("Reusing connection")
-            env[:g5k_connection] = Connection.instance
-          end
-
+          driver = _get_driver(env)
+          env[:g5k_connection] = Connection.new(env, driver)
           @app.call(env)
         end
+
+        # get a session object to use to connect to the oar scheduler
+        # this connection is share for all actions on the same vm
+        def _get_driver(env)
+          provider_config = env[:machine].provider_config 
+          gateway = provider_config.gateway
+          site = provider_config.site
+          username = provider_config.username
+          private_key = provider_config.private_key
+          #key = "#{env[:machine].name}"
+          key = "#{gateway}-#{site}-#{username}"
+          options = {
+            :forward_agent => true
+          }
+          options[:keys] = [private_key] if !private_key.nil?
+          VagrantPlugins::G5K.g5k_lock.synchronize {
+            if VagrantPlugins::G5K.pool[key].nil?
+              @logger.debug "Creating a new session object for #{key}"
+              if gateway.nil?
+                @logger.debug("connecting with #{username} on site #{site}")
+                session = Net::SSH.start(site, username, options)
+              else
+                @logger.debug("connecting with #{username} on site #{site} through #{gateway} with options #{options}")
+                gateway = Net::SSH::Gateway.new(gateway, username, options)
+                session = gateway.ssh(site, username, options)
+              end
+              VagrantPlugins::G5K.pool[key] = VagrantPlugins::G5K::Driver.new(session, Mutex.new)
+            else
+              @logger.debug "Reusing existing session for #{key}"
+            end
+          }
+          return VagrantPlugins::G5K.pool[key]
+        end
       end
     end
   end

data/lib/vagrant-g5k/driver.rb

@@ -0,0 +1,58 @@
+require "log4r"
+
+module VagrantPlugins
+  module G5K
+    class Driver
+      def initialize(session, lock)
+        @logger   = Log4r::Logger.new("vagrant::g5k::driver")
+        @lock = lock
+        @session = session
+      end
+
+      def exec(cmd)
+        @logger.debug("Executing #{cmd}")
+        stdout = ""
+        stderr = ""
+        exit_code = 0
+        @lock.synchronize{
+          @session.open_channel do |channel|
+            channel.exec(cmd) do |ch, success|
+              abort "could not execute command" unless success
+
+              channel.on_data do |c, data|
+                stdout << data.chomp
+              end
+
+              channel.on_extended_data do |c, type, data|
+                stderr << data.chomp
+              end
+
+              channel.on_request("exit-status") do |c,data|
+                exit_code = data.read_long
+              end
+
+              channel.on_close do |c|
+              end
+            end
+          end
+          @session.loop
+          if exit_code != 0
+            @logger.error(:stderr => stderr, :code => exit_code)
+            raise VagrantPlugins::G5K::Errors::CommandError
+          end
+          @logger.debug("Returning #{stdout}")
+        }
+        stdout
+ 
+      end
+
+      def upload(src, dst)
+        @lock.synchronize {
+          @session.scp.upload!(src, dst)
+       }
+      end
+
+    end
+  end
+end
+

data/lib/vagrant-g5k/plugin.rb

@@ -24,7 +24,7 @@ module VagrantPlugins
         Config
       end
 
-      provider(:g5k) do
+      provider(:g5k, parallel: true) do
         # Setup logging and i18n
         setup_logging
         setup_i18n

data/lib/vagrant-g5k/util/g5k_utils.rb

@@ -2,6 +2,7 @@ require 'net/ssh/multi'
 require 'net/scp'
 require 'json'
 require 'digest'
+require 'thread'
 
 require 'vagrant/util/retryable'
 
@@ -35,20 +36,11 @@ module VagrantPlugins
 
       attr_accessor :node
       
-      attr_accessor :pool
-
       attr_accessor :ports
 
       attr_accessor :oar
-
-      @@instance = nil
-
-      def self.instance
-        @@instance
-      end
-
-
-      def initialize(env)
+    
+      def initialize(env, driver)
         # provider specific config
         @provider_config = env[:machine].provider_config 
         @username = @provider_config.username
@@ -66,23 +58,13 @@ module VagrantPlugins
         @ui = env[:ui]
 
         @logger = Log4r::Logger.new("vagrant::environment")
-        options = {
-          :forward_agent => true
-        }
-        options[:keys] = [@private_key] if !@private_key.nil?
-        if @gateway.nil?
-          @logger.debug("connecting with #{@username} on site #{@site}")
-          @session = Net::SSH.start(@site, @username, options)
-        else
-          @logger.debug("connecting with #{@username} on site #{@site} through #{@gateway}")
-          gateway = Net::SSH::Gateway.new(@gateway, @username, options)
-          @session = gateway.ssh(@site, @username, options)
-        end
-        @@instance = self
+        @driver = driver
+
       end
 
+
       def create_local_working_dir(env)
-        @session.exec("mkdir -p #{cwd(env)}")
+        exec("mkdir -p #{cwd(env)}")
       end
 
       def cwd(env)
@@ -205,48 +187,18 @@ module VagrantPlugins
       end
 
       def close()
-        # Terminate the session
-        @session.close
+        # Terminate the driver
+        @driver[:session].close
       end
 
 
 
       def exec(cmd)
-        @logger.debug("Executing #{cmd}")
-        stdout = ""
-        stderr = ""
-        exit_code = 0
-        @session.open_channel do |channel|
-          channel.exec(cmd) do |ch, success|
-            abort "could not execute command" unless success
-
-            channel.on_data do |c, data|
-              stdout << data.chomp
-            end
-
-            channel.on_extended_data do |c, type, data|
-              stderr << data.chomp
-            end
-
-            channel.on_request("exit-status") do |c,data|
-              exit_code = data.read_long
-            end
-
-            channel.on_close do |c|
-            end
-          end
-        end
-        @session.loop
-        if exit_code != 0
-          @logger.error(:stderr => stderr, :code => exit_code)
-          raise VagrantPlugins::G5K::Errors::CommandError
-        end
-        @logger.debug("Returning #{stdout}")
-        stdout
-      end
+        @driver.exec(cmd)
+     end
 
       def upload(src, dst)
-        @session.scp.upload!(src, dst)
+        @driver.upload(src, dst)
       end
 
       def _generate_drive(env)

data/lib/vagrant-g5k/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module G5K
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

data/lib/vagrant-g5k.rb

@@ -1,9 +1,11 @@
 require "pathname"
 
 require "vagrant-g5k/plugin"
+require 'thread'
 
 module VagrantPlugins
   module G5K
+
     lib_path = Pathname.new(File.expand_path("../vagrant-g5k", __FILE__))
     autoload :Action, lib_path.join("action")
     autoload :Errors, lib_path.join("errors")
@@ -14,5 +16,6 @@ module VagrantPlugins
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-g5k
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Matthieu Simonin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iniparse
@@ -143,6 +143,7 @@ files:
 - lib/vagrant-g5k/action/run_instance.rb
 - lib/vagrant-g5k/command.rb
 - lib/vagrant-g5k/config.rb
+- lib/vagrant-g5k/driver.rb
 - lib/vagrant-g5k/errors.rb
 - lib/vagrant-g5k/plugin.rb
 - lib/vagrant-g5k/provider.rb