Skip to content
This repository has been archived by the owner on Jan 10, 2019. It is now read-only.

mesos_user_http_host #114

Merged
merged 1 commit into from
Jul 7, 2015
Merged

mesos_user_http_host #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...esos-framework/src/main/java/io/mesosphere/mesos/frameworks/cassandra/framework/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.slf4j.LoggerFactory;
import org.slf4j.bridge.SLF4JBridgeHandler;

import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
import java.util.concurrent.TimeUnit;
Expand All @@ -53,7 +52,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static io.mesosphere.mesos.frameworks.cassandra.scheduler.util.InetAddressUtils.formatInetAddress;
import static io.mesosphere.mesos.util.ProtoUtils.frameworkId;

public final class Main {
Expand Down Expand Up @@ -111,6 +109,7 @@ private static int _main() throws UnknownHostException {
}

final int port0 = Integer.parseInt(portOption.get());
final String host = Env.option("HOST").or("localhost");

final int executorCount = Integer.parseInt( Env.option("CASSANDRA_NODE_COUNT").or("3"));
final int seedCount = Integer.parseInt( Env.option("CASSANDRA_SEED_COUNT").or("2"));
Expand All @@ -125,6 +124,7 @@ private static int _main() throws UnknownHostException {
final String zkUrl = Env.option("CASSANDRA_ZK").or("zk://localhost:2181/cassandra-mesos");
final long zkTimeoutMs = Long.parseLong( Env.option("CASSANDRA_ZK_TIMEOUT_MS").or("10000"));
final String mesosMasterZkUrl = Env.option("MESOS_ZK").or("zk://localhost:2181/mesos");
final String mesosUser = Env.option("MESOS_USER").or("");
final long failoverTimeout = Long.parseLong( Env.option("CASSANDRA_FAILOVER_TIMEOUT_SECONDS").or(String.valueOf(Period.days(7).toStandardSeconds().getSeconds())));
final String mesosRole = Env.option("CASSANDRA_FRAMEWORK_MESOS_ROLE").or("*");
final String dataDirectory = Env.option("CASSANDRA_DATA_DIRECTORY").or(DEFAULT_DATA_DIRECTORY); // TODO: Temporary. Will be removed when MESOS-1554 is released
Expand Down Expand Up @@ -165,7 +165,7 @@ private static int _main() throws UnknownHostException {
final FrameworkInfo.Builder frameworkBuilder =
FrameworkInfo.newBuilder()
.setFailoverTimeout(failoverTimeout)
.setUser("") // Have Mesos fill in the current user.
.setUser(mesosUser)
.setName(frameworkName)
.setRole(mesosRole)
.setCheckpoint(true);
Expand All @@ -175,7 +175,7 @@ private static int _main() throws UnknownHostException {
frameworkBuilder.setId(frameworkId(frameworkId.get()));
}

final URI httpServerBaseUri = URI.create(String.format("http://%s:%d/", formatInetAddress(InetAddress.getLocalHost()), port0));
final URI httpServerBaseUri = URI.create("http://" + host + ":" + port0 + "/");

final Clock clock = new SystemClock();
final PersistedCassandraClusterHealthCheckHistory healthCheckHistory = new PersistedCassandraClusterHealthCheckHistory(state);
Expand Down