smartos-manager 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459e0cd7f79202dc121bf3cd7ba3aeb2d7c71a8f
-  data.tar.gz: 5c48f58ca43f669dfe5c54d25e03a55add060598
+  metadata.gz: 1abebbf74ccc23b8ece6cf0f8ffef49fd9f42dde
+  data.tar.gz: 2f94fb21b2fb5c4402124e4f7fea5c422787aa65
 SHA512:
-  metadata.gz: 6f70d8f7e1bb6b5a52c88933911699837dae91425da69ae0776fd2e5ca21ffd56da4c97ddfb97eca383f30604acfab274ba9d7a00f025c5f4203952ed1a1ef3a
-  data.tar.gz: 0d003bc12d776a841d2b4c4d93591720f784e3624fd1c49900521070cfdfad447d5d19b707683af356eef57d6ecbcb1c6256fb47eef1fb9c0d30f632c543bb20
+  metadata.gz: 3282a3f79b65c4cf123311726b887251b26d93883c75d124e25f67e6b31b0b7f89b727310ee7e73945d2948dcbc9b2c34e29da04e97ec8d8e8bc99984a0e6c06
+  data.tar.gz: c61f046db1c6f5813ee34601c9e90152dd0ae37ae37340b451d9899af01900056d2816634f8e9e8586d9284d2f859839e1f9e7c384d6b20aa559ea91c5da48ce

data/lib/smartos-manager/cli.rb

@@ -2,6 +2,7 @@
 require File.expand_path('../core', __FILE__)
 require 'thor'
 require 'colored'
+require 'oj'
 
 
 class ColorPicker
@@ -19,9 +20,25 @@ end
 
 class AppCLI < Thor
   
+  class_option :cache, desc: "Use cached data", default: false, type: :boolean
+  
+  no_tasks {
+    def get_registry(path = 'smartos_hosts.toml', **args)
+      if options[:cache] == false
+        begin
+          return SSHRegistry.new(path, **args)
+        rescue Errno::ENETUNREACH
+          puts "SSH error, falling back to cached data"
+        end
+      end
+      
+      CachedRegistry.new(path, **args)
+    end
+  }
+  
   desc "list_images", "List images available"
   def list_images
-    registry = HostRegistry.new('smartos_hosts.toml')
+    registry = get_registry(cache_key: 'list_images')
     ret = registry.list_images()
     
     rev_colors = ColorPicker.new
@@ -38,7 +55,7 @@ class AppCLI < Thor
   
   desc "list", "List all vms"
   def list
-    registry = HostRegistry.new('smartos_hosts.toml')
+    registry = get_registry(cache_key: 'list')
     ret = registry.list_vms()
     
     rev_colors = ColorPicker.new

data/lib/smartos-manager/core.rb

@@ -77,73 +77,50 @@ class Image
   end
 end
 
-class HostRegistry
+
+class Registry
+  LIST_COLUMNS = %w(
+    uuid
+    type
+    ram
+    state
+    alias
+    nics.0.ip
+  )
+
   attr_reader :user_columns
-  
-  def initialize(path)
+
+  def initialize(path, cache_key:)
     @registry = {}
-    @gateways = {}
     @hosts = {}
+    @config_path = path
+    @cache_path = "#{path}.cache"
+    @cache = load_cache()
+    @cache_key = cache_key
     
-    @connection = Net::SSH::Multi.start()
-    
-    data = TOML.load_file(path)
+    @config = TOML.load_file(path)
     
-    global_data = data.delete('global')
-    user_columns = data.delete('user_columns') || {}
+    @global_data = @config.delete('global')
+    @user_columns = @config.delete('user_columns') || {}
     
-    data.each do |name, opts|
-      host = SSHHost.from_hash(name, opts, global_data)
-      
+    @config.each do |name, opts|
+      host = SSHHost.from_hash(name, opts, @global_data)
       @hosts[host.address] = host
-      
-      @connection.use(host.address,
-          via: gateway_for(host.gateway, host.gateway_user),
-          # via: @gateways[host.gateway],
-          user: host.user,
-          timeout: 20,
-          compression: false
-        )
-      
-      # user defined columns
-      @user_columns = user_columns
     end
-    
   end
   
-  def run_on_all(cmd)
-    ret = {}
-    
-    # setthe keys in cas we get nothing back
-    @hosts.each do |_, h|
-      ret[h] = ""
-    end
-    
-    channel = @connection.exec(cmd) do |ch, stream, data|
-      host = @hosts[ch[:host]]
-      ret[host] << data
-    end
-    
-    channel.wait()
-    ret
+  def find_host(addr)
+    @hosts[addr]
   end
   
-  LIST_COLUMNS = %w(
-    uuid
-    type
-    ram
-    state
-    alias
-    nics.0.ip
-  )
-  
   def list_vms
     columns = LIST_COLUMNS + @user_columns.values
     
+    ret = {}
     rss = {}
     
     # Memory used for each VM
-    run_on_all("zonememstat").each do |host, data|
+    run_on_all("zonememstat").each do |_, data|
       data.split("\n").each do |line|
         # ignore headers / global
         unless line.start_with?('  ')
@@ -154,32 +131,33 @@ class HostRegistry
     end
     
     vms = run_on_all("vmadm list -o #{columns.join(',')} -p")
-    vms.each do |host, data|
+    vms.each do |addr, data|
+      host = find_host(addr)
       if data
-        vms[host] = data.split("\n").map! do |line|
-          data = {}
+        ret[host] = data.split("\n").map! do |line|
+          dd = {}
           line.split(':', 20).each.with_index do |val, n|
