wl1292 - workaround for mgmsrv node id problems

ndb/src/cw/cpcd/Makefile.am

 
-ndbtools_PROGRAMS = ndb_cpcd
+ndbbin_PROGRAMS = ndb_cpcd
 
 ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
 

ndb/src/cw/cpcd/Process.cpp

@@ -209,11 +209,12 @@ int
 set_ulimit(const BaseString & pair){
 #ifdef HAVE_GETRLIMIT
   errno = 0;
-  do {
   Vector<BaseString> list;
   pair.split(list, ":");
   if(list.size() != 2){
-      break;
+    logger.error("Unable to process ulimit: split >%s< list.size()=%d", 
+		 pair.c_str(), list.size());
+    return -1;
   }
   
   int res;
@@ -239,19 +240,14 @@ set_ulimit(const BaseString & pair){
     _RLIMIT_FIX(RLIMIT_CPU);
   } else {
     errno = EINVAL;
-      break;
   }
-    if(!res)
-      break;
-    
-    return 0;
-  } while(false);
-  logger.error("Unable to process ulimit: %s(%s)", 
-	       pair.c_str(), strerror(errno));
+  if(res){
+    logger.error("Unable to process ulimit: %s res=%d error=%d(%s)", 
+		 pair.c_str(), res, errno, strerror(errno));
     return -1;
-#else
-  return 0; // Maybe it's ok anyway...
+  }
 #endif
+  return 0;
 }
 
 void

ndb/test/run-test/main.cpp

@@ -106,13 +106,6 @@ main(int argc, const char ** argv){
   if(!setup_hosts(g_config))
     goto end;
 
-  if(!start_processes(g_config, atrt_process::NDB_MGM))
-    goto end;
-
-  if(!connect_ndb_mgm(g_config)){
-    goto end;
-  }
-
   /**
    * Main loop
    */
@@ -122,12 +115,19 @@ main(int argc, const char ** argv){
      */
     if(restart){
       g_logger.info("(Re)starting ndb processes");
+      if(!stop_processes(g_config, atrt_process::NDB_MGM))
+	goto end;
+
       if(!stop_processes(g_config, atrt_process::NDB_DB))
 	goto end;
 
-      if(!wait_ndb(g_config, NDB_MGM_NODE_STATUS_NO_CONTACT))
+      if(!start_processes(g_config, atrt_process::NDB_MGM))
 	goto end;
       
+      if(!connect_ndb_mgm(g_config)){
+	goto end;
+      }
+      
       if(!start_processes(g_config, atrt_process::NDB_DB))
 	goto end;
       
@@ -140,7 +140,7 @@ main(int argc, const char ** argv){
       
       goto end;
       
-started:
+    started:
       g_logger.info("Ndb start completed");
     }