Browse Source

AMBARI-9198. Failing on host re-register (aonishuk)

Andrew Onishuk 10 years ago
parent
commit
20250f473e

+ 1 - 1
ambari-server/src/main/python/bootstrap.py

@@ -243,7 +243,7 @@ class Bootstrap(threading.Thread):
     params = self.shared_state
     user = params.user
 
-    command = "[ -d {0} ] || sudo mkdir -p {0} ; sudo chown {1} {0}".format(self.TEMP_FOLDER,params.user)
+    command = "sudo mkdir -p {0} ; sudo chown -R {1} {0}".format(self.TEMP_FOLDER,params.user)
 
     ssh = SSH(params.user, params.sshkey_file, self.host, command,
               params.bootdir, self.host_log)

+ 2 - 2
ambari-server/src/test/python/TestBootstrap.py

@@ -360,8 +360,8 @@ class TestBootstrap(TestCase):
     self.assertEquals(res, expected)
     command = str(init_mock.call_args[0][3])
     self.assertEqual(command,
-                     "[ -d /var/lib/ambari-agent/data/tmp ] || sudo mkdir -p /var/lib/ambari-agent/data/tmp ; "
-                     "sudo chown root /var/lib/ambari-agent/data/tmp")
+                     "sudo mkdir -p /var/lib/ambari-agent/data/tmp ; "
+                     "sudo chown -R root /var/lib/ambari-agent/data/tmp")
 
   @patch.object(Bootstrap, "getOsCheckScript")
   @patch.object(Bootstrap, "getOsCheckScriptRemoteLocation")