Repository: ambari Updated Branches: refs/heads/trunk 14617e76a -> 24e9b6d26
AMBARI-16717 - Knox Gateway Uses Wrong Keystore After Upgrade (part2) (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24e9b6d2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24e9b6d2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24e9b6d2 Branch: refs/heads/trunk Commit: 24e9b6d262528029b581ecdab789e148de998e1a Parents: 14617e7 Author: Jonathan Hurley <[email protected]> Authored: Wed May 18 14:44:34 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Wed May 18 14:44:41 2016 -0400 ---------------------------------------------------------------------- .../FLUME/1.4.0.2.0/package/scripts/flume_handler.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24e9b6d2/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py index 46dce56..107ce6d 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_handler.py @@ -23,11 +23,12 @@ from flume import get_desired_state from resource_management.libraries.script.script import Script from resource_management.libraries.functions import conf_select, stack_select from resource_management.libraries.functions.flume_agent_helper import find_expected_agent_names, get_flume_status +from resource_management.core.exceptions import ComponentIsNotRunning from resource_management.core.logger import Logger from resource_management.core.resources.service import Service import service_mapping from ambari_commons import OSConst -from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl +from ambari_commons.os_family_impl import OsFamilyImpl from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.constants import StackFeature @@ -102,6 +103,7 @@ class FlumeHandlerLinux(FlumeHandler): @OsFamilyImpl(os_family=OSConst.WINSRV_FAMILY) class FlumeHandlerWindows(FlumeHandler): def install(self, env): + from resource_management.libraries.functions.windows_service_utils import check_windows_service_exists if not check_windows_service_exists(service_mapping.flume_win_service_name): self.install_packages(env) self.configure(env) @@ -117,6 +119,7 @@ class FlumeHandlerWindows(FlumeHandler): def status(self, env): import params + from resource_management.libraries.functions.windows_service_utils import check_windows_service_status check_windows_service_status(service_mapping.flume_win_service_name) if __name__ == "__main__":
