Skip to content

Commit 8df1643

Browse files
michaelhixsonzloster
authored andcommitted
Try to fix PHP/hhvm tests by working around an issue with SET NAMES (TechEmpower#3220)
I think we are running into this problem: facebook/hhvm#8111 We don't solve that problem, but we avoid it by specifying utf8 in a different fashion. I also took the opportunity to use the "TFB-database" hostname instead of the DBHOST environment variable because it's simpler that way. Here are the steps I took in a local TFB environment that make me think we're running into the same issue as that GitHub issue: - Run toolset/run-tests.py --mode verify --test hvm, see that it fails all tests with error messages that look like the application server simply isn't there - Enable logging in PHP/hhvm/deploy/config.hdf (basically copy the "Log" section over from config-debug.hdf), run the test again - Look at the log file it spit out, PHP/hhvm/error.log, notice messages like this: Core dumped: Segmentation fault Stack trace in /tmp/stacktrace.28653.log - /tmp is cleared by the TFB toolset each run, so I comment out that part of benchmarker.py that clears /tmp - Run the test again, look at the stacktrace file in /tmp, notice a stack trace referring to our implementation code like this: #0 PDO->__construct() called at [/home/techempower/FrameworkBenchmarks/frameworks/PHP/hhvm/once.php.inc:14] #1 Benchmark->setup_db() called at [/home/techempower/FrameworkBenchmarks/frameworks/PHP/hhvm/once.php.inc:31] #2 Benchmark->bench_db() called at [/home/techempower/FrameworkBenchmarks/frameworks/PHP/hhvm/db.php:10] #3 main() called at [/home/techempower/FrameworkBenchmarks/frameworks/PHP/hhvm/db.php:13] - Google a bit, come across a GitHub issue talking about a similar problem when they used "SET NAMES" - Comment the part of PHP/hhvm/once.php.inc that uses SET NAMES, run test again and it worked, except for fortunes which failed because of character encoding problems - Google for a different way to specify utf8 in the PDO constructor, try it again, all tests pass locally
1 parent a5c03fe commit 8df1643

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

frameworks/PHP/hhvm/once.php.inc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
class Benchmark {
44
var $pdo;
55

6-
public function setup_db($need_utf8 = true)
6+
public function setup_db()
77
{
8-
$attrs = array(PDO::ATTR_PERSISTENT => false);
9-
// hhvm doesn't support charset=utf8 in the DSN yet
10-
// See https://github.com/facebook/hhvm/issues/1309
11-
if ($need_utf8) {
12-
$attrs[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES utf8";
13-
}
14-
$this->pdo = new PDO('mysql:host=localhost;dbname=hello_world', 'benchmarkdbuser', 'benchmarkdbpass', $attrs);
8+
$this->pdo = new PDO(
9+
'mysql:host=TFB-database;dbname=hello_world;charset=utf8',
10+
'benchmarkdbuser',
11+
'benchmarkdbpass',
12+
array(PDO::ATTR_PERSISTENT => false));
1513
}
1614

1715
public function bench_json()

frameworks/PHP/hhvm/setup_hhvm.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
fw_depends mysql nginx php7 hhvm
44

5-
sed -i 's|host=localhost;|host='"${DBHOST}"';|g' once.php.inc
65
sed -i 's|SourceRoot = .*/FrameworkBenchmarks/hhvm|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf
76
sed -i 's|Path = .*/.hhvm.hhbc|Path = '"${TROOT}"'/.hhvm.bbhc|g' deploy/config.hdf
87
sed -i 's|PidFile = .*/hhvm.pid|PidFile = '"${TROOT}"'/hhvm.pid|g' deploy/config.hdf

0 commit comments

Comments
 (0)