Upgrade warden to use ruby 2.1.4

[#89148118]

.ruby-version

@@ -1 +1 @@
-1.9.3-p547
+2.1.4

bin/test

@@ -6,7 +6,7 @@ set -x
 # Assumes the rootfs is already installed to /var/warden/rootfs
 # The warden test suite currently uses /tmp/warden/rootfs instead
 mkdir -p /tmp/warden
-sudo ln -sf /var/warden/rootfs /tmp/warden/rootfs
+sudo ln -sf /var/warden/rootfs_lucid /tmp/warden/rootfs
 
 # Close stdin
 exec 0>&-

warden-protocol/lib/warden/protocol/message.rb

@@ -12,7 +12,7 @@ def self.generate_klass_map(suffix)
             if Protocol.const_defined?(klass_name)
               [const_get(name), Protocol.const_get(klass_name)]
             end
-          end]
+          end.compact]
 
           if map.respond_to?(:default_proc=)
             map.default_proc = lambda do |h, k|

warden/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "rake"
 gem "steno", "~> 0.0.15", :git => 'https://github.com/cloudfoundry/steno.git'
 gem "membrane", :git => 'https://github.com/cloudfoundry/membrane.git'
-gem "eventmachine", "~> 1.0.0"
+gem "eventmachine", "1.0.3"
 gem "em-posix-spawn", :git => 'https://github.com/cloudfoundry/common.git'
 gem "yajl-ruby"
 gem "pidfile"

warden/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
   specs:
     beefcake (0.3.7)
     diff-lcs (1.1.3)
-    eventmachine (1.0.0)
+    eventmachine (1.0.3)
     grape (0.2.1)
       hashie (~> 1.2)
       multi_json
@@ -68,7 +68,7 @@ PLATFORMS
 
 DEPENDENCIES
   em-posix-spawn!
-  eventmachine (~> 1.0.0)
+  eventmachine (= 1.0.3)
   membrane!
   pidfile
   rake

warden/lib/warden/container/features/mem_limit.rb

@@ -104,11 +104,18 @@ def limit_memory(limit_in_bytes)
           # and memory.memsw.limit_in_bytes is set first, the invariant may not
           # hold. However, one of the two fields will always be set
           # successfully. To mitigate this, both limits are written twice.
-          2.times do
-            ["memory.limit_in_bytes", "memory.memsw.limit_in_bytes"].each do |path|
-              File.open(File.join(cgroup_path(:memory), path), 'w') do |f|
-                f.write(limit_in_bytes.to_s)
-              end
+          memory_limit_path = "memory.limit_in_bytes"
+          memorysw_limit_path = "memory.memsw.limit_in_bytes"
+          current_memory_limit = File.read(File.open(File.join(cgroup_path(:memory), memory_limit_path), 'r')).to_i
+
+          increasing = current_memory_limit < limit_in_bytes
+
+          paths = [memory_limit_path, memorysw_limit_path]
+          paths.reverse! if increasing
+
+          paths.each do |path|
+            File.open(File.join(cgroup_path(:memory), path), 'w') do |f|
+              f.write(limit_in_bytes.to_s)
             end
           end
         end