Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove all relics of defunct implementation of logviewer autolaunchin…
…g, which was very limited and required having only 1 topology per storm cluster (#238)
  • Loading branch information
erikdw committed Mar 16, 2018
1 parent b4b3b56 commit ca89032
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 283 deletions.
8 changes: 4 additions & 4 deletions storm.yaml
Expand Up @@ -21,14 +21,14 @@ supervisor.childopts: "-Xmx400m"
# Configs for Resource Aware Scheduler
topology.worker.max.heap.size.mb: 768.0 # default max heap size, can be overriden in topologies' configs

# The default behavior is to launch the logviewer unless autostart is false.
# If you enable the logviewer, you'll need to add memory overhead to the
# executor for the logviewer.
# By default this framework will launch a logviewer mesos executor on each mesos host where Storm workers are launched.
# Set to false to disable logviewer from being automatically launched.
mesos.logviewer.sidecar.enabled: true
# This port must be available on every mesos host where Storm workers are launched.
logviewer.port: 8000
logviewer.childopts: "-Xmx128m"
logviewer.cleanup.age.mins: 10080
logviewer.appender.name: "A1"
mesos.logviewer.sidecar.enabled: true

# Use the public Mesosphere Storm build
# Please note that it won't work with other distributions.
Expand Down
12 changes: 0 additions & 12 deletions storm/src/main/storm/mesos/MesosSupervisor.java
Expand Up @@ -35,7 +35,6 @@
import org.json.simple.JSONValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import storm.mesos.logviewer.LogViewerController;
import storm.mesos.util.MesosCommon;

import java.lang.reflect.Method;
Expand Down Expand Up @@ -90,13 +89,6 @@ public void prepare(Map conf, String localDir) {
_conf = conf;
try {
_executor.waitUntilRegistered();

if (startLogViewer(conf)) {
LOG.info("Starting logviewer...");
LogViewerController logController = new LogViewerController(conf);
logController.start();
}

} catch (InterruptedException e) {
throw new RuntimeException(e);
}
Expand Down Expand Up @@ -165,10 +157,6 @@ public void killedWorker(int port) {
_driver.sendStatusUpdate(status);
}

protected boolean startLogViewer(Map conf) {
return MesosCommon.enabledLogviewerSidecar(conf);
}

class StormExecutor implements Executor {
private CountDownLatch _registeredLatch = new CountDownLatch(1);

Expand Down
114 changes: 0 additions & 114 deletions storm/src/main/storm/mesos/logviewer/LogViewerController.java

This file was deleted.

56 changes: 0 additions & 56 deletions storm/src/main/storm/mesos/logviewer/SocketUrlDetection.java

This file was deleted.

97 changes: 0 additions & 97 deletions storm/src/test/storm/mesos/logviewer/SocketUrlDetectionTest.java

This file was deleted.

0 comments on commit ca89032

Please sign in to comment.