smartos-manager 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6039a738c88e81df62243f2bc64ced9b79eaba68
-  data.tar.gz: c68aef35b68e775c0c7c9a78728cda095326c3e8
+  metadata.gz: b1280469db0b24e3d8a4bfd499879a1a14a3a5a8
+  data.tar.gz: 017242b188b773bceea49890884e2864586f1b50
 SHA512:
-  metadata.gz: 35eef75a70808e18d6660b9015ea98e800c6bc8842623817781f0c1cd7a27ec2628beba25b29dd1f1c48fabb94d41e2ccd809b2a278147a3fca2794abc838e8c
-  data.tar.gz: 1250e3a9bbdb5dcbae541f0d901fe15142d3a0de789af2b1c0a68b5c7a036b6d4d000f5239a8c5e87c81b9df96f4c22dfce376880934c0e55473d90ebe3f57ff
+  metadata.gz: fcebf46f92db08808503c3505aae8432ef60e5a140d095f562d4a550dabf974dbef8b0b00630b9e482973c079651c42e179a8e2601c76dce93cb5f7191ccfaf0
+  data.tar.gz: 66daaf93d2253616b4a659b041259d7cc44cf20df34c71ae04c7019742d3e4cc5150b63900b1df593bf29ebc3fea650e4c343afd9962d2efb3e95afe3a1195fa

data/lib/smartos-manager/cli.rb

@@ -33,13 +33,16 @@ class AppCLI < Thor
     
     ret.each do |host, vms|
       mem = sysinfos[host][:memory]
+      zfs_arc_reserved = sysinfos[host][:zfs_arc_reserved]
+      zfs_arc_current = sysinfos[host][:zfs_arc_current]
       vm_memory = 0
       
       vms.each{|vm| vm_memory += vm.memory }
-      avail = (mem - vm_memory) - (20 * mem/100.0)
+      # avail = (mem - vm_memory) - (20 * mem/100.0)
+      avail = (mem - vm_memory) - zfs_arc_reserved
       
       rev = sysinfos[host][:smartos_version]
-      puts "\n#{host.name} [SmartOS: #{rev.send(rev_colors.get(rev))}] (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, Avail: #{avail.human_size(1).magenta})"
+      puts "\n#{host.name} [SmartOS: #{rev.send(rev_colors.get(rev))}] (#{host.address})  (#{vms.size} vms)  (Total RAM: #{mem.human_size(1).green}, ZFS: #{format_size(zfs_arc_current)}G/#{format_size(zfs_arc_reserved)}G, Avail: #{avail.human_size(1).magenta})"
       vms.each do |vm|
         user_columns = registry.user_columns.values.map{|key| vm[key] }
         p_vm_list(vm.memory.human_size(1), vm.name, vm.type, vm.uuid, printable_state(vm.state), vm.admin_ip, *user_columns)
@@ -58,6 +61,10 @@ class AppCLI < Thor
   
   no_tasks do
     
+    def format_size(val, unit = 3)
+      format('%.1f', val / (1024.0**unit))
+    end
+    
     def humanize(str)
       str.split("_").map(&:capitalize).join(' ')
     end

data/lib/smartos-manager/core.rb

@@ -153,6 +153,28 @@ class HostRegistry
       ret[host] = {memory: mem.to_i.megabytes}
     end
     
+    # 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|
+      zfs_arc_current = nil
+      zfs_arc_reserved = nil
+      
+      data.split("\n").each do |line|
+        value = line.split(':').last.to_i
+        if line.start_with?('zfs:0:arcstats:size:')
+          zfs_arc_current = value
+        else
+          zfs_arc_reserved = value
+        end
+      end
+      
+      ret[host].merge!(
+          zfs_arc_current: zfs_arc_current,
+          zfs_arc_reserved: zfs_arc_reserved
+        )
+    end
+    
     # joyent_20140207T053435Z
     run_on_all("uname -a | cut -d ' ' -f 4").each do |host, data|
       _, rev = data.strip().split('_')

data/lib/smartos-manager/version.rb

@@ -1,3 +1,3 @@
 module SmartosManager
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartos-manager
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Julien Ammous