Merge pull request #6382 from sallyom/bz1122084

Merged by openshift-bot

Author: OpenShift Bot

node/lib/openshift-origin-node/model/node.rb

@@ -347,6 +347,8 @@ def self.node_utilization
         res['gears_started_count'] = 0
         res['gears_deploying_count'] = 0
         res['gears_unknown_count'] = 0
+        res['node_disk_free'] = 0
+        res['node_total_size'] = 0
         OpenShift::Runtime::ApplicationContainer.all(nil, false).each do |app|
           # res['git_repos_count'] += 1 if ApplicationRepository.new(app).exists?
           res['gears_total_count'] += 1
@@ -366,6 +368,15 @@ def self.node_utilization
           end
         end
 
+        # fact for available disk space on a node, considered in gear moves to ensure minimum buffer of free space on nodes
+        mountpoint = self.get_gear_mountpoint
+        df_cmd = "df -aP #{mountpoint} | awk -F' ' 'NR == 2 {print $2,$4}'"
+        df_output, stderr, rc = Utils.oo_spawn(df_cmd)
+        raise NodeCommandException.new "Error: #{stderr} executing command #{df_cmd}" unless rc == 0
+        df_total_size, df_free = df_output.split
+        res['node_total_size'] = df_total_size.to_i
+        res['node_disk_free'] = df_free.to_i
+
         # consider a gear active unless explicitly not
         res['gears_active_count'] = res['gears_total_count'] - res['gears_idled_count'] - res['gears_stopped_count']
         res['gears_usage_pct'] = begin res['gears_total_count'] * 100.0 / res['max_active_gears'].to_f; rescue; 0.0; end

node/test/unit/node_test.rb

@@ -18,6 +18,16 @@
 require 'yaml'
 require 'pp'
 
+module FakeFS
+  class File
+    class Stat
+      def dev
+        return 5555
+      end
+    end
+  end
+end
+
 class NodeTest < OpenShift::NodeTestCase
 
   def setup

plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb

@@ -788,6 +788,34 @@ def get_quota_files
       rpc_get_fact_direct('quota_files').to_i
     end
 
+    # <<accessor>>
+    # Get the available disk space of a Node
+    #
+    # RETURNS:
+    # * Integer: the available disk space of a node in blocks
+    #
+    # NOTES:
+    # * method on Node
+    # * calls rpc_get_fact_direct
+    #
+    def get_node_disk_free
+      rpc_get_fact_direct('node_disk_free').to_i
+    end
+
+    # <<accessor>>
+    # Get the total disk space of a Node
+    #
+    # RETURNS:
+    # * Integer: the total disk space of a node in blocks
+    #
+    # NOTES:
+    # * method on Node
+    # * calls rpc_get_fact_direct
+    #
+    def get_node_total_size
+      rpc_get_fact_direct('node_total_size').to_i
+    end
+
     #
     # Add a component to an existing gear on the node
     #
@@ -2375,7 +2403,18 @@ def rsync_destination_container(gear, destination_container, destination_distric
       reply = ResultIO.new
       source_container = gear.get_proxy
       platform = gear.group_instance.platform
+      quota = get_quota(gear)
+      source_used_blocks = quota[1] unless quota.nil?
       log_debug "DEBUG: Gear platform is '#{platform}'"
+      destination_avail_space = destination_container.get_node_disk_free
+      destination_total_space = destination_container.get_node_total_size
+
+      # check here to make sure addition of gear to destination_container
+      # will not result in > 95% full destination_container
+      if (destination_avail_space - source_used_blocks.to_i)/destination_total_space > 0.05
+        raise OpenShift::NodeUnavailableException.new("Gear '#{gear.uuid}' cannot be moved to '#{destination_container.id}'.  Not enough disk space, node would be > 95% full after move.", 140)
+      end
+
       log_debug "DEBUG: Creating new account for gear '#{gear.uuid}' on #{destination_container.id}"
       sshkey_required = false
       initial_deployment_dir_required = false

plugins/msg-node/mcollective/facts/openshift_facts.rb

@@ -50,6 +50,8 @@ def get_node_config_value(key, default)
 #
 results = OpenShift::Runtime::Node.node_utilization
 
+Facter.add(:node_disk_free) { setcode { results['node_disk_free'] } }
+Facter.add(:node_total_size) { setcode { results['node_total_size'] } }
 Facter.add(:node_profile) { setcode { results['node_profile'] } }
 Facter.add(:max_active_gears) { setcode { results['max_active_gears'] || '0' } }
 Facter.add(:no_overcommit_active) { setcode { results['no_overcommit_active'] || false } }