Skip to content

Commit 5b644b1

Browse files
author
Peter Kolloch
committed
Merge pull request #525 from mesos/gk/set_hostname
Set the hostname in the framework information proto
2 parents a6e6d93 + 573b17c commit 5b644b1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/main/scala/org/apache/mesos/chronos/scheduler/config/SchedulerConfiguration.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ trait SchedulerConfiguration extends ScallopConf {
3737
descr = "The list of ZooKeeper servers for storing state",
3838
default = Some("localhost:2181"))
3939
lazy val hostname = opt[String]("hostname",
40-
descr = "The advertised hostname stored in ZooKeeper so another standby " +
41-
"host can redirect to this elected leader",
40+
descr = "The advertised hostname of this Chronos instance for network communication. This is used by other" +
41+
"Chronos instances and the Mesos master to communicate with this instance",
4242
default = Some(java.net.InetAddress.getLocalHost.getHostName))
4343
lazy val leaderMaxIdleTimeMs = opt[Int]("leader_max_idle_time",
4444
descr = "The look-ahead time for scheduling tasks in milliseconds",

src/main/scala/org/apache/mesos/chronos/scheduler/mesos/SchedulerDriverBuilder.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ class SchedulerDriverBuilder {
4747
.setRole(config.mesosRole())
4848
.setFailoverTimeout(config.failoverTimeoutSeconds())
4949
.setUser(config.user())
50+
.setHostname(config.hostname())
5051

5152
// Set the ID, if provided
5253
frameworkId.foreach(frameworkInfoBuilder.setId)

0 commit comments

Comments
 (0)