Changeset 6221 for branches/1.6/lang

Timestamp:

Mar 30, 2016, 6:08:17 AM (8 years ago)

Author:

gah

Message:

fix: register https/tls to stop http cache query from hanging. fix: fix status=xxx on Middleware timestamp

File:

• branches/1.6/lang/tcl/scripts/task.tcl (modified) (16 diffs)

branches/1.6/lang/tcl/scripts/task.tcl

@@ -26 +26 @@
     private method GetSignal { signal }
     private method GetSimulationCommand { driverFile }
+    private method GetUQErrors {}
     private method GetUQSimulationCommand { driverFile }
     private method GetUQTemplateFile {}
@@ -68 +69 @@
 
     public common _resources
-    public proc setAppName {name}   { set _resources(-appname) $name }
-    public proc setHubName {name}   { set _resources(-hubname) $name }
-    public proc setHubURL {name}    { set _resources(-huburl) $name }
-    public proc setSession {name}   { set _resources(-session) $name }
-    public proc setJobPrt {name}    { set _resources(-jobprotocol) $name }
-    public proc setResultDir {name} { set _resources(-resultdir) $name }
-    public proc setCacheHost {name} { set _resources(-cachehost) $name }
+    public proc setAppName {name}    { set _resources(-appname) $name }
+    public proc setHubName {name}    { set _resources(-hubname) $name }
+    public proc setHubURL {name}     { set _resources(-huburl) $name }
+    public proc setSession {name}    { set _resources(-session) $name }
+    public proc setJobPrt {name}     { set _resources(-jobprotocol) $name }
+    public proc setResultDir {name}  { set _resources(-resultdir) $name }
+    public proc setCacheHosts {name} { set _resources(-cachehosts) $name }
 
     # default method for -jobstats control
@@ -90 +91 @@
         job_protocol      Rappture::Task::setJobPrt \
         results_directory Rappture::Task::setResultDir \
-        cache_host        Rappture::Task::setCacheHost
+        cache_hosts       Rappture::Task::setCacheHosts
 }
 
@@ -110 +111 @@
     }
     set _installdir $installdir
+    package require http
+    package require tls
+    http::register https 443 [list ::tls::socket -tls1 1]
 
     eval configure $args
@@ -216 +220 @@
     # Initialize job array variables
     array set _job { 
-        control ""
-        mesg    ""
-        runfile ""
-        stderr  ""
-        stdout  ""
-        success 0
-        xmlobj  ""
+        control  ""
+        exitcode 0
+        mesg     ""
+        runfile  ""
+        stderr   ""
+        stdout   ""
+        success  0
+        xmlobj   ""
     }
 
@@ -457 +462 @@
 
 itcl::body Rappture::Task::IsCacheable {} {
-    if { ![info exists _resources(-cachehost)] ||
-         $_resources(-cachehost) == "" } {
+    if { ![info exists _resources(-cachehosts)] ||
+         $_resources(-cachehosts) == "" } {
+puts stderr cachehosts=[info exists _resources(-cachehosts)]
         return 0
     }
 if 0 {
     set state [$_xmlobj get "tool.cache"]
+puts stderr "cache tag is \"$state\""
     if { $state == "" } {
         return 0
@@ -484 +491 @@
         exec puq.sh get_params $pid $_uq(varlist) $_uq(type) $_uq(args)
     } errs] != 0 } {
-        set contents {}
-        if { [file exists "uq_debug.err"] } {
-            set f [open "uq_debug.err" r]
-            set contents [read $f]
-            close $f
-        }
-        puts stderr "get_params.py failed: $contents"
-        error "get_params.py failed: $errs\n$contents"
-    }
-    return "params[pid].csv"
+        error "get_params.py failed: $errs\n[GetUQErrors]"
+    }
+    return "params${pid}.csv"
 }
 
@@ -589 +589 @@
     set _job(runfile) ""
     set _job(success) 0
+    set _job(exitcode) 0
 
     # Step 1.  Write the command into the run file.
@@ -601 +602 @@
         set _job(stdout) [string range $cmd 5 end]
         set _job(success) 1
+        set _job(exitcode) 0
         set _job(mesg) ""
         return 1;                       # Success
@@ -618 +620 @@
     # Step 4. Check the token and the exit code.
     set logmesg $result
-    foreach { token pid code mesg } $_job(control) break
+    foreach { token _job(pid) _job(exitcode) mesg } $_job(control) break
     if { $token == "EXITED" } {
-        if { $code != 0 } {
+        if { $_job(exitcode) != 0 } {
             # This means that the program exited normally but returned a
             # non-zero exitcode.  Consider this an invalid result from the
             # program.  Append the stderr from the program to the message.
             if {$code > 128} {
-                set logmesg "Program signaled: signal was [GetSignal $code]"
+                set logmesg "Program signaled: signal was [GetSignal $_job(exitcode)]"
             } else { 
-                set logmesg "Program finished: non-zero exit code is $code"
+                set logmesg "Program finished: non-zero exit code is $_job(exitcode)"
             }
             set _job(mesg) "$logmesg\n\n$_job(stderr)"
@@ -684 +686 @@
             "walltime" $times(walltime) \
             "cputime"  $times(cputime) \
-            "status"   $_job(success)
+            "status"   $_job(exitcode)
         uplevel #0 $jobstats $args 
     }
@@ -775 +777 @@
             "walltime" $times(walltime) \
             "cputime"  $times(cputime) \
-            "status"   $_job(success)
+            "status"   $_job(exitcode)
         uplevel #0 $jobstats $args 
     }
@@ -860 +862 @@
 
     # Read the driver file and collect its contents as the query.
-    set url http://$_resources(-cachehost)/cache/request
+    set url http://$_resources(-cachehosts)/cache/request
     set f [open $driverFile "r"]
     set query [read $f]
@@ -867 +869 @@
     # Make the query
     if { [catch {
-        http::geturl $url -query $query -timeout 60000 -binary yes
+        http::geturl $url -query $query -timeout 6000 -binary yes
     } token] != 0 } {
         puts stderr "error performing cache query: token=$token"
@@ -896 +898 @@
     set _job(stderr) "Loading cached results\n"
     OnOutput "Loading cached results\n"
+    update
     return 1
+}
+
+itcl::body Rappture::Task::GetUQErrors {} {
+    set contents {}
+    if { [file exists "uq_debug.err"] } {
+        set f [open "uq_debug.err" r]
+        set contents [read $f]
+        close $f
+    }
+    return $contents
 }
 
@@ -906 +919 @@
         exec puq.sh analyze $hdfFile
     } results] != 0 } {
-        set rdata {}
-        if { [file exists "uq_debug.err" ] } {
-            set f [open "uq_debug.err" r]
-            set rdata [read $f]
-            close $f
-        }
-        puts stderr "UQ analysis failed: $results\n$rdata"
-        error "UQ analysis failed: $results\n$rdata"
+        error "UQ analysis failed: $results\n[GetUQErrors]"
     } else {
         set _job(stdout) $results