AMBARI-280. Cleanup of utilities. Contributed by Vikram

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339987 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI 280. Cleanup of utilities. (Vikram via hitesh)
+
   AMBARI-249. Uninstall support from UI. (Vikram via hitesh)
 
   AMBARI-277. API for getting cluster status. (Vikram via hitesh)

hmc/html/initializeCluster.php

@@ -84,7 +84,6 @@
             </li>
           </ol>
         </div>
-        
 
         <?php require "./utils.htmli"; ?>
 
@@ -296,6 +295,7 @@
             <script type="text/javascript">
 
             var freshInstall = true;
+            var nodesAction = "addNodes";
 
             var InstallationWizard = {
 

hmc/js/all.out

@@ -1,29 +0,0 @@
-abcd: ssh: abcd: Name or service not known
-pdsh@hrt8n20: abcd: ssh exited with exit code 255
-hrt8n25: Warning: Permanently added 'hrt8n25,98.137.233.229' (RSA) to the list of known hosts.
-hrt8n23: Warning: Permanently added 'hrt8n23,98.137.233.231' (RSA) to the list of known hosts.
-hrt8n24: Warning: Permanently added 'hrt8n24,98.137.233.230' (RSA) to the list of known hosts.
-hrt8n20: Permission denied, please try again.
-hrt8n20: Permission denied, please try again.
-hrt8n20: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n20: ssh exited with exit code 255
-hrt8n22: Permission denied, please try again.
-hrt8n22: Permission denied, please try again.
-hrt8n22: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n22: ssh exited with exit code 255
-hrt8n23: Permission denied, please try again.
-hrt8n23: Permission denied, please try again.
-hrt8n23: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n23: ssh exited with exit code 255
-hrt8n24: Permission denied, please try again.
-hrt8n24: Permission denied, please try again.
-hrt8n24: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n24: ssh exited with exit code 255
-hrt8n25: Permission denied, please try again.
-hrt8n25: Permission denied, please try again.
-hrt8n25: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n25: ssh exited with exit code 255
-hrt8n21: Permission denied, please try again.
-hrt8n21: Permission denied, please try again.
-hrt8n21: Permission denied (publickey,gssapi-with-mic,password,hostbased).
-pdsh@hrt8n20: hrt8n21: ssh exited with exit code 255

hmc/js/utils.js

@@ -217,6 +217,9 @@ function convertDisplayType (displayType) {
 
     case "SECRET":
       return "password";
+
+    case "ONOFF":
+      return "checkbox";
     
     default:
       return "text";

hmc/php/frontend/initDB.php

@@ -1,76 +0,0 @@
-<?php
-include_once '../util/Logger.php';
-include_once "../conf/Config.inc";
-
-/*
-$dbHandle = sqlite_popen("../../../db/data.db", 666, $error);
-assert($dbHandle !== FALSE);
-
-$schema_dump = file_get_contents("../../../db/schema.dump");
-$ret = sqlite_exec($dbHandle, sqlite_escape_string($schema_dump), $error);
-assert($ret == TRUE);
-
-print realpath("../../../db/data.db");
-$pdo = new PDO("sqlite:".realpath("../../../db/data.db"));
-$sql = file_get_contents(realpath( '../../../db/schema.dump') );
-
-//$sql = str_replace( '?', $sql );
-//$st = $pdo->prepare( $sql, array( PDO::ATTR_EMULATE_PREPARES => true ) );
-//$st = $pdo->prepare( $sql);
-//$st = $pdo->exec("CREATE TABLE Clusters (  cluster_name TEXT PRIMARY KEY, version TEXT, state TEXT )");
-//print "\nfirst one".$st;
-//$result=$st->execute();
-*/
-
-//print "database is " . realpath($GLOBALS["DB_PATH"]) . "\n";
-print "database is " . $GLOBALS["DB_PATH"] . "\n";
-//$db = new PDO("sqlite:" . realpath($GLOBALS["DB_PATH"]));
-$db = new PDO("sqlite:" . $GLOBALS["DB_PATH"]);
-// $db = new PDO("sqlite:/tmp/testing1.db");
-//print $db->exec("CREATE TABLE Clusters (  cluster_name TEXT PRIMARY KEY, version TEXT, state TEXT )");
-//print "\n";
-//$ret = $db->exec("CREATE TABLE testing (Id INTEGER)");
-$sql = file_get_contents(realpath( '/var/www/html/KickAssHDPUI/db/schema.dump') );
-//$sql = file_get_contents(realpath( '/var/www/html/KickAssHDPUI/db/test.dump') );
-// print $sql;
-
-
-/*
-$sql = 'BEGIN TRANSACTION;
-
-CREATE TABLE IF NOT EXISTS "Clusters" (
-  cluster_name TEXT, -- Cluster name
-  version TEXT, -- version of the hadoop stack installed
-  state, TEXT, -- cluster state - installed, config in progress etc
-  PRIMARY KEY (cluster_name)
-);
-
-
-COMMIT;';
-*/
-
-$db->exec($sql) or die(print_r($db->errorInfo(), true));
-
-//$st = $db->exec("CREATE TABLE Clusters (  cluster_name TEXT PRIMARY KEY, version TEXT, state TEXT )");
-/*$st = $db->exec('CREATE TABLE "Clusters" (
-  cluster_name TEXT, -- Cluster name
-    version TEXT, -- version of the hadoop stack installed
-      state TEXT, -- cluster state - installed, config in progress etc
-        PRIMARY KEY (cluster_name)
-        );');
-print "\nsecondone".$ret;
-/*
-$dbHandle = new SQLite3("../../../db/data.db", 666, $error);
-assert($dbHandle !== FALSE);
-
-$schema_dump = file_get_contents("../../../db/schema.dump");
-$ret = $dbHandle->exec(sqlite_escape_string($schema_dump));
-assert($ret == TRUE);
-
-*/
-
-
-// Show all information, defaults to INFO_ALL
-//phpinfo();
-
-?>

hmc/php/frontend/uninstall/uninstallUtil.php

@@ -21,8 +21,7 @@ function handleUninstallTransaction ($clusterName, $deployUser, $rootTxnId,
     return;
   }
 
-  $hosts = explode(",", $hostsStr);
-  runPdsh($clusterName, $operationName, $deployUser, $hosts, $cmdLine);
+  runPdsh($clusterName, $operationName, $deployUser, $hostsStr, $cmdLine);
 
   $retArr = parseAndUpdateNodeInfo($clusterName, $operationName, $logger);
 

hmc/php/util/initDB.php

@@ -0,0 +1,11 @@
+<?php
+include_once '../util/Logger.php';
+include_once "../conf/Config.inc";
+
+print "database is " . $GLOBALS["DB_PATH"] . "\n";
+$db = new PDO("sqlite:" . $GLOBALS["DB_PATH"]);
+$sql = file_get_contents(realpath( $GLOBALS["DB_PATH"] );
+
+$db->exec($sql) or die(print_r($db->errorInfo(), true));
+
+?>