github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-26 08:07:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

Do not start scheduled pings until transport start

Browse source 
Today, scheduled pings in NettyTransport can start before the transport
is started. Instead, these pings should not be scheduled until after the
transport is started. This commit modifies NettyTransport so that this
is the case.

Relates #18702
This commit is contained in:
Jason Tedor 2016-06-02 13:12:21 -04:00
parent b6f26c0c37
commit f67e5807ca
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java
View file

@ -287,9 +287,6 @@ public class NettyTransport extends AbstractLifecycleComponent<Transport> implem
this.scheduledPing = new ScheduledPing(); this.scheduledPing = new ScheduledPing();
this.pingSchedule = PING_SCHEDULE.get(settings); this.pingSchedule = PING_SCHEDULE.get(settings);
if (pingSchedule.millis() > 0) {
threadPool.schedule(pingSchedule, ThreadPool.Names.GENERIC, scheduledPing);
}
this.namedWriteableRegistry = namedWriteableRegistry; this.namedWriteableRegistry = namedWriteableRegistry;
this.circuitBreakerService = circuitBreakerService; this.circuitBreakerService = circuitBreakerService;
} }
@ -366,6 +363,9 @@ public class NettyTransport extends AbstractLifecycleComponent<Transport> implem
bindServerBootstrap(name, mergedSettings); bindServerBootstrap(name, mergedSettings);
} }
} }
if (pingSchedule.millis() > 0) {
threadPool.schedule(pingSchedule, ThreadPool.Names.GENERIC, scheduledPing);
}
success = true; success = true;
} finally { } finally {
if (success == false) { if (success == false) {