[MediaWiki-commits] [Gerrit] labs...guc[master]: Switch to `*.web.db.svc.eqiad.wmflabs`

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394651 )

Change subject: Switch to `*.web.db.svc.eqiad.wmflabs`
......................................................................


Switch to `*.web.db.svc.eqiad.wmflabs`

Bug: T176686
Change-Id: I2631422949cd8af2cdf56208d576898e28a0eb87
---
M api.php
M src/App.php
2 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api.php b/api.php
index 2da5f12..76eb419 100644
--- a/api.php
+++ b/api.php
@@ -54,7 +54,12 @@
         );
         if ($metaRows) {
             foreach ($metaRows as $row) {
-                $host = $row['slice'];
+                // FIXME: Workaround https://phabricator.wikimedia.org/T176686
+                $host = preg_replace(
+                    '/\.labsdb$/',
+                    '.web.db.svc.eqiad.wmflabs',
+                    $row['slice']
+                );
                 list($shard) = explode('.', $host);
                 $res = \LabsDB::query(
                     \LabsDB::getConnection($host, 'heartbeat'),
diff --git a/src/App.php b/src/App.php
index 7dd04c2..9fa292b 100644
--- a/src/App.php
+++ b/src/App.php
@@ -55,6 +55,13 @@
             $host = $cluster;
         }
 
+        // FIXME: Workaround https://phabricator.wikimedia.org/T176686
+        $host = preg_replace(
+            '/\.labsdb$/',
+            '.web.db.svc.eqiad.wmflabs',
+            $host
+        );
+
         $dbname = "{$database}_p";
 
         // Reuse existing connection if possible

-- 
To view, visit https://gerrit.wikimedia.org/r/394651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2631422949cd8af2cdf56208d576898e28a0eb87
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/guc
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: MarcoAurelio <maure...@tools.wmflabs.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits