EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/296645
Change subject: Fix DataSender::justDocumentMissingException ...................................................................... Fix DataSender::justDocumentMissingException I'm almost certain this was written previously, but it seems in merging es2.x branch back into master the code was lost. Fixup the code so we appropriately recognize document missing exceptions. Bug: T138257 Change-Id: Ie89abbb171e86b7e735ee1204ccf000376a65b90 --- M includes/DataSender.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch refs/changes/45/296645/1 diff --git a/includes/DataSender.php b/includes/DataSender.php index 9241d16..7749a91 100644 --- a/includes/DataSender.php +++ b/includes/DataSender.php @@ -348,9 +348,8 @@ if ( !$bulkResponse->hasError() ) { continue; } - - $pos = strpos( $bulkResponse->getError(), 'DocumentMissingException' ); - if ( $pos === false ) { + $error = $bulkResponse->getFullError(); + if ( $error['type'] !== 'document_missing_exception' ) { $justDocumentMissing = false; } elseif ( $logCallback ) { // This is generally not an error but we should -- To view, visit https://gerrit.wikimedia.org/r/296645 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie89abbb171e86b7e735ee1204ccf000376a65b90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: REL1_27 Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits