Skip to content

Commit 9d2f5a1

Browse files
committed
Removed healthcheck. Removed executor from settings.gradle.
1 parent 98e63a1 commit 9d2f5a1

File tree

14 files changed

+5
-635
lines changed

14 files changed

+5
-635
lines changed

scheduler/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dependencies {
4848
compile 'org.webjars.bower:hightcharts:4.1.5'
4949
compile "org.webjars.bower:highcharts-ng:0.0.8"
5050
compile 'com.jayway.awaitility:awaitility:1.6.3'
51+
compile 'com.mashape.unirest:unirest-java:1.4.5'
5152

5253
testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
5354
testCompile 'org.hamcrest:hamcrest-core:1.3'

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/Main.java

-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.apache.log4j.Logger;
44
import org.apache.mesos.MesosSchedulerDriver;
55
import org.apache.mesos.Protos;
6-
import org.apache.mesos.elasticsearch.scheduler.cluster.ClusterMonitor;
76
import org.apache.mesos.elasticsearch.scheduler.state.ClusterState;
87
import org.apache.mesos.elasticsearch.scheduler.state.FrameworkState;
98
import org.apache.mesos.elasticsearch.scheduler.state.SerializableZookeeperState;
@@ -58,8 +57,6 @@ public void run(String[] args) {
5857
taskInfoFactory,
5958
new OfferStrategy(configuration, clusterState),
6059
zookeeperStateDriver);
61-
new ClusterMonitor(configuration, frameworkState, zookeeperStateDriver, scheduler);
62-
6360

6461
FrameworkInfoFactory frameworkInfoFactory = new FrameworkInfoFactory(configuration, frameworkState);
6562
final Protos.FrameworkInfo.Builder frameworkBuilder = frameworkInfoFactory.getBuilder();

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java

+4
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,10 @@ public static Task parse(Protos.TaskInfo taskInfo, Protos.TaskStatus taskStatus,
166166
.orElseGet(clock::nowUTC)
167167
.withZoneSameInstant(ZoneOffset.UTC);
168168

169+
if (!taskInfo.getDiscovery().isInitialized()) {
170+
throw new IndexOutOfBoundsException("TaskInfo has no discovery information.");
171+
}
172+
169173
return new Task(
170174
hostName,
171175
taskInfo.getTaskId().getValue(),

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/cluster/ClusterMonitor.java

-101
This file was deleted.

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/healthcheck/AsyncPing.java

-45
This file was deleted.

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/healthcheck/BumpExecutor.java

-26
This file was deleted.

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/healthcheck/ExecutorHealth.java

-72
This file was deleted.

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/healthcheck/ExecutorHealthCheck.java

-33
This file was deleted.

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/healthcheck/PollService.java

-51
This file was deleted.

0 commit comments

Comments
 (0)