[Swift-commit] r7491 - branches/release-0.95/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-22 13:50:43 -0600 (Wed, 22 Jan 2014)
New Revision: 7491

Modified:
   branches/release-0.95/bin/swiftrun
Log:
Scheduler bypass fix from trunk


Modified: branches/release-0.95/bin/swiftrun
===================================================================
--- branches/release-0.95/bin/swiftrun	2014-01-22 19:31:58 UTC (rev 7490)
+++ branches/release-0.95/bin/swiftrun	2014-01-22 19:50:43 UTC (rev 7491)
@@ -125,6 +125,11 @@
       $value = hhmmss_to_seconds($value); 
    } 
 
+   elsif ( $property =~ m/^(slurm|condor)/ ) {
+      my ( $xmlnamespace, $xmlproperty ) = split(/\./, $site_aliases{ $propertyStart });
+      return "<profile namespace=\"" . $xmlnamespace . "\" key=\"" . $property . "\">" . $value . "</profile>\n";
+   }
+
    elsif ( $property eq "taskthrottle" ) {
       $value = number_to_throttle($value);
    }
@@ -132,7 +137,7 @@
    elsif ( $property eq "taskwalltime" ) {
       verify_in_hhmmss($key, $value);
    }
-
+   
    elsif ( $property eq "jobmanager" ) { 
       my $ccount = ($value =~ s/:/:/g);
       my $jobmanager = "";
@@ -161,6 +166,7 @@
          return "<execution provider=\"coaster\" jobmanager=\"" . $jobmanager . "\" url=\"" . $jobmanagerURL . "\"/>\n";
       }
 
+      # Define a non-coaster protocol
       elsif ( $ccount >= 3) {
          (my $first, my $second, my $third, my $fourth) = split(':', $value, 4);
          $provider=$first;
@@ -177,8 +183,8 @@
    my ( $xmlnamespace, $xmlproperty ) = split(/\./, $site_aliases{ $propertyStart });
    if ( defined($xmlnamespace) && defined($xmlproperty)) {
       return "<profile namespace=\"" . $xmlnamespace . "\" key=\"" . $xmlproperty . "\">" . $value . "</profile>\n"; 
-   }
-} 
+   } 
+}
 
 # Write apps to file in tc.data format
 sub write_apps {