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

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/24 09:05 AM

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

Log:
 Not to self: do not use boost::process on unix!
 It is broken!  I should have remembered why I reimplemented the
 local job adaptor in the first place....
 Anyway, we use the local job adaptor now, and voila, it works
 :-)
 A

File Changes:

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

File [modified]: aws_job_service.cpp
Delta lines: +6 -3
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-24 14:48:54 UTC (rev 3372)
+++ trunk/adaptors/aws/aws_job/aws_job_service.cpp	2009-01-24 15:05:35 UTC (rev 3373)
@@ -26,6 +26,7 @@
 
 // adaptor includes
 #include "aws_job_service.hpp"
+#include "aws_helper.hpp"
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -93,7 +94,7 @@
     env_["EC2_CERT"]        = ini_["ec2_cert"];
     env_["EC2_URL"]         = ini_["ec2_url"];
 
-    saga::adaptors::utils::process proc (env_);
+    aws_job::process proc (env_);
 
     // is a VM given which we should contact, or do we need to start a new one?
     bool instance_started = false;
@@ -120,11 +121,13 @@
         SAGA_ADAPTOR_THROW ("could not start new VM instance", saga::NoSuccess);
       }
 
+
       vm_ip_ = "";
       vm_id_ = out_words[1];
 
       std::string state = out_words[5];
 
+      SAGA_LOG_ALWAYS (state.c_str ());
 
 
       proc.set_cmd (ini_["ec2_scripts"] + "/ec2-describe-instances");
@@ -374,7 +377,7 @@
     ssh_session_.add_context (ssh_context_);
 
     // create ssh job service which from now on handles job submission etc
-    js_ = TR1::shared_ptr <saga::job::service> (new saga::job::service (ssh_session_, ssh_url_));
+    js_  = TR1::shared_ptr <saga::job::service> (new saga::job::service (ssh_session_, ssh_url_));
 
     // seems to work, ssh is set up - now prepare the image for job submission,
     // if needed
@@ -469,7 +472,7 @@
       msg += vm_id_;
       SAGA_LOG_ALWAYS (msg.c_str ()); 
 
-      saga::adaptors::utils::process proc (ini_["ec2_scripts"] + "/ec2-terminate-instances", env_);
+      aws_job::process proc (ini_["ec2_scripts"] + "/ec2-terminate-instances", env_);
       proc.add_arg (vm_id_);
 
       (void) proc.run_sync (false);

File [modified]: aws_job_service.hpp
Delta lines: +3 -1
===================================================================
--- trunk/adaptors/aws/aws_job/aws_job_service.hpp	2009-01-24 14:48:54 UTC (rev 3372)
+++ trunk/adaptors/aws/aws_job/aws_job_service.hpp	2009-01-24 15:05:35 UTC (rev 3373)
@@ -56,7 +56,7 @@
       std::string        userkey_;      // private key to access the VM instance
       std::string        usercert_;     // public  key to access the VM instance
 
-      TR1::shared_ptr <saga::job::service> js_; // ssh job service, does the real work
+      TR1::shared_ptr <saga::job::service> js_;  // ssh job service, does the real work
 
       std::map <std::string, std::string> ini_;
       std::map <std::string, std::string> env_;
@@ -89,6 +89,8 @@
                             std::string                 jobid);
       void sync_get_self   (saga::job::self           & ret);
 
+
+
   };  // class job_service_cpi_impl
 
 } // namespace aws_job