From d7f624d4ea56240971294c8f4b87cd46c184f116 Mon Sep 17 00:00:00 2001 From: Phil Winder Date: Wed, 23 Mar 2016 09:51:02 +0000 Subject: [PATCH] Add name and protocol to discovery info packet. --- .../elasticsearch/scheduler/TaskInfoFactory.java | 11 ++++++----- .../elasticsearch/scheduler/TaskInfoFactoryTest.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java index caa8813f..3d433119 100644 --- a/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java +++ b/scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java @@ -67,7 +67,7 @@ public Protos.TaskInfo createTask(Configuration configuration, FrameworkState fr private Protos.TaskInfo buildNativeTask(Protos.Offer offer, Configuration configuration, Clock clock, Long elasticSearchNodeId) { final List ports = getPorts(offer, configuration); final List resources = getResources(configuration, ports); - final Protos.DiscoveryInfo discovery = getDiscovery(ports); + final Protos.DiscoveryInfo discovery = getDiscovery(ports, configuration); final String hostAddress = resolveHostAddress(offer, ports); @@ -89,7 +89,7 @@ private Protos.TaskInfo buildNativeTask(Protos.Offer offer, Configuration config private Protos.TaskInfo buildDockerTask(Protos.Offer offer, Configuration configuration, Clock clock, Long elasticSearchNodeId) { final List ports = getPorts(offer, configuration); final List resources = getResources(configuration, ports); - final Protos.DiscoveryInfo discovery = getDiscovery(ports); + final Protos.DiscoveryInfo discovery = getDiscovery(ports, configuration); final String hostAddress = resolveHostAddress(offer, ports); @@ -135,13 +135,14 @@ private List getResources(Configuration configuration, List ports) { + private Protos.DiscoveryInfo getDiscovery(List ports, Configuration configuration) { Protos.DiscoveryInfo.Builder discovery = Protos.DiscoveryInfo.newBuilder(); Protos.Ports.Builder discoveryPorts = Protos.Ports.newBuilder(); - discoveryPorts.addPorts(Discovery.CLIENT_PORT_INDEX, Protos.Port.newBuilder().setNumber(ports.get(0)).setName(Discovery.CLIENT_PORT_NAME)); - discoveryPorts.addPorts(Discovery.TRANSPORT_PORT_INDEX, Protos.Port.newBuilder().setNumber(ports.get(1)).setName(Discovery.TRANSPORT_PORT_NAME)); + discoveryPorts.addPorts(Discovery.CLIENT_PORT_INDEX, Protos.Port.newBuilder().setNumber(ports.get(0)).setName(Discovery.CLIENT_PORT_NAME).setProtocol("TCP")); + discoveryPorts.addPorts(Discovery.TRANSPORT_PORT_INDEX, Protos.Port.newBuilder().setNumber(ports.get(1)).setName(Discovery.TRANSPORT_PORT_NAME).setProtocol("TCP")); discovery.setPorts(discoveryPorts); discovery.setVisibility(Protos.DiscoveryInfo.Visibility.EXTERNAL); + discovery.setName(configuration.getTaskName()); return discovery.build(); } diff --git a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java index b2a293f3..97b1c50d 100644 --- a/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java +++ b/scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java @@ -51,7 +51,7 @@ public class TaskInfoFactoryTest { public void before() { Protos.FrameworkID frameworkId = Protos.FrameworkID.newBuilder().setValue(UUID.randomUUID().toString()).build(); when(frameworkState.getFrameworkID()).thenReturn(frameworkId); - when(configuration.getTaskName()).thenReturn("esdemo"); + when(configuration.getTaskName()).thenReturn(Configuration.EXECUTOR_NAME); when(configuration.getMesosZKURL()).thenReturn("zk://zookeeper:2181/mesos"); when(configuration.getExecutorImage()).thenReturn(Configuration.DEFAULT_EXECUTOR_IMAGE); when(configuration.getElasticsearchSettingsLocation()).thenReturn(Configuration.HOST_PATH_CONF);