Changeset 33369 for branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/CopyToHostLocation.c

Timestamp:

Feb 24, 2012, 2:28:07 PM (14 years ago)

Author:

eugene

Message:

handle failures more gracefully

File:

• branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/CopyToHostLocation.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/photdbc/src/CopyToHostLocation.c

@@ -92 +92 @@
     valid:
       // read srcname, write to tgtname, get MD5 sum for srcname as we go:
+      // XXX files that fail here should be skipped (but don't give up)
       if (!get_md5_with_copy (srcname, tgtname, srcDigest)) {
         fprintf (stderr, "error reading %s, getting md5, or writing %s\n", srcname, tgtname);
@@ -99 +100 @@
         
       // need to re-open and re-read tgtname to check md5sum
+      // XXX files that fail here need to be checked
       char *absname = abspath (tgtname, 1024);
       if (!get_md5_from_pclient (host, absname, tgtDigest)) {
@@ -233 +235 @@
   // fprintf (stderr, "command: %s\n", line);
 
-  // start the md5sum command
   InitIOBuffer (&buffer, 100);
-  PclientCommand (host, line, &buffer);
-  PclientResponse (host, PCLIENT_PROMPT, &buffer);
-  // XXX for the moment, abort if anything goes wrong
-
-  // wait for result
   InitIOBuffer (&stdout_buf, 100);
   InitIOBuffer (&stderr_buf, 100);
+
+  // need to reset pclient for next command...
+  if (!PclientCommand (host, "reset", &buffer)) goto escape;
+  if (!PclientResponse (host, PCLIENT_PROMPT, &buffer)) goto escape;
+  FlushIOBuffer (&buffer);
+
+  // start the md5sum command
+  if (!PclientCommand (host, line, &buffer)) goto escape;
+  if (!PclientResponse (host, PCLIENT_PROMPT, &buffer)) goto escape;
+  // XXX for the moment, abort if anything goes wrong
+
+  // wait for result
   while (!CheckBusyJob (host, &stdout_buf, &stderr_buf)) {
+    FlushIOBuffer (&stdout_buf);
+    FlushIOBuffer (&stdout_buf);
     usleep (10000);
   }
   if (stderr_buf.Nbuffer) {
     fprintf (stderr, "error in md5sum: %s\n", stderr_buf.buffer);
-    exit (1);
+    goto escape;
   }
 
@@ -267 +277 @@
   
   // need to reset pclient for next command...
-  PclientCommand (host, "reset", &buffer);
-  PclientResponse (host, PCLIENT_PROMPT, &buffer);
+  if (!PclientCommand (host, "reset", &buffer)) goto escape;
+  if (!PclientResponse (host, PCLIENT_PROMPT, &buffer)) goto escape;
 
   return TRUE;
+
+escape:
+  FreeIOBuffer (&buffer);
+  FreeIOBuffer (&stdout_buf);
+  FreeIOBuffer (&stderr_buf);
+  return FALSE;
 }