Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371962 )
Change subject: Revert "Switch elastic1017-1031 to niofs"
......................................................................
Revert "Switch elastic1017-1031 to niofs"
While niofs did provide some level of bandaid, the source of
the issue has been traced down to readahead on the raid
array. There is an open question of how niofs avoided the
readahead, perhaps linux's adaptive readahead only works with
standard file access and is skipped for mmap. Either way this
is no longer necessary and we will continue using the default
mmap storage implementation.
This reverts commit 288336361dbe0eac62da589cdd2a86610b0a3185.
Bug: T169498
Change-Id: Ib0b510eb4a6b564f041431b711830e5c13ab8068
---
M hieradata/regex.yaml
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch_5.yml.erb
M modules/profile/manifests/elasticsearch.pp
4 files changed, 0 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index bb995c2..dbaa90d 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -38,10 +38,6 @@
profile::elasticsearch::rack: D5
profile::elasticsearch::row: D
-es_eqiad_niofs:
- __regex: !ruby/regexp /^elastic10(1\d|2\d|30|31)\.eqiad\.wmnet$/
- profile::elasticsearch::index_store: niofs
-
es_eqiad_rack_a3:
__regex: !ruby/regexp
/^(elastic10(30|31|32|33|34|35)|relforge1001)\.eqiad\.wmnet$/
profile::elasticsearch::rack: A3
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 4f82e84..fef01ae 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -80,10 +80,6 @@
# and port are used. Defaults to undef, which means no remote reindex
can occur.
# - $script_max_compilations_per_minute: integer, max number of script
# compilations per minute, defaults to undef (see T171579).
-# - $index_store: Sets the storage implementation elasticsearch will use to
-# access index data. Defaults to fs which lets elasticsearch decide.
-# This should almost always be fs unless there is a specific issue to
-# be solved.
#
# == Sample usage:
#
@@ -124,7 +120,6 @@
$curator_uses_unicast_hosts = true,
$reindex_remote_whitelist = undef,
$script_max_compilations_per_minute = undef,
- $index_store = 'fs',
) {
# Check arguments
diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
index b4a2d59..196931d 100644
--- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
@@ -135,7 +135,6 @@
# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
# the index status.
-index.store.type: <%= @index_store %>
#################################### Paths ####################################
diff --git a/modules/profile/manifests/elasticsearch.pp
b/modules/profile/manifests/elasticsearch.pp
index 24115fd..b84f3f9 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -29,7 +29,6 @@
$recover_after_nodes =
hiera('profile::elasticsearch::recover_after_nodes', 1),
$search_shard_count_limit =
hiera('profile::elasticsearch::search_shard_count_limit'),
$reindex_remote_whitelist =
hiera('profile::elasticsearch::reindex_remote_whitelist'),
- $index_store = hiera('profile::elasticsearch::index_store', 'fs'),
) {
$master_eligible = $::fqdn in $unicast_hosts
@@ -101,7 +100,6 @@
search_shard_count_limit => $search_shard_count_limit,
reindex_remote_whitelist => $reindex_remote_whitelist,
script_max_compilations_per_minute => 10000,
- index_store => $index_store,
}
class { '::elasticsearch::https':
--
To view, visit https://gerrit.wikimedia.org/r/371962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0b510eb4a6b564f041431b711830e5c13ab8068
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
