Fallback to Wikibase's default search when Elasticsearch is down (#347)

* Update pacman to include patches for a new wikibase search fallback

* Update WikibaseCirrusSearch and WikibaseLexemeCirrusSearch using sync.sh

* Configure $wgWBCSElasticErrorFailSilently in LocalSettings.php

Author: AndrewKostka

dist-persist/wbstack/src/Settings/LocalSettings.php

@@ -659,6 +659,7 @@ function onPersonalUrlsConfirmAccount( array &$personal_urls, Title $title, Skin
         ]
     ];
     $wgWBCSUseCirrus = true;
+    $wgWBCSElasticErrorFailSilently = true;
 }
 
 

dist/extensions/WikibaseCirrusSearch/extension.json

@@ -84,6 +84,10 @@
 		"LicenseMapping": {
 			"value": [],
 			"description": "Map of licence search strings to wikibase statements."
+		},
+		"ElasticErrorFailSilently": {
+			"value": false,
+			"description": "Don't throw an EntitySearchException when an Elasticsearch query fails."
 		}
 	},
 	"ConfigRegistry": {

dist/extensions/WikibaseCirrusSearch/src/EntitySearchElastic.php

@@ -10,6 +10,7 @@
 use Elastica\Query\MatchQuery;
 use Elastica\Query\Term;
 use Language;
+use MediaWiki\MediaWikiServices;
 use WebRequest;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\Lib\LanguageFallbackChainFactory;
@@ -311,7 +312,13 @@ public function getRankedSearchResults(
 		if ( $result->isOK() ) {
 			$result = $result->getValue();
 		} else {
-			throw new EntitySearchException( $result );
+			$services = MediaWikiServices::getInstance();
+			$config = $services->getConfigFactory()->makeConfig( 'WikibaseCirrusSearch' );
+
+			if ( !$config->get( 'ElasticErrorFailSilently' ) ) {
+				throw new EntitySearchException( $result );
+			}
+			$result = [];
 		}
 
 		if ( $searcher->isReturnRaw() ) {

dist/extensions/WikibaseLexemeCirrusSearch/src/LexemeSearchEntity.php

@@ -11,6 +11,7 @@
 use Elastica\Query\MatchQuery;
 use Elastica\Query\Term;
 use Language;
+use MediaWiki\MediaWikiServices;
 use Wikibase\DataModel\Entity\EntityIdParser;
 use Wikibase\Lexeme\MediaWiki\Content\LexemeContent;
 use Wikibase\Lib\Store\FallbackLabelDescriptionLookupFactory;
@@ -203,7 +204,13 @@ public function getRankedSearchResults(
 		if ( $result->isOK() ) {
 			$result = $result->getValue();
 		} else {
-			throw new EntitySearchException( $result );
+			$services = MediaWikiServices::getInstance();
+			$config = $services->getConfigFactory()->makeConfig( 'WikibaseCirrusSearch' );
+
+			if ( !$config->get( 'ElasticErrorFailSilently' ) ) {
+				throw new EntitySearchException( $result );
+			}
+			$result = [];
 		}
 
 		if ( $searcher->isReturnRaw() ) {

dist/wbstack/src/Settings/LocalSettings.php

@@ -659,6 +659,7 @@ function onPersonalUrlsConfirmAccount( array &$personal_urls, Title $title, Skin
         ]
     ];
     $wgWBCSUseCirrus = true;
+    $wgWBCSElasticErrorFailSilently = true;
 }
 
 

pacman.yaml

@@ -265,6 +265,8 @@
     - .rubocop_todo.yml
     - Gruntfile.js
     - Doxyfile
+  patchUrls:
+    - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseCirrusSearch~908801/revisions/2/patch?download
 - name: WikibaseLexemeCirrusSearch
   artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-WikibaseLexemeCirrusSearch/zip/aab91971e160e0d5c133fa6a958e339f58a496dd
   artifactLevel: 1
@@ -287,6 +289,8 @@
     - .rubocop_todo.yml
     - Gruntfile.js
     - Doxyfile
+  patchUrls:
+    - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FWikibaseLexemeCirrusSearch~908803/revisions/1/patch?download
 - name: UniversalLanguageSelector
   artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-UniversalLanguageSelector/zip/b6dea733354186fe4d21d71709e6fa264e52d47c
   artifactLevel: 1