jenkins-bot has submitted this change and it was merged.

Change subject: Move only ES entries about the current wiki
......................................................................


Move only ES entries about the current wiki

This doesn't affect MediaWiki-Vagrant or Beta Cluster, since they
don't have a shared flowdb.  But in general (and in production)
it should only run on the specified wiki.

Change-Id: Ib0716cd05fc19ffe9a2aa1426c4bbf9d63f15f4a
---
M maintenance/FlowExternalStoreMoveCluster.php
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/maintenance/FlowExternalStoreMoveCluster.php 
b/maintenance/FlowExternalStoreMoveCluster.php
index 62abe61..4134c99 100644
--- a/maintenance/FlowExternalStoreMoveCluster.php
+++ b/maintenance/FlowExternalStoreMoveCluster.php
@@ -76,6 +76,7 @@
                        $clusterConditions[] = $schema['content'] . 
$dbr->buildLike( "DB://$cluster/", $dbr->anyString() );
                }
                $iterator->addConditions( array(
+                               $schema['wiki'] => wfWikiID(),
                                $schema['flags'] . $dbr->buildLike( 
$dbr->anyString(), 'external', $dbr->anyString() ),
                                $dbr->makeList( $clusterConditions, LIST_OR ),
                ) );
@@ -276,6 +277,7 @@
                        'pk' => 'rev_id',
                        'content' => 'rev_content',
                        'flags' => 'rev_flags',
+                       'wiki' => 'rev_user_wiki',
                );
        }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0716cd05fc19ffe9a2aa1426c4bbf9d63f15f4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to