Fixing a big hostname bug that affects HA mode

gomes · Oct 23, 2013 · 875c9cf · 875c9cf
1 parent 9db62fc
commit 875c9cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/bin/chronos-marathon b/bin/chronos-marathon
@@ -13,6 +13,8 @@ flags=()
 
 #If we're on Amazon, let's use the public hostname so redirect works as expected.
 if public_hostname="$( curl -f --timeout 1 http://169.254.169.254/latest/meta-data/public-hostname )"
+else
+  flags+=( --hostname `hostname` )
 then
   flags+=( --hostname $public_hostname )
 fi

diff --git a/src/main/scala/com/airbnb/scheduler/config/SchedulerConfiguration.scala b/src/main/scala/com/airbnb/scheduler/config/SchedulerConfiguration.scala
@@ -43,7 +43,7 @@ trait SchedulerConfiguration extends ScallopConf {
   lazy val hostname = opt[String]("hostname",
     descr = "The advertised hostname stored in ZooKeeper so another standby " +
       "host can redirect to this elected leader",
-    default = Some("localhost"))
+    default = Some(java.net.InetAddress.getLocalHost().getHostName()))
 
   lazy val leaderMaxIdleTimeMs = opt[Int]("leader_max_idle_time",
     descr = "The look-ahead time for scheduling tasks in milliseconds",

diff --git a/src/main/scala/com/airbnb/scheduler/config/ZookeeperModule.scala b/src/main/scala/com/airbnb/scheduler/config/ZookeeperModule.scala
@@ -72,7 +72,7 @@ class ZookeeperModule(val config: SchedulerConfiguration with HttpConf)
       config.zooKeeperCandidatePath),
       new Supplier[Array[Byte]] {
         def get() = {
-          "%s:%d".format(config.hostname, config.httpPort()).getBytes
+          "%s:%d".format(config.hostname(), config.httpPort()).getBytes
         }
       })
   }