Adding more debug output and show output in travis to try and solve deadlocking issue.

1 files changed, 8 insertions, 1 deletions

diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 45027c5bd3..e4aac89d30 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -105,7 +105,14 @@ class ArchiveWriter
 								'" . $date . "',
 								0 "
             . " FROM $numericTable as tb1";
-        $db->exec($insertSql);
+        try { // TODO: this is temporary, remove when deadlocking issue is fixed
+            $db->exec($insertSql);
+        } catch (Exception $ex) {
+            if (\Zend_Registry::get('db')->isErrNo($e, 1213)) {
+                $deadlockInfo = \Piwik\Db::fetchAll("SHOW ENGINE INNODB STATUS");
+                Piwik::log("DEADLOCK INFO: " . print_r($deadlockInfo));
+            }
+        }
         Db::releaseDbLock($dbLockName);
         $selectIdSql = "SELECT idarchive FROM $numericTable WHERE name = ? LIMIT 1";
         $id = $db->fetchOne($selectIdSql, $locked);