You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2018/07/24 14:35:35 UTC
[ambari] branch branch-2.7 updated: AMBARI-24323. Adding a
component when the agent scripts are moved out and file download disabled
takes > 1 hour and timeout (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new fef6e8f AMBARI-24323. Adding a component when the agent scripts are moved out and file download disabled takes > 1 hour and timeout (aonishuk)
fef6e8f is described below
commit fef6e8f2857e845dcbd8230618f34a3db60d743c
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Mon Jul 23 17:22:13 2018 +0300
AMBARI-24323. Adding a component when the agent scripts are moved out and file download disabled takes > 1 hour and timeout (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 51a0d59..c12b473 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -462,7 +462,8 @@ class CustomServiceOrchestrator():
if incremented_commands_for_component:
self.commands_for_component_in_progress[cluster_id][command['role']] -= 1
- self.conditionally_remove_command_file(json_path, ret)
+ if json_path:
+ self.conditionally_remove_command_file(json_path, ret)
return ret