Updated Branches: refs/heads/branch-1.2.5 81b0596bc -> 2cb32c5ad
AMBARI-2679. An additional .repo file(s) is placed in /etc/yum.repos.d directory after installing hadoop. (smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2cb32c5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2cb32c5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2cb32c5a Branch: refs/heads/branch-1.2.5 Commit: 2cb32c5ad0a6dc0f727143d0c767f9e9d50e7a78 Parents: 81b0596 Author: Sumit Mohanty <[email protected]> Authored: Wed Jul 17 17:05:27 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Jul 17 17:06:15 2013 -0700 ---------------------------------------------------------------------- ambari-server/src/main/python/bootstrap.py | 31 +-------------------- ambari-server/src/test/python/TestBootstrap.py | 19 ++----------- 2 files changed, 3 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2cb32c5a/ambari-server/src/main/python/bootstrap.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/bootstrap.py b/ambari-server/src/main/python/bootstrap.py index f83739b..407374e 100755 --- a/ambari-server/src/main/python/bootstrap.py +++ b/ambari-server/src/main/python/bootstrap.py @@ -342,22 +342,6 @@ class BootStrap: def hasPassword(self): return self.passwordFile is not None and self.passwordFile != 'null' - def getMoveRepoFileWithPasswordCommand(self, targetDir): - return "sudo -S mv " + str(self.getRemoteName(self.AMBARI_REPO_FILENAME))\ - + " " + str(targetDir) + " < " + str(self.getPasswordFile()) - - - def getMoveRepoFileWithoutPasswordCommand(self, targetDir): - return "sudo mv " + str(self.getRemoteName(self.AMBARI_REPO_FILENAME)) +\ - " " + str(targetDir) - - def getMoveRepoFileCommand(self, targetDir): - if self.hasPassword(): - return self.getMoveRepoFileWithPasswordCommand(targetDir) - else: - return self.getMoveRepoFileWithoutPasswordCommand(targetDir) - - def copyOsCheckScript(self): try: @@ -390,7 +374,7 @@ class BootStrap: try: # Copying the files fileToCopy = self.getRepoFile() - target = self.getRemoteName(self.AMBARI_REPO_FILENAME) + target = self.getRepoFile() logging.info("Copying repo file to 'tmp' folder...") pscp = PSCP(self.successive_hostlist, self.user, self.sshkeyFile, fileToCopy, target, self.bootdir) pscp.run() @@ -405,19 +389,6 @@ class BootStrap: self.statuses = unite_statuses(self.statuses, out) logging.info("Moving repo file...") - targetDir = self.getRepoDir() - command = self.getMoveRepoFileCommand(targetDir) - pssh = PSSH(self.successive_hostlist, self.user, self.sshkeyFile, self.bootdir, command=command) - pssh.run() - out = pssh.getstatus() - # Preparing report about failed hosts - failed_current = get_difference(self.successive_hostlist, skip_failed_hosts(out)) - self.successive_hostlist = skip_failed_hosts(out) - failed = get_difference(self.hostlist, self.successive_hostlist) - logging.info("Parallel scp returns for moving repo file. All failed hosts are: " + str(failed) + - ". Failed on last step: " + str(failed_current)) - #updating statuses - self.statuses = unite_statuses(self.statuses, out) target = self.getRemoteName(self.SETUP_SCRIPT_FILENAME) pscp = PSCP(self.successive_hostlist, self.user, self.sshkeyFile, self.setupAgentFile, target, self.bootdir) http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2cb32c5a/ambari-server/src/test/python/TestBootstrap.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/TestBootstrap.py b/ambari-server/src/test/python/TestBootstrap.py index 771597a..5288f65 100644 --- a/ambari-server/src/test/python/TestBootstrap.py +++ b/ambari-server/src/test/python/TestBootstrap.py @@ -358,9 +358,7 @@ class TestBootstrap(TestCase): @patch.object(Popen, "communicate") @patch.object(BootStrap, "createDoneFiles") @patch.object(BootStrap, "getRunSetupWithPasswordCommand") - @patch.object(BootStrap, "getMoveRepoFileWithPasswordCommand") - def test_commands_with_password_are_called_for_user_with_password(self, getMoveRepoFileWithPasswordCommand_method, - getRunSetupWithPasswordCommand_method, + def test_commands_with_password_are_called_for_user_with_password(self, getRunSetupWithPasswordCommand_method, createDoneFiles_method, communicate_method, SSH_writeLogToFile_method, @@ -373,7 +371,6 @@ class TestBootstrap(TestCase): createDoneFiles_method.return_value = None getRunSetupWithPasswordCommand_method.return_value = "" - getMoveRepoFileWithPasswordCommand_method.return_value = "" os.environ[AMBARI_PASSPHRASE_VAR_NAME] = "" hosts = ["hostname"] @@ -386,15 +383,11 @@ class TestBootstrap(TestCase): bootstrap_obj.successive_hostlist = hosts bootstrap_obj.runSetupAgent() self.assertTrue(getRunSetupWithPasswordCommand_method.called) - self.assertTrue(getMoveRepoFileWithPasswordCommand_method.called) getRunSetupWithPasswordCommand_method.reset() - getMoveRepoFileWithPasswordCommand_method.reset() getRunSetupWithPasswordCommand_method.reset() - getMoveRepoFileWithPasswordCommand_method.reset() bootstrap_obj.successive_hostlist = None bootstrap_obj.copyOsCheckScript() self.assertTrue(getRunSetupWithPasswordCommand_method.called) - self.assertTrue(getMoveRepoFileWithPasswordCommand_method.called) @patch.object(bootstrap, "get_difference") @patch.object(SCP, "writeLogToFile") @@ -402,9 +395,7 @@ class TestBootstrap(TestCase): @patch.object(Popen, "communicate") @patch.object(BootStrap, "createDoneFiles") @patch.object(BootStrap, "getRunSetupWithoutPasswordCommand") - @patch.object(BootStrap, "getMoveRepoFileWithoutPasswordCommand") - def test_commands_without_password_are_called_for_passwordless_user(self, getMoveRepoFileWithoutPasswordCommand_method, - getRunSetupWithoutPasswordCommand_method, + def test_commands_without_password_are_called_for_passwordless_user(self, getRunSetupWithoutPasswordCommand_method, createDoneFiles_method, communicate_method, SSH_writeLogToFile_method, @@ -416,7 +407,6 @@ class TestBootstrap(TestCase): createDoneFiles_method.return_value = None getRunSetupWithoutPasswordCommand_method.return_value = "" - getMoveRepoFileWithoutPasswordCommand_method.return_value = "" os.environ[AMBARI_PASSPHRASE_VAR_NAME] = "" hosts = ["hostname"] @@ -429,21 +419,16 @@ class TestBootstrap(TestCase): bootstrap_obj.successive_hostlist = hosts bootstrap_obj.runSetupAgent() self.assertTrue(getRunSetupWithoutPasswordCommand_method.called) - self.assertTrue(getMoveRepoFileWithoutPasswordCommand_method.called) getRunSetupWithoutPasswordCommand_method.reset() - getMoveRepoFileWithoutPasswordCommand_method.reset() get_difference_mock.return_value = None self.assertTrue(bootstrap_obj.copyNeededFiles() == 0) self.assertTrue(getRunSetupWithoutPasswordCommand_method.called) - self.assertTrue(getMoveRepoFileWithoutPasswordCommand_method.called) getRunSetupWithoutPasswordCommand_method.reset() - getMoveRepoFileWithoutPasswordCommand_method.reset() bootstrap_obj.successive_hostlist = None bootstrap_obj.copyNeededFiles() self.assertTrue(getRunSetupWithoutPasswordCommand_method.called) - self.assertTrue(getMoveRepoFileWithoutPasswordCommand_method.called) @patch.object(BootStrap, "runSetupAgent") @patch.object(BootStrap, "copyNeededFiles")
