Florianschmidtwelzow has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/251831

Change subject: Don't run maintenance scripts for Elasticsearch 2.x
......................................................................

Don't run maintenance scripts for Elasticsearch 2.x

ES 2.0.0 is a major release, which may have breaking changes, that
aren't supported in CirrusSearch/Elastica (currently). One thing is,
e.g., that the _status api was replaced by Indicies recvery[2] and
Indices stats (_stats endpoint)[3], see [1].

This change results in an exception in Elastica, which, in the latest
release, supports ES 1.7.3, only. The maintenance sccript should exit
as early as possible, instead of trying to use ES 2.0.0 and fail with
a user-unfriendly exception.

[1] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-status.html
[2] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-recovery.html
[3] 
https://www.elastic.co/guide/en/elasticsearch/reference/2.0/indices-stats.html

Change-Id: I52e93ea2c1b5f602dc101c8c79fd958fbb8a941c
---
M includes/Maintenance/ConfigUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/31/251831/1

diff --git a/includes/Maintenance/ConfigUtils.php 
b/includes/Maintenance/ConfigUtils.php
index 0bd7c00..bee41a9 100644
--- a/includes/Maintenance/ConfigUtils.php
+++ b/includes/Maintenance/ConfigUtils.php
@@ -52,7 +52,7 @@
                }
                $result = $result[ 'version' ][ 'number' ];
                $this->output( "$result..." );
-               if ( !preg_match( '/^(1|2)./', $result ) ) {
+               if ( !preg_match( '/^1./', $result ) ) {
                        $this->output( "Not supported!\n" );
                        $this->error( "Only Elasticsearch 1.x is supported.  
Your version: $result.", 1 );
                } else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e93ea2c1b5f602dc101c8c79fd958fbb8a941c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to