svn commit: r1345405 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/frontend/createCluster.php

[vi...@apache.org]

Author: vikram
Date: Sat Jun  2 00:32:59 2012
New Revision: 1345405

URL: http://svn.apache.org/viewvc?rev=1345405&view=rev
Log:
AMBARI-323.During any process in the cluster initialization wizard, if the user goes back to the 1 Create Cluster tab, the user is stuck. (Contributed by Vikram)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1345405&r1=1345404&r2=1345405&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Sat Jun  2 00:32:59 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-323. During any process in the cluster initialization wizard, if the user goes back to the "1 Create Cluster" tab, the user is stuck. (Vikram)
+
   AMBARI-319. Scale puppet master to large number of nodes. (Jitendra via Vikram)
 
   AMBARI-318. Do not install the packages that install init.d scripts (Ramya via Vikram).

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php?rev=1345405&r1=1345404&r2=1345405&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php Sat Jun  2 00:32:59 2012
@@ -18,10 +18,6 @@ if ($allClustersResult["result"] != 0) {
   print(json_encode($allClustersResult));
   return;
 }
-if (!$multipleClustersSupported && count($allClustersResult["clusters"]) != 0 ) {
-  print (json_encode(array( "result" => 1, "error" => "Multiple clusters are not supported and you already have a cluster installed" )));
-  return;
-}
 
 // Read from the input
 $requestdata = file_get_contents('php://input');
@@ -45,6 +41,14 @@ if (preg_match('/(\?|\+|\-|\||\"|\[|\]|\
 }
 // Validate clusterName: TODO; FIXME
 
+if (!array_key_exists($clusterName, $allClustersResult["clusters"])) {
+  if (!$multipleClustersSupported && count($allClustersResult["clusters"]) != 0 ) {
+    print (json_encode(array( "result" => 1, "error" => "Multiple clusters are not supported and you already have a cluster installed" )));
+    return;
+  }
+}
+
+
 // create the lockfile in the clusterDir
 $fileHdl = fopen($GLOBALS["HMC_CLUSTER_PATH"]."/lockfile", "w");
 if ($fileHdl == false) {