src/hg/utils/automation/HgAutomate.pm 1.21

1.21 2009/02/18 18:20:00 hiram
Restore memk to the list of clusters to use
Index: src/hg/utils/automation/HgAutomate.pm
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/utils/automation/HgAutomate.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -B -U 4 -r1.20 -r1.21
--- src/hg/utils/automation/HgAutomate.pm	4 Feb 2009 18:38:25 -0000	1.20
+++ src/hg/utils/automation/HgAutomate.pm	18 Feb 2009 18:20:00 -0000	1.21
@@ -54,14 +54,14 @@
 	  'hostCount' => 1024, },
       'pk' =>
         { 'enabled' => 1, 'gigaHz' => 2.0, 'ram' => 4,
 	  'hostCount' => 394, },
-#      'memk' =>		# unreliable Feb 2009
-#        { 'enabled' => 1, 'gigaHz' => 1.0, 'ram' => 32,
-#	  'hostCount' => 32, },
-      'kk9' => # Guessing here since the machines are down:
-        { 'enabled' => 0, 'gigaHz' => 1.5, 'ram' => 2,
-	  'hostCount' => 100, },
+      'memk' =>
+        { 'enabled' => 1, 'gigaHz' => 1.0, 'ram' => 32,
+	  'hostCount' => 32, },
+#      'kk9' => # Guessing here since the machines are down:
+#        { 'enabled' => 0, 'gigaHz' => 1.5, 'ram' => 2,
+#	  'hostCount' => 100, },
     );
 
 my @allClusters = (keys %cluster);
 
@@ -72,12 +72,10 @@
 	  inputFor => \@allClusters, outputFor => [], },
       'san' =>
         { root => '/san/sanvol1/scratch', clusterLocality => 0.5,
 	  distrHost => ['pk', 'kkstore*'], distrCommand => '',
-	  inputFor => ['pk'], outputFor => ['pk'], },
+	  inputFor => ['pk', 'memk'], outputFor => ['pk', 'memk'], },
     );
-# memk taken out of the poos since it is unreliable Feb 2009
-#         inputFor => ['pk', 'memk'], outputFor => ['pk', 'memk'], },
 
 $defaultDbHost = 'hgwdev';
 
 sub choosePermanentStorage {
@@ -156,10 +154,9 @@
   if (! $fsInfo) {
     if ($isInput) {
       return @allClusters;
     } else {
-      return ('hgwdev');
-#      return ('memk');	# memk unreliable Feb 2009
+      return ('memk');
     }
   }
 }
 
@@ -208,10 +205,10 @@
   # associated with their load factors.
   # swarm and hgwdev are now valid workhorses since they have access to hive.
   confess "Too many arguments" if (scalar(@_) != 0);
   my %horses = ();
-  foreach my $machLine ('swarm', 'kolossus', 'hgwdev') {
-# `ssh -x memk parasol list machines | grep idle` # memk unreliable Feb 2009
+  foreach my $machLine ('swarm', 'kolossus', 'hgwdev',
+	`ssh -x memk parasol list machines | grep idle`) {
     my $mach = $machLine;
     $mach =~ s/[\. ].*//;
     chomp $mach;
     $horses{$mach} = &getLoadFactor($mach) if (! exists $horses{$mach});