Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Maintenance: Make ES connection establishment more stable by:

Browse source 
- performing a retry when Net::OpenTimeout exceptions occur
- cache the result of ES version check
This commit is contained in:
Thorsten Eckel 2019-09-16 11:15:12 +02:00
parent 256e7513b3
commit 429b95e65d
3 changed files with 87 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
lib/search_index_backend.rb
View file

@ -19,11 +19,12 @@ info about used search index machine
url,
{},
{
json: true,
open_timeout: 8,
read_timeout: 14,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 8,
read_timeout: 14,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -82,11 +83,12 @@ update processors
response = UserAgent.delete(
url,
{
json: true,
open_timeout: 8,
read_timeout: 60,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 8,
read_timeout: 60,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -106,11 +108,12 @@ update processors
url,
item,
{
json: true,
open_timeout: 8,
read_timeout: 60,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 8,
read_timeout: 60,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -179,11 +182,12 @@ create/update/delete index
url,
data[:data],
{
json: true,
open_timeout: 8,
read_timeout: 60,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 8,
read_timeout: 60,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -217,11 +221,12 @@ add new object to search index
url,
data,
{
json: true,
open_timeout: 8,
read_timeout: 60,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 8,
read_timeout: 60,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -254,10 +259,11 @@ remove whole data from index
response = UserAgent.delete(
url,
{
open_timeout: 8,
read_timeout: 60,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
open_timeout: 8,
read_timeout: 60,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
Rails.logger.info "# #{response.code}"
@ -365,11 +371,12 @@ remove whole data from index
url,
query_data,
{
json: true,
open_timeout: 5,
read_timeout: 14,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 5,
read_timeout: 14,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)
@ -512,11 +519,12 @@ example for aggregations within one year
url,
data,
{
json: true,
open_timeout: 5,
read_timeout: 14,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
json: true,
open_timeout: 5,
read_timeout: 14,
open_socket_tries: 3,
user: Setting.get('es_user'),
password: Setting.get('es_password'),
}
)

12
lib/tasks/search_index_es.rake
View file

@ -275,12 +275,14 @@ end
# get es version
def es_version
info = SearchIndexBackend.info
number = nil
if info.present?
number = info['version']['number'].to_s
@es_version ||= begin
info = SearchIndexBackend.info
number = nil
if info.present?
number = info['version']['number'].to_s
end
number
end
number
end
# no es_pipeline for elasticsearch 5.5 and lower

45
lib/user_agent.rb
View file

@ -59,9 +59,12 @@ returns
# start http call
begin
total_timeout = options[:total_timeout] || 60
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
handled_open_timeout(options[:open_socket_tries]) do
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
end
end
rescue => e
log(url, request, nil, options)
@ -112,9 +115,12 @@ returns
# start http call
begin
total_timeout = options[:total_timeout] || 60
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
handled_open_timeout(options[:open_socket_tries]) do
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
end
end
rescue => e
log(url, request, nil, options)
@ -164,9 +170,12 @@ returns
# start http call
begin
total_timeout = options[:total_timeout] || 60
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
handled_open_timeout(options[:open_socket_tries]) do
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, params, options)
end
end
rescue => e
log(url, request, nil, options)
@ -209,9 +218,11 @@ returns
# start http call
begin
total_timeout = options[:total_timeout] || 60
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, {}, options)
handled_open_timeout(options[:open_socket_tries]) do
Timeout.timeout(total_timeout) do
response = http.request(request)
return process(request, response, uri, count, {}, options)
end
end
rescue => e
log(url, request, nil, options)
@ -488,6 +499,16 @@ returns
)
end
def self.handled_open_timeout(tries)
tries ||= 1
tries.times do |index|
yield
rescue Net::OpenTimeout
raise if (index + 1) == tries
end
end
class Result
attr_reader :error