haconiwa 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767036a1ab66ab117bcfd75c18b56a3636fa7358
-  data.tar.gz: 1d3cee5db594eb27e3f91eb28bedbf67ef94e146
+  metadata.gz: 9ddb95a0442d9007bda5a95609229cf0cef771a6
+  data.tar.gz: e56fd0275206c68766efc6e7c27a406aaf5db059
 SHA512:
-  metadata.gz: 41d15e175b6f1b2fd6475ac558a138770167e1ed9e2d075fe48ec91f0493ceab08e53c619d6fee79e60d1972373041453117b70c41d40afe5bbb22292066599a
-  data.tar.gz: ad935bf20472c72d34066afc60bcacd682e13d4e489bdc606d4aa6eced14f8e4fff9d07ba24275dbc3b46ea0c86617e696ac347a452fedcc88d5b190b6d9405b
+  metadata.gz: 96efacf5d423f067a4fcf33bc624d32db67bb803c9b3123f93c546e4acf435bef82fc48fe58395a84a8eaec3556ac19651b09385102f8631b89e1bb71bb4b541
+  data.tar.gz: aeaadfc43ff779eb60d295e05a7f10589795f1e520ac453a426d31b4cc181ba00bc5d9d439fc110e29dafcfeb1995aa4eef4c5d1459768c0a026ee80923b4602

data/lib/haconiwa/base.rb

@@ -9,6 +9,7 @@ module Haconiwa
   class Base
     attr_accessor :name,
                   :init_command,
+                  :container_pid_file,
                   :filesystem,
                   :cgroup,
                   :namespace,
@@ -24,6 +25,7 @@ module Haconiwa
       @namespace = Namespace.new
       @capabilities = Capabilities.new
       @name = "haconiwa-#{Time.now.to_i}"
+      @container_pid_file = "/var/run/haconiwa-#{@name}.pid"
     end
 
     # aliases

data/lib/haconiwa/runners/linux.rb

@@ -45,8 +45,15 @@ module Haconiwa::Runners
         end
       }
 
+      sleep 0.1 # The magic
       Haconiwa::SmallCgroup.register_at_exit(pid: container, name: base.name, dirs: base.cgroup.to_dirs)
-      puts "New container: PID = #{container}"
+      real_container_pid = if base.namespace.use_pid_ns
+                             find_by_ppid(container)
+                           else
+                             container
+                           end
+      File.open(base.container_pid_file, "w") {|pid| pid.write real_container_pid }
+      puts "New container: PID = #{real_container_pid}"
 
       res = Process.waitpid2 container
       if res[1].success?
@@ -54,6 +61,22 @@ module Haconiwa::Runners
       else
         puts "Container exited with status code <#{res[1].to_i}>."
       end
+
+      at_exit { FileUtils.rm_f base.container_pid_file }
+    end
+
+    private
+    def self.find_by_ppid(ppid)
+      s = Dir.glob('/proc/*/stat')
+             .find {|stat|
+               next unless stat =~ /\d/
+               File.read(stat).split[3].to_i == ppid
+             }
+      if s
+        s.scan(/\d+/).first.to_i
+      else
+        raise("Process that has ppid #{ppid} not found. Somthing is wrong.")
+      end
     end
   end
 end

data/lib/haconiwa/version.rb

@@ -1,3 +1,3 @@
 module Haconiwa
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haconiwa
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Uchio KONDO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi