From 8b45aa646e403935f6a3878f44d6f0e8b3db6c25 Mon Sep 17 00:00:00 2001
From: unknown <ndbdev@eel.hemma.oreland.se>
Date: Wed, 4 Aug 2004 20:48:48 +0200
Subject: [PATCH] wl1292 - workaround for mgmsrv node id problems

ndb/src/cw/cpcd/Makefile.am:
  Put cpcd in libexec
ndb/src/cw/cpcd/Process.cpp:
  Fixed reverse check with ulimit
ndb/test/run-test/main.cpp:
  Restart mgm server aswell on test failure.
  Removes problems with nodeid
---
 ndb/src/cw/cpcd/Makefile.am |  2 +-
 ndb/src/cw/cpcd/Process.cpp | 78 ++++++++++++++++++-------------------
 ndb/test/run-test/main.cpp  | 26 ++++++-------
 3 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am
index 6345bae9bbe..1f7b0d88448 100644
--- a/ndb/src/cw/cpcd/Makefile.am
+++ b/ndb/src/cw/cpcd/Makefile.am
@@ -1,5 +1,5 @@
 
-ndbtools_PROGRAMS = ndb_cpcd
+ndbbin_PROGRAMS = ndb_cpcd
 
 ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
 
diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp
index 74426306a88..d99dda2ba0b 100644
--- a/ndb/src/cw/cpcd/Process.cpp
+++ b/ndb/src/cw/cpcd/Process.cpp
@@ -209,49 +209,45 @@ int
 set_ulimit(const BaseString & pair){
 #ifdef HAVE_GETRLIMIT
   errno = 0;
-  do {
-    Vector<BaseString> list;
-    pair.split(list, ":");
-    if(list.size() != 2){
-      break;
-    }
-
-    int res;
-    rlim_t value = RLIM_INFINITY;
-    if(!(list[1].trim() == "unlimited")){
-      value = atoi(list[1].c_str());
-    }
-
-    struct rlimit rlp;
+  Vector<BaseString> list;
+  pair.split(list, ":");
+  if(list.size() != 2){
+    logger.error("Unable to process ulimit: split >%s< list.size()=%d", 
+		 pair.c_str(), list.size());
+    return -1;
+  }
+  
+  int res;
+  rlim_t value = RLIM_INFINITY;
+  if(!(list[1].trim() == "unlimited")){
+    value = atoi(list[1].c_str());
+  }
+  
+  struct rlimit rlp;
 #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }}
-
-    if(list[0].trim() == "c"){
-      _RLIMIT_FIX(RLIMIT_CORE);
-    } else if(list[0] == "d"){
-      _RLIMIT_FIX(RLIMIT_DATA);
-    } else if(list[0] == "f"){
-      _RLIMIT_FIX(RLIMIT_FSIZE);
-    } else if(list[0] == "n"){
-      _RLIMIT_FIX(RLIMIT_NOFILE);
-    } else if(list[0] == "s"){
-      _RLIMIT_FIX(RLIMIT_STACK);
-    } else if(list[0] == "t"){
-      _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));
-  return -1;
-#else
-  return 0; // Maybe it's ok anyway...
+  
+  if(list[0].trim() == "c"){
+    _RLIMIT_FIX(RLIMIT_CORE);
+  } else if(list[0] == "d"){
+    _RLIMIT_FIX(RLIMIT_DATA);
+  } else if(list[0] == "f"){
+    _RLIMIT_FIX(RLIMIT_FSIZE);
+  } else if(list[0] == "n"){
+    _RLIMIT_FIX(RLIMIT_NOFILE);
+  } else if(list[0] == "s"){
+    _RLIMIT_FIX(RLIMIT_STACK);
+  } else if(list[0] == "t"){
+    _RLIMIT_FIX(RLIMIT_CPU);
+  } else {
+    errno = EINVAL;
+  }
+  if(res){
+    logger.error("Unable to process ulimit: %s res=%d error=%d(%s)", 
+		 pair.c_str(), res, errno, strerror(errno));
+    return -1;
+  }
 #endif
+  return 0;
 }
 
 void
diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp
index 865fe8b49a0..c23133245a7 100644
--- a/ndb/test/run-test/main.cpp
+++ b/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,25 +115,32 @@ 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;
-
+      
       if(!wait_ndb(g_config, NDB_MGM_NODE_STATUS_NOT_STARTED))
         goto end;
-
+      
       for(Uint32 i = 0; i<3; i++)      
         if(wait_ndb(g_config, NDB_MGM_NODE_STATUS_STARTED))
 	  goto started;
-
+      
       goto end;
-
-started:
+      
+    started:
       g_logger.info("Ndb start completed");
     }