drbd 0.1.7 → 0.1.8

data/README.rdoc

@@ -25,11 +25,17 @@ Ruby wrapper for DRBD
 
 
 == How it works
-- simply fetch data from remote host
+- you can connect to remote node with hostname, login will be executed with current user and his key
 
   <tt>d = Drbd.new("fqdn.domain.tld")</tt>
 
-  you can specify command to be executed 
+  or you can "recycle" existing Net::SSH session to improve performance:
+
+  <tt>ssh = Net:SSH.start("fwdn.domain.tld", "root", :password => 'secret')</tt>
+
+  <tt>d = Drbd.new(ssh)</tt>
+  
+  specify command to be executed: 
 
   <tt>d = Drbd.new("fqdn.domain.tld", :command => 'sudo /sbin/drbdadm')</tt>
 
@@ -55,6 +61,20 @@ Ruby wrapper for DRBD
 
   <tt>r.down!</tt>
 
+- analyze actual state
+
+  <tt>r.resync_running?</tt>
+
+  <tt>r.consistent?</tt>
+
+  <tt>r.connected?</tt>
+
+  <tt>r.down?</tt>
+
+  <tt>r.primary?</tt>
+
+  <tt>r.secondary?</tt>
+
 - get resource name
   
   <tt>r.name</tt>
@@ -67,15 +87,13 @@ Ruby wrapper for DRBD
   
   <tt>r.hosts</tt>
 
-- get status for resource
-  
-  <tt>r.status</tt>
-
 - get node addresses
   
   <tt>r.hosts.map{|h| h.address }</tt>
 
-- get status
+- get status for resource
+  
+  <tt>r.status</tt>
   
   resource status is hash with keys:
   
@@ -135,11 +153,10 @@ Ruby wrapper for DRBD
 
 == TODO
 
-* Replace IO.popen("ssh ...") with native ruby net/ssh
 * Add states to actions (analyze exit status)
 * Test suite
 
 
 == Copyright
 
-Copyright (c) 2011 Adam Kliment. See LICENSE for details.
+Copyright (c) 2011 Adam Kliment, Virtualmaster.cz. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/drbd.rb

@@ -1,35 +1,89 @@
 require 'rubygems'
 require 'nokogiri'
+require 'net/ssh'
 class DRBD
-  attr_reader :resources, :host, :command
+  attr_reader :resources, :connection, :command
 
   def initialize host, opts = {}
+    connect host
     parse_opts opts
-    @host = host
     load!
   end
 
+  def connect host
+    if host.class == String
+      @connection = Net::SSH.start(host, ENV['USER'])
+    elsif host.class == Net::SSH::Connection::Session
+      @connection = host
+    else
+      raise "Connection must be String with hostname or Net::SSH::Connection::Session object but it is #{host.class}."
+    end
+  end
   def parse_opts opts
     opts[:command].nil? ? @command = "sudo /sbin/drbdadm" : @command = opts[:command]
   end
 
+  def ssh_output(command)
+    stdout = ""
+    stderr = ""
+    channel = @connection.open_channel do |ch|
+      ch.exec(command) do |ch, success|
+        raise "could not execute command" unless success
+
+        # "on_data" is called when the process writes something to stdout
+        ch.on_data do |c, data|
+         stdout << data
+        end
+
+        # "on_extended_data" is called when the process writes something to stderr
+        ch.on_extended_data do |c, type, data|
+          stderr << data
+        end
+        #ch.on_close { puts "done!" }
+      end
+    end
+    channel.wait
+    #puts stderr
+    return stdout
+  end
+
+  def ssh_exec(command)
+    exit_status = nil
+    channel = @connection.open_channel do |ch|
+      ch.exec command
+
+      ch.on_data do |c, data|
+        puts data
+      end
+      ch.on_extended_data do |c, type, data|
+        puts data
+      end
+
+      ch.on_request("exit-status") do |ch, data|
+        exit_status = data.read_long
+      end
+    end
+    channel.wait
+
+    if exit_status > 0
+      return exit_status
+    else
+      return true
+    end  
+  end  
+
   def load!
     load_resources!
     load_status!
   end
 
   def load_resources!
-    io = IO.popen("ssh #{@host} \"#{@command} dump-xml\"")
-    xml = io.readlines.join("\n")
-    io.close
+    xml = ssh_output("#{@command} dump-xml")
     @resources = Resource.load_config(xml, self)
   end
 
   def load_status!
-    io = IO.popen("ssh #{@host} \"#{@command} status\"")
-    xml = io.readlines.join("\n")
-    io.close
-
+    xml = ssh_output("#{@command} status")
     statuses = Status.new(xml).resources
     set_resources_status statuses
   end
@@ -116,16 +170,26 @@ class DRBD
         args = "primary #{self.name}"
       end
 
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
 
+
     def secondary!
       args = "-- --overwrite-data-of-peer secondary #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
+      drbd.load_status!
+      nil
+    end
+
+    def syncer!
+      args = "syncer #{self.name}"
+
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
@@ -136,55 +200,55 @@ class DRBD
 
     def connect!
       args = "connect #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
 
     def disconnect!
       args = "disconnect #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
 
     def resize!
       args = "-- --assume-peer-has-space resize #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
     end
     
     def attach!
       args = "attach #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
 
     def detach!
       args = "detach #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
     
     def up!
       args = "up #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
     
     def down!
       args = "down #{self.name}"
-      command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-      system(command)
+      command = "#{drbd.command} #{args}"
+      self.drbd.ssh_exec(command)
       drbd.load_status!
       nil
     end
@@ -192,8 +256,8 @@ class DRBD
     def init_metadata!
       if self.down?
         args = "-- --force create-md #{self.name}"
-        command = "ssh #{drbd.host} \"#{drbd.command} #{args}\""
-        system(command)
+        command = "#{drbd.command} #{args}"
+        self.drbd.ssh_exec(command)
         return true
       else
         return false
@@ -238,8 +302,6 @@ class DRBD
         r
       end
     end
-    
-    
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: drbd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Adam Kliment
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +01:00
+date: 2011-02-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency