Order queries by nodeid so it's easier to see current rate of progress.

tbsetup/plab/plabdist.in

@@ -80,7 +80,8 @@ if (!scalar(@nodes)) {
 		     "LEFT JOIN reserved AS r ON n.node_id = r.node_id " .
 		     "WHERE n.type=\"pcplabphys\" AND s.status=\"up\" AND " .
 		     "!(r.pid=\"" . NODEDEAD_PID .
-		     "\" AND r.eid=\"" . NODEDEAD_EID .  "\")");
+		     "\" AND r.eid=\"" . NODEDEAD_EID .  "\") " . 
+		     "order by n.node_id");
     @nodes = ();
     while (my ($node) = $query_result->fetchrow()) {
 	push @nodes, $node;

tbsetup/plab/plabhttpd.in

@@ -35,12 +35,14 @@ my $SSH = "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no -l $PLAB_USER";
 #
 # Get a list of planetlab nodes that are up
 #
-my $query_result = DBQueryFatal("SELECT n.node_id FROM nodes as n " .
-            "LEFT JOIN node_status AS s ON n.node_id=s.node_id " .
-	    "LEFT JOIN reserved AS r ON n.node_id = r.node_id " .
-	    "WHERE n.type=\"pcplabphys\" AND s.status=\"up\" AND " .
-		"!(r.pid=\"" . NODEDEAD_PID .
-		    "\" AND r.eid=\"" . NODEDEAD_EID .  "\")");
+my $query_result = 
+    DBQueryFatal("SELECT n.node_id FROM nodes as n " .
+		 "LEFT JOIN node_status AS s ON n.node_id=s.node_id " .
+		 "LEFT JOIN reserved AS r ON n.node_id = r.node_id " .
+		 "WHERE n.type=\"pcplabphys\" AND s.status=\"up\" AND " .
+		 "!(r.pid=\"" . NODEDEAD_PID .
+		 "\" AND r.eid=\"" . NODEDEAD_EID .  "\") " . 
+		 "order by n.node_id");
 
 while (my ($node) = $query_result->fetchrow()) {
     print "Starting up webserver on $node ...\n";