Browse Source

AMBARI-4905. Restart all on HDFS fails (Ambari DB: mysql). (mahadev)

Mahadev Konar 11 years ago
parent
commit
4a3ed67e1c

+ 4 - 0
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -1537,7 +1537,11 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     hostLevelParams.put(STACK_NAME, stackId.getStackName());
     hostLevelParams.put(STACK_VERSION, stackId.getStackVersion());
     hostLevelParams.put(DB_NAME, getServerDB());
+    hostLevelParams.put(MYSQL_JDBC_URL, getMysqljdbcUrl());
+    hostLevelParams.put(ORACLE_JDBC_URL, getOjdbcUrl());
+    hostLevelParams.put(DB_DRIVER_FILENAME, configs.getMySQLJarName());
     hostLevelParams.putAll(getRcaParameters());
+    
     return hostLevelParams;
   }
 

+ 6 - 1
ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java

@@ -4000,8 +4000,13 @@ public class AmbariManagementControllerTest {
     Assert.assertEquals("RESTART HDFS/HDFS_CLIENT", hrc.getCommandDetail());
     Map<String, String> roleParams = hrc.getExecutionCommandWrapper()
       .getExecutionCommand().getRoleParams();
-
+    Map<String, String> hostParams = hrc.getExecutionCommandWrapper()
+        .getExecutionCommand().getHostLevelParams();
+        
     Assert.assertNotNull(roleParams);
+    Assert.assertTrue(hostParams.containsKey(ExecutionCommand.KeyNames.DB_DRIVER_FILENAME));
+    Assert.assertTrue(hostParams.containsKey(ExecutionCommand.KeyNames.MYSQL_JDBC_URL));
+    Assert.assertTrue(hostParams.containsKey(ExecutionCommand.KeyNames.ORACLE_JDBC_URL));
     Assert.assertEquals("CLIENT", roleParams.get(ExecutionCommand.KeyNames.COMPONENT_CATEGORY));
   }