Repository: ambari
Updated Branches:
  refs/heads/trunk 24b005a7e -> ef262ecf2


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/ef262ecf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef262ecf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef262ecf

Branch: refs/heads/trunk
Commit: ef262ecf2ad73ab23bc398bcb43765320aeda1ab
Parents: 24b005a
Author: Jayush Luniya <jlun...@hortonworks.com>
Authored: Fri Mar 6 14:19:02 2015 -0800
Committer: Jayush Luniya <jlun...@hortonworks.com>
Committed: Fri Mar 6 14:19:02 2015 -0800

----------------------------------------------------------------------
 ambari-common/src/main/python/resource_management/core/shell.py  | 2 +-
 .../common-services/HDFS/2.1.0.2.0/package/scripts/namenode.py   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef262ecf/ambari-common/src/main/python/resource_management/core/shell.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py 
b/ambari-common/src/main/python/resource_management/core/shell.py
index b1ab0bc..d57a450 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -23,7 +23,6 @@ Ambari Agent
 __all__ = ["non_blocking_call", "checked_call", "call", "quote_bash_args", 
"as_user", "as_sudo"]
 
 import os
-import pty
 import select
 import sys
 import logging
@@ -137,6 +136,7 @@ def _call(command, logoutput=None, throw_on_failure=True,
   for placeholder, replacement in PLACEHOLDERS_TO_STR.iteritems():
     command = command.replace(placeholder, replacement.format(env_str=env_str))
 
+  import pty
   master_fd, slave_fd = pty.openpty()
 
   # --noprofile is used to preserve PATH set for ambari-agent

http://git-wip-us.apache.org/repos/asf/ambari/blob/ef262ecf/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 57523a5..bc10adf 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,10 +183,6 @@ 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
 

Reply via email to