workflow_manager 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5668a0ae734ac5ac90ffc891559681da2412107a29cbc8a5b279c9ac9201a27e
-  data.tar.gz: aa34a9a4ef006005e98d375520adfd2a8126ff835f76ff0a2d4432f439149248
+  metadata.gz: 46119a1d4da028cc76b16a56545512607afa923742d982f2b5f1941ce42bacd3
+  data.tar.gz: 922c122276a8e6842017288a643eb4dbe208b4f69907f690d4a8c00adb1649b3
 SHA512:
-  metadata.gz: 42e691408c30e9f29321199423a25fbb3844f109cf2169074262cd3a2d08bd5b9f62e1bf759e3f0448fa25fdd592606be77b7a3789cf9c1f3e3ee411122d194e
-  data.tar.gz: 0572fa546e578c279d6efdb8c63dac03c2075fa5bedea5c854d49a42e1c0df7e54525ab0af9ae2c54bf567f5d39b13883b1f8ab2553595872829a286546ff8ca
+  metadata.gz: 1a2e0eea78ab77f45b1b80e558f880ef362c2668cb3d30b67039dc078fd45a27d49401d802c46caeb55352053b25f22a05f7d50d5ff0b6d970e22e8fdd73b043
+  data.tar.gz: ec74fee4bebb6c4014535e228a1c2c6b229a8a7151c540c9fb9853635a207e05a177ec9f8dcce4cf7f5eb331294a6ef1eed213f6893404155d030c4595ada2c9

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    workflow_manager (0.7.9)
+    workflow_manager (0.8.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.2.0)
-    connection_pool (2.3.0)
-    rack (3.0.4.1)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    rack (3.0.8)
     redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.12.1)
+    redis-client (0.17.0)
       connection_pool
-    sidekiq (7.0.5)
+    sidekiq (7.1.4)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.11.0)
+      redis-client (>= 0.14.0)
 
 PLATFORMS
   x86_64-linux

data/lib/workflow_manager/cluster.rb

@@ -28,7 +28,7 @@ module WorkflowManager
     end
     def job_pending?(job_id)
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
     end
     def kill_command(job_id)
     end
@@ -75,7 +75,7 @@ module WorkflowManager
       result = `#{command}`
       result.to_s.empty? ? false : true
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = []
       commands << "mkdir -p #{dest_parent_dir}"
       commands << "cp -r #{org_dir} #{dest_parent_dir}"
@@ -199,7 +199,7 @@ module WorkflowManager
       end
       qstat_flag
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = if now == "force"
                    target_file = File.join(dest_parent_dir, File.basename(org_dir))
                    ["g-req copynow -f #{org_dir} #{dest_parent_dir}"]
@@ -300,7 +300,7 @@ module WorkflowManager
   end
 
   class FGCZCourseCluster < FGCZCluster
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = ["cp -r #{org_dir} #{dest_parent_dir}"]
     end
     def delete_command(target)
@@ -333,7 +333,7 @@ module WorkflowManager
     def job_pending?(job_id)
       # TODO
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       # TODO
     end
     def kill_command(job_id)
@@ -411,7 +411,7 @@ module WorkflowManager
       end
       qstat_flag
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = if now == "force"
                    target_file = File.join(dest_parent_dir, File.basename(org_dir))
                    ["g-req copynow -f #{org_dir} #{dest_parent_dir}"]
@@ -521,14 +521,16 @@ module WorkflowManager
       end
       qstat_flag
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = if now == "force"
                    target_file = File.join(dest_parent_dir, File.basename(org_dir))
                    ["g-req copynow -f #{org_dir} #{dest_parent_dir}"]
                  elsif now
                    ["g-req copynow #{org_dir} #{dest_parent_dir}"]
-                 else
+                 elsif queue.nil? or queue == "light"
                    ["g-req -w copy #{org_dir} #{dest_parent_dir}"]
+                 else
+                   ["g-req -w copy -f heavy #{org_dir} #{dest_parent_dir}"]
                  end
     end
     def kill_command(job_id)
@@ -546,7 +548,7 @@ module WorkflowManager
   end
 
   class FGCZDebian10DemoCluster < FGCZDebian10Cluster
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
       commands = ["cp -r #{org_dir} #{dest_parent_dir}"]
     end
     def delete_command(target)

data/lib/workflow_manager/server.rb

@@ -202,8 +202,8 @@ module WorkflowManager
     def hello
       'hello hoge hoge bar boo bundle, '+ @cluster.name
     end
-    def copy_commands(org_dir, dest_parent_dir, now=nil)
-      @cluster.copy_commands(org_dir, dest_parent_dir, now)
+    def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
+      @cluster.copy_commands(org_dir, dest_parent_dir, now, queue)
     end
     def kill_job(job_id)
       status(job_id, 'FAIL')

data/lib/workflow_manager/version.rb

@@ -1,3 +1,3 @@
 module WorkflowManager
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/start_workflow_manager.sh

@@ -2,10 +2,11 @@
 source /usr/local/ngseq/etc/lmod_profile
 module load Dev/Ruby/3.1.3
 module load Tools/Redis/7.0.8
-conda activate gtools_env
+#conda activate gtools_env
 which python
 which g-sub
 which g-req
 mkdir -p logs
 mkdir -p dbs
-bundle exec workflow_manager -d druby://fgcz-h-031:40001
+#bundle exec workflow_manager -d druby://fgcz-h-031:40001
+bundle exec workflow_manager -d druby://fgcz-h-032:40001

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow_manager
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Functional Genomics Center Zurich
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler