Repository: ambari Updated Branches: refs/heads/trunk 813973a05 -> 4894eabd5
AMBARI-9955: Ambari-Server and Ambari-Agent fail to start on Windows (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4894eabd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4894eabd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4894eabd Branch: refs/heads/trunk Commit: 4894eabd5d05e585b563aa4e2e5c055418e404a1 Parents: 813973a Author: Jayush Luniya <[email protected]> Authored: Fri Mar 6 10:09:20 2015 -0800 Committer: Jayush Luniya <[email protected]> Committed: Fri Mar 6 10:09:20 2015 -0800 ---------------------------------------------------------------------- .../org/apache/ambari/server/configuration/Configuration.java | 2 ++ .../common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py | 4 ++++ .../apache/ambari/server/configuration/ConfigurationTest.java | 3 +++ 3 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index c5595e6..1129265 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -1343,6 +1343,8 @@ public class Configuration { databaseType = DatabaseType.MYSQL; } else if (dbUrl.contains(DatabaseType.DERBY.getName())) { databaseType = DatabaseType.DERBY; + } else if (dbUrl.contains(DatabaseType.SQL_SERVER.getName())) { + databaseType = DatabaseType.SQL_SERVER; } else { throw new RuntimeException( "The database type could be not determined from the JDBC URL " http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py index bc10adf..57523a5 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py @@ -183,6 +183,10 @@ class NameNode(Script): threshold = name_node_parameters['threshold'] _print("Starting balancer with threshold = %s\n" % threshold) + if params.security_enabled: + Execute(format("{kinit_path_local} -kt {hdfs_user_keytab} {hdfs_principal_name}"), + user = params.hdfs_user) + def calculateCompletePercent(first, current): return 1.0 - current.bytesLeftToMove/first.bytesLeftToMove http://git-wip-us.apache.org/repos/asf/ambari/blob/4894eabd/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java index ced3087..63447ca 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ConfigurationTest.java @@ -437,5 +437,8 @@ public class ConfigurationTest { ambariProperties.setProperty(Configuration.SERVER_JDBC_URL_KEY, "jdbc:derby://server"); Assert.assertEquals( DatabaseType.DERBY, configuration.getDatabaseType() ); + + ambariProperties.setProperty(Configuration.SERVER_JDBC_URL_KEY, "jdbc:sqlserver://server"); + Assert.assertEquals( DatabaseType.SQL_SERVER, configuration.getDatabaseType() ); } }
