فهرست منبع

AMBARI-14110. Clean up stop agent to not print unnecessary error message.(vbrodetskyi)

Vitaly Brodetskyi 9 سال پیش
والد
کامیت
c4d5ff90c1
2فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 1 1
      ambari-agent/src/main/python/ambari_agent/main.py
  2. 1 1
      ambari-agent/src/test/python/ambari_agent/TestMain.py

+ 1 - 1
ambari-agent/src/main/python/ambari_agent/main.py

@@ -189,7 +189,7 @@ def stop_agent():
       res = runner.run([AMBARI_SUDO_BINARY, 'kill', '-9', str(pid)])
       if res['exitCode'] != 0:
         raise Exception("Error while performing agent stop. " + res['error'] + res['output'])
-    sys.exit(1)
+    sys.exit(0)
 
 def reset_agent(options):
   try:

+ 1 - 1
ambari-agent/src/test/python/ambari_agent/TestMain.py

@@ -232,7 +232,7 @@ class TestMain(unittest.TestCase):
       main.stop_agent()
       kill_mock.assert_any_call(['ambari-sudo.sh', 'kill', '-15', pid])
       kill_mock.assert_any_call(['ambari-sudo.sh', 'kill', '-9', pid])
-      sys_exit_mock.assert_called_with(1)
+      sys_exit_mock.assert_called_with(0)
 
     # Restore
     ProcessHelper.pidfile = oldpid