You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/12/12 14:17:07 UTC
[1/2] ambari git commit: AMBARI-8557 - Python EXE path seems to be
hardcoded in ambari-env.cmd (Eugene Chekanskiy via abaranchuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 42f8d67dd -> 69afc2a05
AMBARI-8557 - Python EXE path seems to be hardcoded in ambari-env.cmd (Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcbc0d95
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcbc0d95
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcbc0d95
Branch: refs/heads/trunk
Commit: dcbc0d956710aa9c7cee7418ff023bd01cc6aa2f
Parents: 42f8d67
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Fri Dec 12 15:15:28 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Fri Dec 12 15:15:28 2014 +0200
----------------------------------------------------------------------
ambari-agent/conf/windows/ambari-env.cmd | 4 +---
ambari-agent/conf/windows/service_wrapper.py | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcbc0d95/ambari-agent/conf/windows/ambari-env.cmd
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/windows/ambari-env.cmd b/ambari-agent/conf/windows/ambari-env.cmd
index 6e0c317..20c5cbc 100644
--- a/ambari-agent/conf/windows/ambari-env.cmd
+++ b/ambari-agent/conf/windows/ambari-env.cmd
@@ -15,8 +15,6 @@ REM See the License for the specific language governing permissions and
REM limitations under the License.
set SERVICE_NAME=Ambari Agent
-REM REM set AMBARI_AGENT_CONF_DIR=C:\work\test\agent
+REM set AMBARI_AGENT_CONF_DIR=C:\work\test\agent
REM set AMBARI_AGENT_LOG_DIR=logs
set AGENT_SERVICE_WRAPPER=sbin\service_wrapper.py
-REM python exe that will be used for command execution(must have access to pywin32 and agent python code)
-set PYTHON_EXE=C:\Python27\python.exe
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcbc0d95/ambari-agent/conf/windows/service_wrapper.py
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/windows/service_wrapper.py b/ambari-agent/conf/windows/service_wrapper.py
index 7eabb56..40be1d0 100644
--- a/ambari-agent/conf/windows/service_wrapper.py
+++ b/ambari-agent/conf/windows/service_wrapper.py
@@ -28,6 +28,7 @@ from ambari_commons.ambari_service import AmbariService, ENV_PYTHON_PATH
from ambari_commons.exceptions import *
from ambari_commons.logging_utils import *
from ambari_commons.os_windows import WinServiceController
+from ambari_commons.os_utils import find_in_path
from ambari_agent.AmbariConfig import AmbariConfig
from ambari_agent.HeartbeatHandlers import HeartbeatStopHandlers
@@ -55,6 +56,8 @@ def parse_options():
os.environ["AMBARI_AGENT_LOG_DIR"] = os.path.join("\\", "var", "log", "ambari-agent")
if not os.path.exists(os.environ["AMBARI_AGENT_LOG_DIR"]):
os.makedirs(os.environ["AMBARI_AGENT_LOG_DIR"])
+ if not os.environ.has_key("PYTHON_EXE"):
+ os.environ["PYTHON_EXE"] = find_in_path("python.exe")
class AmbariAgentService(AmbariService):
[2/2] ambari git commit: AMBARI-8640 - Namenode install fails on
multi-drive environment (Eugene Chekanskiy via abaranchuk)
Posted by ab...@apache.org.
AMBARI-8640 - Namenode install fails on multi-drive environment (Eugene Chekanskiy via abaranchuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/69afc2a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/69afc2a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/69afc2a0
Branch: refs/heads/trunk
Commit: 69afc2a0505b4852b10a93cac74d9badf368e8ec
Parents: dcbc0d9
Author: Artem Baranchuk <ab...@hortonworks.com>
Authored: Fri Dec 12 15:16:45 2014 +0200
Committer: Artem Baranchuk <ab...@hortonworks.com>
Committed: Fri Dec 12 15:16:45 2014 +0200
----------------------------------------------------------------------
.../stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/69afc2a0/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
index 3b292f2..174355f 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/HDFS/package/scripts/hdfs.py
@@ -25,7 +25,8 @@ import os
def hdfs(component=None):
import params
if component == "namenode":
- Directory(params.dfs_name_dir,
+ directories = params.dfs_name_dir.split(",")
+ Directory(directories,
owner=params.hdfs_user,
mode="(OI)(CI)F",
recursive=True