You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by fa...@apache.org on 2009/10/28 20:43:38 UTC

svn commit: r830740 - /incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm

Author: fapeeler
Date: Wed Oct 28 19:43:38 2009
New Revision: 830740

URL: http://svn.apache.org/viewvc?rev=830740&view=rev
Log:
VCL-258

relocated check for cluster loads, so vcld would create cluster_info
file correctly

Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm

Modified: incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm?rev=830740&r1=830739&r2=830740&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/reserved.pm Wed Oct 28 19:43:38 2009
@@ -189,6 +189,13 @@
 		# User has acknowledged
 		notify($ERRORS{'OK'}, 0, "user acknowledged, remote IP: $remote_ip");
 
+		#if cluster reservation - populate parent node with child node information
+		if ($reservation_count > 1) {
+			notify($ERRORS{'OK'}, 0, "cluster reservation, attempting to populate nodes with cluster_info data");
+			if (update_cluster_info($request_data)) {
+				notify($ERRORS{'OK'}, 0, "updated cluster nodes with cluster infomation");
+			}
+		}
 		# Attempt to call modularized OS module's grant_access() subroutine
 		if ($self->os->can("grant_access")) {
 			# If grant_access() has been implemented by OS module,
@@ -269,13 +276,7 @@
 					notify($ERRORS{'OK'}, 0, "password not changed on $computer_short_name for non-standalone user $user_unityid");
 				}
 
-				#if cluster reservation - populate parent node with child node information
-				if ($request_data->{RESERVATIONCOUNT} > 1) {
-					notify($ERRORS{'OK'}, 0, "cluster reservation, attempting to populate nodes with cluster_info data");
-					if (update_cluster_info($request_data)) {
-						notify($ERRORS{'OK'}, 0, "updated cluster nodes with cluster infomation");
-					}
-				}
+				
 
 			}    # Close elseif linux computer