|
@@ -5,6 +5,7 @@ from benchmark.test_types import *
|
|
import importlib
|
|
import importlib
|
|
import os
|
|
import os
|
|
import subprocess
|
|
import subprocess
|
|
|
|
+import socket
|
|
import time
|
|
import time
|
|
import re
|
|
import re
|
|
from pprint import pprint
|
|
from pprint import pprint
|
|
@@ -174,7 +175,7 @@ class FrameworkTest:
|
|
|
|
|
|
os.environ['TROOT'] = self.directory
|
|
os.environ['TROOT'] = self.directory
|
|
os.environ['IROOT'] = self.install_root
|
|
os.environ['IROOT'] = self.install_root
|
|
- os.environ['DBHOST'] = self.database_host
|
|
|
|
|
|
+ os.environ['DBHOST'] = socket.gethostbyname(self.database_host)
|
|
os.environ['LOGDIR'] = logDir
|
|
os.environ['LOGDIR'] = logDir
|
|
os.environ['MAX_THREADS'] = str(self.benchmarker.threads)
|
|
os.environ['MAX_THREADS'] = str(self.benchmarker.threads)
|
|
os.environ['MAX_CONCURRENCY'] = str(max(self.benchmarker.concurrency_levels))
|
|
os.environ['MAX_CONCURRENCY'] = str(max(self.benchmarker.concurrency_levels))
|
|
@@ -228,7 +229,7 @@ class FrameworkTest:
|
|
%s/TFBReaper "bash -exc \\\"source %s && source %s.sh\\\"''' % (self.fwroot,
|
|
%s/TFBReaper "bash -exc \\\"source %s && source %s.sh\\\"''' % (self.fwroot,
|
|
self.directory,
|
|
self.directory,
|
|
self.install_root,
|
|
self.install_root,
|
|
- self.database_host,
|
|
|
|
|
|
+ socket.gethostbyname(self.database_host),
|
|
logDir,
|
|
logDir,
|
|
self.benchmarker.threads,
|
|
self.benchmarker.threads,
|
|
max(self.benchmarker.concurrency_levels),
|
|
max(self.benchmarker.concurrency_levels),
|