AMBARI-1860. Master broken - Cannot deploy services. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1466215 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -665,6 +665,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1860. Master broken - Cannot deploy services. (smohanty)
+
  AMBARI-1859. Cannot load Nagios Alerts due to 400 Bad Request. (smohanty)
 
  AMBARI-1842. Collapsable service restart message section should have pointer 

ambari-server/src/main/java/org/apache/ambari/eventdb/webservice/WorkflowJsonService.java

@@ -81,6 +81,9 @@ public class WorkflowJsonService {
   public static void setDBProperties(Configuration configuration) {
     DEFAULT_DRIVER = configuration.getRcaDatabaseDriver();
     DEFAULT_URL = configuration.getRcaDatabaseUrl();
+    if (DEFAULT_URL.contains(Configuration.HOSTNAME_MACRO)) {
+      DEFAULT_URL = DEFAULT_URL.replace(Configuration.HOSTNAME_MACRO, "localhost");
+    }
     DEFAULT_USERNAME = configuration.getRcaDatabaseUser();
     DEFAULT_PASSWORD = configuration.getRcaDatabasePassword();
   }

ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -130,7 +130,8 @@ public class Configuration {
   public static final String JDBC_IN_MEMORY_URL = "jdbc:derby:memory:myDB/ambari;create=true";
   public static final String JDBC_IN_MEMROY_DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
 
-  public static final String JDBC_RCA_LOCAL_URL = "jdbc:postgresql://localhost/ambarirca";
+  public static final String HOSTNAME_MACRO = "{hostname}";
+  public static final String JDBC_RCA_LOCAL_URL = "jdbc:postgresql://" + HOSTNAME_MACRO + "/ambarirca";
   public static final String JDBC_RCA_LOCAL_DRIVER = "org.postgresql.Driver";
 
   private static final String SERVER_JDBC_USER_NAME_DEFAULT = "ambari-server";

ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java

@@ -207,7 +207,11 @@ public class StageUtils {
             //Set up ambari-rca connection properties, is this a hack?
 //            info.put("ambari_db_server_host", Arrays.asList(hostsMap.getHostMap(getHostName())));
             Configuration configuration = injector.getInstance(Configuration.class);
-            info.put("ambari_db_rca_url", Arrays.asList(configuration.getRcaDatabaseUrl()));
+            String url = configuration.getRcaDatabaseUrl();
+            if (url.contains(Configuration.HOSTNAME_MACRO)) {
+              url = url.replace(Configuration.HOSTNAME_MACRO, hostsMap.getHostMap(getHostName()));
+            }
+            info.put("ambari_db_rca_url", Arrays.asList(url));
             info.put("ambari_db_rca_driver", Arrays.asList(configuration.getRcaDatabaseDriver()));
             info.put("ambari_db_rca_username", Arrays.asList(configuration.getRcaDatabaseUser()));
             info.put("ambari_db_rca_password", Arrays.asList(configuration.getRcaDatabasePassword()));

ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java

@@ -18,8 +18,12 @@
 package org.apache.ambari.server.utils;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -157,7 +161,7 @@ public class TestStageUtils {
   }
 
   @Test
-  public void testGetClusterHostInfo() throws AmbariException {
+  public void testGetClusterHostInfo() throws AmbariException, UnknownHostException {
     Clusters fsm = injector.getInstance(Clusters.class);
     fsm.addCluster("c1");
     fsm.addHost("h1");
@@ -181,5 +185,10 @@ public class TestStageUtils {
     assertEquals(2, info.get("slave_hosts").size());
     assertEquals(1, info.get("hbase_master_hosts").size());
     assertEquals("h1", info.get("hbase_master_hosts").get(0));
+
+    assertFalse(info.get("ambari_db_rca_url").get(0).contains(Configuration.HOSTNAME_MACRO));
+    String address = InetAddress.getLocalHost().getCanonicalHostName();
+    assertTrue(info.get("ambari_db_rca_url").get(0).contains(address));
+
   }
 }