On Fri, Nov 06, 2020 at 09:47:39AM +0800, Xiao Shenwei wrote:
On Fri, Nov 06, 2020 at 09:38:05AM +0800, Yu Chuan wrote:
About subject: area is what? I think, area should be the submodule what you modify. so 'area' -> 'multi-qemu'.
good,
how about this? area(multi-qemu): refactor the code to support xxx
1. i think, area is unnecessary.
multi-qemu: refactor the code to support xxx
2. your subject can be more simplified.
multi-qemu: refactor to support xxx
3. some conceptual issues.
refactor shouldn't add new funciton. if you add a new support function, you can use feat, or add support.
so, this patch can split to 2 patch, one refactor, one feat.
-------- Thanks Yu Chuan
Thanks, Shenwei
Thanks Yu Chuan
On Thu, Nov 05, 2020 at 07:21:57PM +0800, Xiao Shenwei wrote:
Usage: multi-qemu -n -c -q -n, --name HOSTNAME_PREFIX format: $tbox_group.$HOSTNAME -c, --count count how many VM do you need -q, --queues queues separated by "," -h, --help show this message example: ./multi-qemu -n vm-2p8g.taishan200-2280-2s48p-256g--a1 \ -c 20 \ -q vm-2p8g.taishan200-2280-2s48p-256g--a1,vm-2p8g.aarch64
Signed-off-by: Xiao Shenwei xiaoshenwei96@163.com
providers/multi-qemu | 95 +++++++++++++++++++++++++++++++++----------- 1 file changed, 71 insertions(+), 24 deletions(-)
diff --git a/providers/multi-qemu b/providers/multi-qemu index 23e0451..045160f 100755 --- a/providers/multi-qemu +++ b/providers/multi-qemu @@ -4,46 +4,93 @@ # frozen_string_literal: true
require 'fileutils' +require 'optparse'
-PWD = Dir.pwd +opt = {} +options = OptionParser.new do |opts|
- opts.banner = 'Usage: multi-qemu -n -c -q'
- opts.separator ''
- opts.on('-n HOSTNAME_PREFIX', '--name HOSTNAME_PREFIX', 'format: $tbox_group.$HOSTNAME') do |name|
- opt['hostname_prefix'] = name
- end
- opts.on('-c count', '--count count', 'how many VM do you need') do |num|
- opt['nr_vm'] = num
- end
- opts.on('-q queues', '--queues queues', 'separated by ","') do |queues|
- opt['queues'] = queues
- end
- opts.on_tail('-h', '--help', 'show this message') do
- puts opts
- exit
- end
+end
+if ARGV.size.zero?
- puts options
- exit 1
+end
+options.parse!(ARGV)
# Run multiple QEMU in parallel -HOSTNAME = ARGV[0] || "vm-2p8g--#{ENV['USER']}" -NR_VM = ARGV[1] || 1 +PWD = Dir.pwd +HOSTNAME = opt['hostname_prefix'] || "vm-2p8g.#{ENV['HOSTNAME']}" +NR_VM = opt['nr_vm'] || 1 +QUEUES = opt['queues'] || "#{ENV['HOSTNAME']}.#{RUBY_PLATFORM.split('-')[0]}" +LOG_DIR = '/srv/cci/serial/logs'
-def run(seqno)
- loop do
- start_time = Time.new
- hostname = "#{HOSTNAME}-#{seqno}"
- log_file = "/srv/cci/serial/logs/#{hostname}"
+def main(hostname)
- start_time = record_runtime_log(hostname)
- start_qemu(hostname)
- record_runtime_log(hostname, start_time: start_time, is_start: false)
+end
+def record_runtime_log(hostname, start_time: Time.new, is_start: true)
- log_file = "#{LOG_DIR}/#{hostname}"
- if is_start File.open(log_file, 'w') do |f| # fluentd refresh time is 1s # let fluentd to monitor this file first sleep(2) f.puts "\n#{start_time.strftime('%Y-%m-%d %H:%M:%S')} starting QEMU" end
- return start_time
- end
- duration = ((Time.new - start_time) / 60).round(2)
- File.open(log_file, 'a') do |f|
- f.puts "\nTotal QEMU duration: #{duration} minutes"
- end
+end
- pwd_hostname = File.join(PWD, hostname)
- FileUtils.mkdir_p(pwd_hostname) unless File.exist?(pwd_hostname)
- FileUtils.cd(pwd_hostname)
- system(
{ 'hostname' => hostname },ENV['CCI_SRC'] + '/providers/qemu.sh'- )
- duration = ((Time.new - start_time) / 60).round(2)
- File.open(log_file, 'a') do |f|
f.puts "\nTotal QEMU duration: #{duration} minutes"- end
+def start_qemu(hostname)
- pwd_hostname = File.join(PWD, hostname)
- FileUtils.mkdir_p(pwd_hostname) unless File.exist?(pwd_hostname)
- FileUtils.cd(pwd_hostname)
- system(
- { 'hostname' => hostname, 'queues' => QUEUES },
- ENV['CCI_SRC'] + '/providers/qemu.sh'
- )
+end
- # sleep 5s is for fluentd to collect it's log
- sleep(5)
+def loop_main(hostname)
- loop do
- begin
main(hostname)- rescue StandardError => e
puts e.backtrace# if an exception occurs, request the next time after 30 secondssleep 25- ensure
sleep 5- end end
end
def save_pid(arr)
- FileUtils.rm('pid') if File.exist?('pid') f = File.new('pid', 'a') arr.each do |i| f.puts(i)
@@ -55,7 +102,7 @@ def multiqemu pids = [] NR_VM.to_i.times do |i| pid = Process.fork do
run i
loop_main("#{HOSTNAME}-#{i}")-- 2.23.0