Changeset 886 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

Timestamp:

Oct 11, 2018, 4:30:46 PM (6 years ago)

Author:

djay

Message:

Check for md5sum of any file in the cache to avoid sending the same file on HPC server twice. Add the multiple LiteralData? inputs support for HPC services. Remove condition for defining SCALE for every band in the outputed MapServer? mapfile.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c (modified) (9 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

@@ -299 +299 @@
   // then, set the configId key in the lenv section
   char *serviceType;
-  map* mServiceType=getMap(s->content,"serviceType");
+  map* mServiceType=getMap(s->content,"confId");
   if(mServiceType!=NULL)
     serviceType=mServiceType->value;
@@ -334 +334 @@
   while(input!=NULL && input->content!=NULL){
     map* isInRequest=getMap(input->content,"inRequest");
-    map* minNb=getMap(input->content,"minoccurs");
+    map* minNb=getMap(input->content,"minOccurs");
     if(getMaps(*real_outputs,input->name)==NULL &&
        ( (isInRequest!=NULL && strncasecmp(isInRequest->value,"true",4)==0)
@@ -397 +397 @@
         if(getMap(input->content,"dataType")!=NULL){
           // For LitteralData, simply pass the value
-          map* val=getMap(input->content,"value");
-          parameters[parameters_cnt-1]=(char*)malloc((strlen(input->name)+strlen(val->value)+3)*sizeof(char));
-          sprintf(parameters[parameters_cnt-1],"-%s %s",input->name,val->value);
+          map* length=getMap(input->content,"length");
+          if(length!=NULL){
+            char* value=NULL;
+            int len=atoi(length->value);
+            int i=0;
+            for(i=0;i<len;i++){
+              map* val=getMapArray(input->content,"value",i);
+              if(val!=NULL){
+                if(value==NULL){
+                  value=(char*)malloc((strlen(val->value)+3)*sizeof(char));
+                  sprintf(value,"\"%s\"",val->value);
+                }
+                else{
+                  value=(char*)realloc(value,(strlen(value)+strlen(val->value)+4)*sizeof(char));
+                  sprintf(value,"%s \"%s\"",value,val->value);
+                }
+              }
+            }
+            if(value!=NULL){
+              parameters[parameters_cnt-1]=(char*)malloc((strlen(input->name)+strlen(value)+3)*sizeof(char));
+              sprintf(parameters[parameters_cnt-1],"-%s %s",input->name,value);
+            }
+          }else{
+            map* val=getMap(input->content,"value");
+            parameters[parameters_cnt-1]=(char*)malloc((strlen(input->name)+strlen(val->value)+5)*sizeof(char));
+            sprintf(parameters[parameters_cnt-1],"-%s \"%s\"",input->name,val->value);
+          }
         }
       }
@@ -888 +912 @@
         dup2 (fileno (stderr), fileno (stdout));
         conf_read(filePath,m);
+        //dumpMaps(m);
         fflush(stdout);
         dup2 (saved_stdout, fileno (stdout));
@@ -910 +935 @@
                 free(targetPath);
               }else{
-                map* hpcStdErr=getMapFromMaps(*main_conf,"henv","StdErr");
-                if(hpcStdErr!=NULL && ssh_fetch(*main_conf,targetPath,hpcStdErr->value,ssh_get_cnt(m))==0){
+                map* hpcStdErr=getMapFromMaps(*main_conf,"henv","StdErr");
+                // Added for using sacct in place of scontrol
+                char *sourcePath=NULL;
+                if(hpcStdErr!=NULL){
+                  sourcePath=(char*)malloc((strlen(targetPathMap->value)+strlen(hpcStdErr->value)+2)*sizeof(char));
+                  sprintf(sourcePath,"%s/%s",targetPathMap->value,hpcStdErr->value);
+                }
+                if(hpcStdErr!=NULL && sourcePath!=NULL && ssh_fetch(*main_conf,targetPath,sourcePath,ssh_get_cnt(m))==0){
+                  free(sourcePath);
                   struct stat f_status;
                   int ts=stat(targetPath, &f_status);
@@ -925 +957 @@
                     free(fcontent);
                   }else{
-                    char *tmpStr=(char*)malloc((strlen(filename)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
-                    sprintf(tmpStr,_("Unable to fetch the remote file for %s"),filename);
+                    char *tmpStr=(char*)malloc((strlen(targetPath)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
+                    sprintf(tmpStr,_("Unable to fetch the remote file for %s"),targetPath);
                     setMapInMaps(*main_conf,"lenv","message",tmpStr);
                     free(tmpStr);
@@ -939 +971 @@
                 return SERVICE_FAILED;
               }
-            }       
+            }
           }else{
             map* generatedFile=getMap(input->content,"generated_file");
@@ -981 +1013 @@
               }else{
                 map* hpcStdErr=getMapFromMaps(*main_conf,"henv","StdErr");
-                if(hpcStdErr!=NULL && ssh_fetch(*main_conf,targetPath,hpcStdErr->value,ssh_get_cnt(m))==0){
+                char *sourcePath=NULL;
+                if(hpcStdErr!=NULL){
+                  dumpMap(hpcStdErr);
+                  sourcePath=(char*)malloc((strlen(targetPathMap->value)+strlen(hpcStdErr->value)+2)*sizeof(char));
+                  sprintf(sourcePath,"%s/%s",targetPathMap->value,hpcStdErr->value);
+                }
+                if(hpcStdErr!=NULL && sourcePath!=NULL && ssh_fetch(*main_conf,targetPath,sourcePath,ssh_get_cnt(m))==0){
+                  free(sourcePath);
                   struct stat f_status;
                   int ts=stat(targetPath, &f_status);
@@ -995 +1034 @@
                     free(fcontent);
                   }else{
-                    char *tmpStr=(char*)malloc((strlen(filename)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
-                    sprintf(tmpStr,_("Unable to fetch the remote file for %s"),filename);
+                    char *tmpStr=(char*)malloc((strlen(targetPath)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
+                    sprintf(tmpStr,_("Unable to fetch the remote file for %s"),targetPath);
                     setMapInMaps(*main_conf,"lenv","message",tmpStr);
                     free(tmpStr);
                   }
                 }else{
-                  char *tmpStr=(char*)malloc((strlen(filename)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
-                  sprintf(tmpStr,_("Unable to fetch the remote file for %s"),filename);
+                  char *tmpStr=(char*)malloc((strlen(sourcePath)+strlen(_("Unable to fetch the remote file for %s"))+1)*sizeof(char));
+                  sprintf(tmpStr,_("Unable to fetch the remote file for %s"),sourcePath);
                   setMapInMaps(*main_conf,"lenv","message",tmpStr);
                   free(tmpStr);