List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:January 17 2011 2:59pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (jonas:4125)
View as plain text  
#At file:///home/jonas/src/telco-7.0/ based on revid:ole.john.aske@stripped

 4125 Jonas Oreland	2011-01-17
      ndb - add feature only to rsync binaries to atrt

    modified:
      storage/ndb/test/run-test/atrt.hpp
      storage/ndb/test/run-test/main.cpp
=== modified file 'storage/ndb/test/run-test/atrt.hpp'
--- a/storage/ndb/test/run-test/atrt.hpp	2010-11-30 07:47:55 +0000
+++ b/storage/ndb/test/run-test/atrt.hpp	2011-01-17 14:59:31 +0000
@@ -132,7 +132,7 @@ bool configure(atrt_config&, int setup);
 bool setup_directories(atrt_config&, int setup);
 bool setup_files(atrt_config&, int setup, int sshx);
 
-bool deploy(atrt_config&);
+bool deploy(int, atrt_config&);
 bool sshx(atrt_config&, unsigned procmask);
 bool start(atrt_config&, unsigned procmask);
 

=== modified file 'storage/ndb/test/run-test/main.cpp'
--- a/storage/ndb/test/run-test/main.cpp	2010-11-28 12:27:13 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2011-01-17 14:59:31 +0000
@@ -212,7 +212,7 @@ main(int argc, char ** argv)
   
   if (g_do_deploy)
   {
-    if (!deploy(g_config))
+    if (!deploy(g_do_deploy, g_config))
     {
       g_logger.critical("Failed to deploy");
       goto end;
@@ -613,8 +613,11 @@ parse_args(int argc, char** argv)
 	g_do_setup = 2;
 	break;
       case 'd':
-	g_do_deploy = 1;
+	g_do_deploy = 3;
 	break;
+      case 'D':
+        g_do_deploy = 2; // only binaries
+        break;
       case 'x':
 	g_do_sshx = atrt_process::AP_CLIENT | atrt_process::AP_NDB_API;
 	break;
@@ -1369,18 +1372,25 @@ do_rsync(const char *dir, const char *ds
 }
 
 bool
-deploy(atrt_config & config)
+deploy(int d, atrt_config & config)
 {
   for (size_t i = 0; i<config.m_hosts.size(); i++)
   {
-    if (!do_rsync(g_basedir, config.m_hosts[i]->m_hostname.c_str()))
-      return false;
+    if (d & 1)
+    {
+      if (!do_rsync(g_basedir, config.m_hosts[i]->m_hostname.c_str()))
+        return false;
+    }
 
-    if (!do_rsync(g_prefix, config.m_hosts[i]->m_hostname.c_str()))
-      return false;
+    if (d & 2)
+    {
+      if (!do_rsync(g_prefix, config.m_hosts[i]->m_hostname.c_str()))
+        return false;
     
-    if (g_prefix1 && !do_rsync(g_prefix1, config.m_hosts[i]->m_hostname.c_str()))
-      return false;
+      if (g_prefix1 && 
+          !do_rsync(g_prefix1, config.m_hosts[i]->m_hostname.c_str()))
+        return false;
+    }
   }
   
   return true;


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110117145931-amrksgykkumzsh1f.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (jonas:4125) Jonas Oreland17 Jan