Merge pull request #8969 from apolcyn/fix_netperf_quit_job_timeout

handle empty string for qps workers in driver and dont quit them after netperf test
pull/9022/head
apolcyn 8 years ago committed by GitHub
commit ad13e597e5
  1. 2
      test/cpp/qps/driver.cc
  2. 7
      tools/run_tests/run_performance_tests.py

@ -101,7 +101,7 @@ static std::unordered_map<string, std::deque<int>> get_hosts_and_cores(
static deque<string> get_workers(const string& name) { static deque<string> get_workers(const string& name) {
char* env = gpr_getenv(name.c_str()); char* env = gpr_getenv(name.c_str());
if (!env) return deque<string>(); if (!env || strlen(env) == 0) return deque<string>();
deque<string> out; deque<string> out;
char* p = env; char* p = env;

@ -464,9 +464,10 @@ for scenario in scenarios:
try: try:
for worker in scenario.workers: for worker in scenario.workers:
worker.start() worker.start()
scenario_failures, resultset = jobset.run([scenario.jobspec, jobs = [scenario.jobspec]
create_quit_jobspec(scenario.workers, remote_host=args.remote_driver_host)], if scenario.workers:
newline_on_success=True, maxjobs=1) jobs.append(create_quit_jobspec(scenario.workers, remote_host=args.remote_driver_host))
scenario_failures, resultset = jobset.run(jobs, newline_on_success=True, maxjobs=1)
total_scenario_failures += scenario_failures total_scenario_failures += scenario_failures
merged_resultset = dict(itertools.chain(merged_resultset.iteritems(), merged_resultset = dict(itertools.chain(merged_resultset.iteritems(),
resultset.iteritems())) resultset.iteritems()))

Loading…
Cancel
Save