lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.2.3 vs lib/sushi_fabric/sushiApp.rb in sushi_fabric-1.2.4
- old
+ new
@@ -1,8 +1,8 @@
#!/usr/bin/env ruby
# encoding: utf-8
-# Version = '20230623-175030'
+# Version = '20231208-144616'
require 'csv'
require 'fileutils'
require 'yaml'
require 'drb/drb'
@@ -231,10 +231,11 @@
attr_accessor :mango_run_name
attr_accessor :input_dataset_bfabric_application_number
attr_accessor :next_dataset_bfabric_application_number
attr_reader :inactivate_nodes
attr_reader :employee
+ attr_accessor :queue
def initialize
@gstore_dir = GSTORE_DIR
@project = nil
@name = nil
@@ -494,17 +495,17 @@
dest_dirs << dest_dir
end
if dest_dirs.uniq.length == 1 and greq
src_file = src_files.join(" ")
dest_dir = dest_dirs.first
- @out.print copy_commands(src_file, dest_dir).join("\n"), "\n"
+ @out.print copy_commands(src_file, dest_dir, nil, @queue).join("\n"), "\n"
else
@output_files.map{|header| next_dataset[header]}.each do |file|
# in actual case, to save under /srv/gstore/
src_file = File.basename(file)
dest_dir = File.dirname(File.join(@gstore_dir, file))
- @out.print copy_commands(src_file, dest_dir).join("\n"), "\n"
+ @out.print copy_commands(src_file, dest_dir, nil, @queue).join("\n"), "\n"
end
end
end
@out.print <<-EOF
cd #{SCRATCH_DIR}
@@ -630,15 +631,15 @@
}
end
end
file_path
end
- def copy_commands(org_dir, dest_parent_dir, now=nil)
+ def copy_commands(org_dir, dest_parent_dir, now=nil, queue="light")
@workflow_manager||=DRbObject.new_with_uri(WORKFLOW_MANAGER)
com = ''
cnt_retry = 0
begin
- com = @workflow_manager.copy_commands(org_dir, dest_parent_dir, now)
+ com = @workflow_manager.copy_commands(org_dir, dest_parent_dir, now, queue)
rescue => e
time = Time.now.strftime("[%Y.%m.%d %H:%M:%S]")
@logger.error("*"*50)
@logger.error("copy_command error #{time}")
@logger.error("error: #{e}")