[Saga-devel] saga SVN commit 3364: /trunk/adaptors/aws/aws_job/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/23 08:23 PM

Modified:
 /trunk/adaptors/aws/aws_job/
  aws_job_service.cpp

Log:
 graceful image prep

File Changes:

Directory: /trunk/adaptors/aws/aws_job/
=======================================

File [modified]: aws_job_service.cpp
Delta lines: +20 -4
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-24 01:44:46 UTC (rev 3363)
+++ trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-24 02:23:18 UTC (rev 3364)
@@ -407,11 +407,27 @@
       proc.add_arg  (user_ + "@" + vm_ip_);
       proc.add_arg  ("/tmp/saga-ec2-image-prep");
 
-      proc.run_sync ();
+      int count = 0;
+      while ( count < 100 )
+      {
+        proc.run_sync ();
 
-      if ( proc.fail () )
-      {
-        SAGA_ADAPTOR_THROW ("image preparation failed", saga::NoSuccess);
+        if ( proc.done () )
+        {
+          break;
+        }
+        else
+        {
+          SAGA_LOG_ALWAYS ("trying image prep");
+          ::sleep (1);
+        }
+
+        count ++;
+
+        if ( count++ > 100 )
+        {
+          SAGA_ADAPTOR_THROW ("image preparation failed repeatedly", saga::NoSuccess);
+        }
       }
     }
   }