-            data[columns[n]] = val
+            dd[columns[n]] = val
           end
           
-          VirtualMachine.new(data, rss)
+          VirtualMachine.new(dd, rss)
         end
       else
-        vms[host] = []
+        ret[host] = []
       end
     end
     
+    ret
   end
   
-  
   def list_images
     ret = {}
     
     columns = %w(uuid name version os)
     
     images = run_on_all("imgadm list -j")
-    images.each do |host, data|
-      
+    images.each do |addr, data|
+      host = find_host(addr)
       json = JSON.parse(data)
       
       ret[host] = json.map do |img_data|
@@ -194,7 +172,8 @@ class HostRegistry
   def diag
     ret = {}
     
-    run_on_all("prtdiag").each do |host, data|
+    run_on_all("prtdiag").each do |addr, data|
+      host = find_host(addr)
       free_memory_banks = 0
       
       system_id = data.match(/^System Configuration: (.+)$/)[1]
@@ -215,18 +194,21 @@ class HostRegistry
     ret = {}
     
     # Memory size: 8157 Megabytes
-    run_on_all("prtconf | head -3 | grep Mem").each do |host, data|
+    run_on_all("prtconf | head -3 | grep Mem").each do |addr, data|
+      host = find_host(addr)
       _, _, mem, _ = data.split(" ")
       ret[host] = {memory: mem.to_i.megabytes}
     end
     
     # main MAC address
-    run_on_all("ifconfig e1000g0 | grep ether | cut -d ' ' -f 2").each do |host, data|
+    run_on_all("ifconfig e1000g0 | grep ether | cut -d ' ' -f 2").each do |addr, data|
+      host = find_host(addr)
       ret[host][:mac0] = data.strip()
     end
     
     # disk infos
-    run_on_all("diskinfo -Hp").each do |host, data|
+    run_on_all("diskinfo -Hp").each do |addr, data|
+      host = find_host(addr)
       ret[host][:disks] = {}
       
       data.split("\n").each do |line|
@@ -236,7 +218,8 @@ class HostRegistry
     end
     
     # disk size
-    run_on_all("zfs list -Ho name,quota,volsize").each do |host, data|
+    run_on_all("zfs list -Ho name,quota,volsize").each do |addr, data|
+      host = find_host(addr)
       ret[host][:zfs_volumes] = {}
       
       data.split("\n").each do |line|
@@ -248,7 +231,8 @@ class HostRegistry
     # ARC Max Size
     # zfs:0:arcstats:c:2850704524
     # zfs:0:arcstats:size:1261112216
-    run_on_all("kstat -C zfs:0:arcstats:c zfs:0:arcstats:size").each do |host, data|
+    run_on_all("kstat -C zfs:0:arcstats:c zfs:0:arcstats:size").each do |addr, data|
+      host = find_host(addr)
       zfs_arc_current = nil
       zfs_arc_reserved = nil
       
@@ -268,14 +252,90 @@ class HostRegistry
     end
     
     # joyent_20140207T053435Z
-    run_on_all("uname -a | cut -d ' ' -f 4").each do |host, data|
+    run_on_all("uname -a | cut -d ' ' -f 4").each do |addr, data|
+      host = find_host(addr)
       _, rev = data.strip().split('_')
       ret[host][:smartos_version] = rev
     end
     
     ret
   end
+
+private
+  def cache_result(cmd, result)
+    @cache[@cache_key] ||= {}
+    @cache[@cache_key][cmd] = result
+    data = Oj.dump(@cache)
+        
+    IO.write(@cache_path, data)
+  end
   
+  def load_cache
+    Oj.load_file(@cache_path)
+  rescue Oj::ParseError, IOError => err
+    {}
+  end
+
+end
+
+
+class CachedRegistry < Registry
+  def initialize(*)
+    puts "(( Using cached data ))"
+    super
+  end
+  
+  def run_on_all(cmd)
+    if @cache[@cache_key] && @cache[@cache_key][cmd]
+      @cache[@cache_key][cmd]
+    else
+      puts "[#{@cache_key}] missing cache for cmd: '#{cmd}'"
+      {}
+    end
+  end
+end
+
+
+class SSHRegistry < Registry
+  def initialize(*)
+    puts "(( Using live data ))"
+    super
+    
+    @gateways = {}
+    @connection = Net::SSH::Multi.start()
+    
+    @hosts.each do |_, host|
+      @connection.use(host.address,
+          via: gateway_for(host.gateway, host.gateway_user),
+          # via: @gateways[host.gateway],
+          user: host.user,
+          timeout: 20,
+          compression: false
+        )
+    end
+    
+  end
+  
+  def run_on_all(cmd)
+    ret = {}
+    
+    # set the keys in cas we get nothing back
+    @hosts.each do |addr, _|
+      ret[addr] = ""
+    end
+    
+    channel = @connection.exec(cmd) do |ch, stream, data|
+      host = @hosts[ch[:host]]
+      ret[host.address] << data
+    end
+    
+    channel.wait()
+    
+    cache_result(cmd, ret)
+    
+    ret
+  end
+
 private
   def gateway_for(host, user)
     @gateways[host] ||= Net::SSH::Gateway.new(
@@ -284,5 +344,5 @@ private
         compression: false
       )
   end
-    
+  
 end

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

data/smartos-manager.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh-multi'
   gem.add_dependency 'colored'
   gem.add_dependency 'size_units'
+  gem.add_dependency 'oj'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Julien Ammous
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "..."
 email:
 - schmurfy@gmail.com