JIRA: BOTTLENECK-173
This patch will change the way to call multithreading.
And change some encoding error about Yardstick config
Change-Id: I04803bff6acaad1089d180b104652049f1f0a485
Signed-off-by: Ace Lee <liyin11@huawei.com>
import uuid
import json
import os
import uuid
import json
import os
from utils.parser import Parser as conf_parser
import utils.env_prepare.quota_prepare as quota_prepare
import utils.env_prepare.stack_prepare as stack_prepare
from utils.parser import Parser as conf_parser
import utils.env_prepare.quota_prepare as quota_prepare
import utils.env_prepare.stack_prepare as stack_prepare
testfile = os.path.basename(__file__)
testcase, file_format = os.path.splitext(testfile)
testfile = os.path.basename(__file__)
testcase, file_format = os.path.splitext(testfile)
def env_pre(test_config):
test_yardstick = False
def env_pre(test_config):
test_yardstick = False
-def do_test(test_config, con_dic):
+def do_test():
+ func_name = sys._getframe().f_code.co_name
out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out")
yardstick_container = docker_env.yardstick_info['container']
cmd = ('yardstick task start /home/opnfv/repos/yardstick/'
out_file = ("/tmp/yardstick_" + str(uuid.uuid4()) + ".out")
yardstick_container = docker_env.yardstick_info['container']
cmd = ('yardstick task start /home/opnfv/repos/yardstick/'
break
elif data["status"] == 2:
LOG.error("yardstick error exit")
break
elif data["status"] == 2:
LOG.error("yardstick error exit")
+ q.put((out_value, func_name))
- test_config = {}
- test_date = do_test(test_config, condic)
result = []
out_num = 0
num = int(value)
result = []
out_num = 0
num = int(value)
- pool = multiprocessing.Pool(processes=num)
+ # pool = multiprocessing.Pool(processes=num)
+ threadings = []
LOG.info("begin to run %s thread" % num)
starttime = datetime.datetime.now()
LOG.info("begin to run %s thread" % num)
starttime = datetime.datetime.now()
- for i in range(0, int(num)):
- result.append(pool.apply_async(func_run, (con_dic, )))
- pool.close()
- pool.join()
- for res in result:
- out_num = out_num + float(res.get())
+
+ for i in xrange(0, num):
+ temp_thread = threading.Thread(target=func_run, args=(str(i),))
+ threadings.append(temp_thread)
+ temp_thread.start()
+ for one_thread in threadings:
+ one_thread.join()
+ while not q.empty():
+ result.append(q.get())
+ for item in result:
+ out_num = out_num + float(item[0])
endtime = datetime.datetime.now()
LOG.info("%s thread success %d times" % (num, out_num))
endtime = datetime.datetime.now()
LOG.info("%s thread success %d times" % (num, out_num))
file_after)
docker_env.docker_exec_cmd(yardstick_contain,
cmd)
file_after)
docker_env.docker_exec_cmd(yardstick_contain,
cmd)
- cmd = "sed -i ā12s/http/file/gā /etc/yardstick/yardstick.conf"
+ cmd = "sed -i '12s/http/file/g' /etc/yardstick/yardstick.conf"
docker_env.docker_exec_cmd(yardstick_contain,
cmd)
docker_env.docker_exec_cmd(yardstick_contain,
cmd)