pwrake 2.2.9 → 2.3.0

data/lib/pwrake/worker/executor.rb

@@ -108,6 +108,7 @@ module Pwrake
     def start_process(command)
       return if @thread      # running
       return if !command     # empty queue
+      @dir.check_mountpoint
       @spawn_in, @sh_in = IO.pipe
       @sh_out, @spawn_out = IO.pipe
       @sh_err, @spawn_err = IO.pipe

data/lib/pwrake/worker/gfarm_directory.rb

@@ -73,19 +73,51 @@ module Pwrake
 
     def close
       super
-      if File.directory? @gfarm_mountpoint
+      n = 0
+      while n < 4
         begin
-          spawn_cmd "fusermount -u #{@gfarm_mountpoint}"
-        rescue
+          if mounted?
+            sleep 0.15 * 4**n
+            spawn_cmd "fusermount -u #{@gfarm_mountpoint}"
+          end
+          n = 99
+        rescue => e
+          @log.error e.message+" n=#{n}"
+          n += 1
         end
-        #system "sync"
+      end
+      if File.directory? @gfarm_mountpoint
         begin
           FileUtils.rmdir @gfarm_mountpoint
-          @log.info "rmdir #{@gfarm_mountpoint} @#{@@hostname}"
+          @log.info "rmdir #{@@hostname}:#{@gfarm_mountpoint}"
         rescue
-          @log.error "failed to rmdir #{@gfarm_mountpoint} @#{@@hostname}"
+          @log.error "failed to rmdir #{@@hostname}:#{@gfarm_mountpoint}"
+        end
+      end
+      if File.exist? @gfarm_mountpoint
+        @log.warn "mountpoint #{@@hostname}:#{@gfarm_mountpoint} remains"
+      end
+    end
+
+    def mounted?
+      File.open('/etc/mtab','r') do |f|
+        f.each_line do |l|
+          a = l.split
+          if a[1] == @gfarm_mountpoint && a[2] =~ /gfarm2fs/
+            return true
+          end
         end
       end
+      false
+    end
+
+    def check_mountpoint
+      # try to recover from gfarm2fs segfault
+      unless File.directory?(@gfarm_mountpoint)
+        @log.warn "remounting #{@@hostname}:#{@gfarm_mountpoint}"
+        close
+        open
+      end
     end
 
   end

data/lib/pwrake/worker/shared_directory.rb

@@ -70,5 +70,8 @@ module Pwrake
       work_path + @@log_dir
     end
 
+    def check_mountpoint
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwrake
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.3.0
 platform: ruby
 authors:
 - Masahiro TANAKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies: []
 description: Parallel and distributed Rake for workflow execution on multicores, clusters,
   clouds using SSH. It has locality-aware scheduling designed for Gfarm file system.
@@ -62,6 +62,7 @@ files:
 - lib/pwrake/option/option_gfarm2fs.rb
 - lib/pwrake/queue/locality_aware_queue.rb
 - lib/pwrake/queue/no_action_queue.rb
+- lib/pwrake/queue/non_locality_queue.rb
 - lib/pwrake/queue/queue_array.rb
 - lib/pwrake/queue/task_queue.rb
 - lib/pwrake/report.rb