merge

ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged

8 files changed, 208 insertions, 66 deletions

diff --git a/ndb/src/common/mgmcommon/NdbConfig.c b/ndb/src/common/mgmcommon/NdbConfig.c
index 6c93f9fc7cf..5da82eb1032 100644
--- a/ndb/src/common/mgmcommon/NdbConfig.c
+++ b/ndb/src/common/mgmcommon/NdbConfig.c
@@ -71,58 +71,73 @@ NdbConfig_NdbCfgName(int with_ndb_home){
   return buf;
 }
 
+static
+char *get_prefix_buf(int len, int node_id)
+{
+  char tmp_buf[sizeof("ndb_pid#########")+1];
+  if (node_id > 0)
+    snprintf(tmp_buf, sizeof(tmp_buf), "ndb_%u", node_id);
+  else
+    snprintf(tmp_buf, sizeof(tmp_buf), "ndb_pid%u", getpid());
+  tmp_buf[sizeof(tmp_buf)-1]= 0;
+
+  char *buf= NdbConfig_AllocHomePath(len+strlen(tmp_buf));
+  strcat(buf, tmp_buf);
+  return buf;
+}
+
 char* 
 NdbConfig_ErrorFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_error.log", node_id);
+  snprintf(buf+len, 128, "_error.log");
   return buf;
 }
 
 char*
 NdbConfig_ClusterLogFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_cluster.log", node_id);
+  snprintf(buf+len, 128, "_cluster.log");
   return buf;
 }
 
 char*
 NdbConfig_SignalLogFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_signal.log", node_id);
+  snprintf(buf+len, 128, "_signal.log");
   return buf;
 }
 
 char*
 NdbConfig_TraceFileName(int node_id, int file_no){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_trace.log.%u", node_id, file_no);
+  snprintf(buf+len, 128, "_trace.log.%u", file_no);
   return buf;
 }
 
 char*
 NdbConfig_NextTraceFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_trace.log.next", node_id);
+  snprintf(buf+len, 128, "_trace.log.next");
   return buf;
 }
 
 char*
 NdbConfig_PidFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u.pid", node_id);
+  snprintf(buf+len, 128, ".pid");
   return buf;
 }
 
 char*
 NdbConfig_StdoutFileName(int node_id){
-  char *buf= NdbConfig_AllocHomePath(128);
+  char *buf= get_prefix_buf(128, node_id);
   int len= strlen(buf);
-  snprintf(buf+len, 128, "ndb_%u_out.log", node_id);
+  snprintf(buf+len, 128, "_out.log");
   return buf;
 }
diff --git a/ndb/src/kernel/error/ErrorReporter.cpp b/ndb/src/kernel/error/ErrorReporter.cpp
index f1320c44e09..d43001ef1f5 100644
--- a/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/ndb/src/kernel/error/ErrorReporter.cpp
@@ -139,7 +139,7 @@ ErrorReporter::formatMessage(ErrorCategory type,
 	   objRef, 
 	   programName, 
 	   processId, 
-	   theNameOfTheTraceFile);
+	   theNameOfTheTraceFile ? theNameOfTheTraceFile : "<no tracefile>");
 
   // Add trailing blanks to get a fixed lenght of the message
   while (strlen(messptr) <= MESSAGE_LENGTH-3){
@@ -217,8 +217,10 @@ WriteMessage(ErrorCategory thrdType, int thrdMessageID,
   /**
    * Format trace file name
    */
-  int file_no= ErrorReporter::get_trace_no();
-  char *theTraceFileName= NdbConfig_TraceFileName(globalData.ownId, file_no);
+  char *theTraceFileName= 0;
+  if (globalData.ownId > 0)
+    theTraceFileName= NdbConfig_TraceFileName(globalData.ownId,
+					      ErrorReporter::get_trace_no());
   NdbAutoPtr<char> tmp_aptr1(theTraceFileName);
   
   // The first 69 bytes is info about the current offset
@@ -291,26 +293,28 @@ WriteMessage(ErrorCategory thrdType, int thrdMessageID,
   fflush(stream);
   fclose(stream);
   
-  // Open the tracefile...
-  FILE *jamStream = fopen(theTraceFileName, "w");
+  if (theTraceFileName) {
+    // Open the tracefile...
+    FILE *jamStream = fopen(theTraceFileName, "w");
   
-  //  ...and "dump the jam" there.
-  //  ErrorReporter::dumpJam(jamStream);
-  if(thrdTheEmulatedJam != 0){
-    dumpJam(jamStream, thrdTheEmulatedJamIndex, thrdTheEmulatedJam);
-  }
-  
-  /* Dont print the jobBuffers until a way to copy them, 
-     like the other variables,
-     is implemented. Otherwise when NDB keeps running, 
-     with this function running
-     in the background, the jobBuffers will change during runtime. And when
-     they're printed here, they will not be correct anymore.
-  */
-  globalScheduler.dumpSignalMemory(jamStream);
+    //  ...and "dump the jam" there.
+    //  ErrorReporter::dumpJam(jamStream);
+    if(thrdTheEmulatedJam != 0){
+      dumpJam(jamStream, thrdTheEmulatedJamIndex, thrdTheEmulatedJam);
+    }
   
-  fclose(jamStream);
+    /* Dont print the jobBuffers until a way to copy them, 
+       like the other variables,
+       is implemented. Otherwise when NDB keeps running, 
+       with this function running
+       in the background, the jobBuffers will change during runtime. And when
+       they're printed here, they will not be correct anymore.
+    */
+    globalScheduler.dumpSignalMemory(jamStream);
   
+    fclose(jamStream);
+  }
+
   return 0;
 }
 
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp
index 0f65d9425ae..498b1973339 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/ndb/src/mgmapi/mgmapi.cpp
@@ -403,14 +403,15 @@ ndb_mgm_disconnect(NdbMgmHandle handle)
 struct ndb_mgm_type_atoi 
 {
   const char * str;
+  const char * alias;
   enum ndb_mgm_node_type value;
 };
 
 static struct ndb_mgm_type_atoi type_values[] = 
 {
-  { "NDB", NDB_MGM_NODE_TYPE_NDB},
-  { "API", NDB_MGM_NODE_TYPE_API },
-  { "MGM", NDB_MGM_NODE_TYPE_MGM }
+  { "NDB", "ndbd", NDB_MGM_NODE_TYPE_NDB},
+  { "API", "mysqld", NDB_MGM_NODE_TYPE_API },
+  { "MGM", "ndb_mgmd", NDB_MGM_NODE_TYPE_MGM }
 };
 
 const int no_of_type_values = (sizeof(type_values) / 
@@ -440,6 +441,20 @@ ndb_mgm_get_node_type_string(enum ndb_mgm_node_type type)
   return 0;
 }
 
+extern "C"
+const char * 
+ndb_mgm_get_node_type_alias_string(enum ndb_mgm_node_type type, const char** str)
+{
+  for(int i = 0; i<no_of_type_values; i++)
+    if(type_values[i].value == type)
+      {
+	if (str)
+	  *str= type_values[i].str;
+	return type_values[i].alias;
+      }
+  return 0;
+}
+
 struct ndb_mgm_status_atoi {
   const char * str;
   enum ndb_mgm_node_status value;
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index 948423f0109..377bc7c435f 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -177,9 +177,12 @@ const int ConfigInfo::m_NoOfRules = sizeof(m_SectionRules)/sizeof(SectionRule);
 /****************************************************************************
  * Config Rules declarations
  ****************************************************************************/
-static bool add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, 
+static bool sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 			  struct InitConfigFileParser::Context &ctx, 
 			  const char * rule_data);
+static bool add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, 
+				 struct InitConfigFileParser::Context &ctx, 
+				 const char * rule_data);
 static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 		      struct InitConfigFileParser::Context &ctx, 
 		      const char * rule_data);
@@ -189,6 +192,7 @@ static bool check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&section
 
 const ConfigInfo::ConfigRule 
 ConfigInfo::m_ConfigRules[] = {
+  { sanity_checks, 0 },
   { add_node_connections, 0 },
   { add_server_ports, 0 },
   { check_node_vs_replicas, 0 },
@@ -270,6 +274,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     ConfigInfo::STRING,
     MANDATORY,
     0, 0 },
+
+  {
+    KEY_INTERNAL,
+    "ByteOrder",
+    "COMPUTER",
+    0,
+    ConfigInfo::DEPRICATED,
+    false,
+    ConfigInfo::STRING,
+    UNDEFINED,
+    0,
+    0 },
   
   /****************************************************************************
    * SYSTEM
@@ -3227,6 +3243,29 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
 }
 
 static bool
+sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, 
+	      struct InitConfigFileParser::Context &ctx, 
+	      const char * rule_data)
+{
+  Uint32 db_nodes = 0;
+  Uint32 mgm_nodes = 0;
+  Uint32 api_nodes = 0;
+  if (!ctx.m_userProperties.get("DB", &db_nodes)) {
+    ctx.reportError("At least one database node should be defined in config file");
+    return false;
+  }
+  if (!ctx.m_userProperties.get("MGM", &mgm_nodes)) {
+    ctx.reportError("At least one management server node should be defined in config file");
+    return false;
+  }
+  if (!ctx.m_userProperties.get("API", &api_nodes)) {
+    ctx.reportError("At least one application node (for the mysqld) should be defined in config file");
+    return false;
+  }
+  return true;
+}
+
+static bool
 add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 		   struct InitConfigFileParser::Context &ctx, 
 		   const char * rule_data)
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 0f50fd6c596..3ba93f5f229 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -589,8 +589,10 @@ MgmtSrvr::MgmtSrvr(NodeId nodeId,
 
   _ownNodeId= 0;
   NodeId tmp= nodeId;
-  if (!alloc_node_id(&tmp, NDB_MGM_NODE_TYPE_MGM, 0, 0)){
-    ndbout << "Unable to obtain requested nodeid " << nodeId;
+  BaseString error_string;
+  if (!alloc_node_id(&tmp, NDB_MGM_NODE_TYPE_MGM, 0, 0, error_string)){
+    ndbout << "Unable to obtain requested nodeid: "
+	   << error_string.c_str() << endl;
     exit(-1);
   }
   _ownNodeId = tmp;
@@ -623,15 +625,19 @@ MgmtSrvr::check_start()
 }
 
 bool 
-MgmtSrvr::start()
+MgmtSrvr::start(BaseString &error_string)
 {
   if (_props == NULL) {
-    if (!check_start())
+    if (!check_start()) {
+      error_string.append("MgmtSrvr.cpp: check_start() failed.");
       return false;
+    }
   }
-  theFacade= TransporterFacade::theFacadeInstance = new TransporterFacade();
+  theFacade= TransporterFacade::theFacadeInstance= new TransporterFacade();
+  
   if(theFacade == 0) {
-    DEBUG("MgmtSrvr.cpp: theFacade == 0.");
+    DEBUG("MgmtSrvr.cpp: theFacade is NULL.");
+    error_string.append("MgmtSrvr.cpp: theFacade is NULL.");
     return false;
   }  
   if ( theFacade->start_instance
@@ -650,6 +656,7 @@ MgmtSrvr::start()
   
   if(_blockNumber == -1){
     DEBUG("MgmtSrvr.cpp: _blockNumber is -1.");
+    error_string.append("MgmtSrvr.cpp: _blockNumber is -1.");
     theFacade->stop_instance();
     theFacade = 0;
     return false;
@@ -2324,7 +2331,8 @@ bool
 MgmtSrvr::alloc_node_id(NodeId * nodeId, 
 			enum ndb_mgm_node_type type,
 			struct sockaddr *client_addr, 
-			SOCKET_SIZE_TYPE *client_addr_len)
+			SOCKET_SIZE_TYPE *client_addr_len,
+			BaseString &error_string)
 {
   Guard g(&f_node_id_mutex);
 #if 0
@@ -2342,31 +2350,39 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
       }
   }
 
+  bool found_matching_id= false;
+  bool found_matching_type= false;
+  bool found_free_node= false;
+  const char *config_hostname = 0;
+  struct in_addr config_addr= {0};
+  int r_config_addr= -1;
+  unsigned type_c= 0;
+
   ndb_mgm_configuration_iterator iter(*(ndb_mgm_configuration *)_config->m_configValues,
 				      CFG_SECTION_NODE);
   for(iter.first(); iter.valid(); iter.next()) {
     unsigned tmp= 0;
     if(iter.get(CFG_NODE_ID, &tmp)) abort();
-    if (connected_nodes.get(tmp))
-      continue;
     if (*nodeId && *nodeId != tmp)
       continue;
-    unsigned type_c;
+    found_matching_id= true;
     if(iter.get(CFG_TYPE_OF_SECTION, &type_c)) abort();
     if(type_c != type)
       continue;
-    const char *config_hostname = 0;
+    found_matching_type= true;
+    if (connected_nodes.get(tmp))
+      continue;
+    found_free_node= true;
     if(iter.get(CFG_NODE_HOST, &config_hostname)) abort();
 
     if (config_hostname && config_hostname[0] != 0 && client_addr) {
       // check hostname compatability
-      struct in_addr config_addr;
-      const void *tmp= &(((sockaddr_in*)client_addr)->sin_addr);
-      if(Ndb_getInAddr(&config_addr, config_hostname) != 0
-	 || memcmp(&config_addr, tmp, sizeof(config_addr)) != 0) {
+      const void *tmp_in= &(((sockaddr_in*)client_addr)->sin_addr);
+      if((r_config_addr= Ndb_getInAddr(&config_addr, config_hostname)) != 0
+	 || memcmp(&config_addr, tmp_in, sizeof(config_addr)) != 0) {
 	struct in_addr tmp_addr;
 	if(Ndb_getInAddr(&tmp_addr, "localhost") != 0
-	   || memcmp(&tmp_addr, tmp, sizeof(config_addr)) != 0) {
+	   || memcmp(&tmp_addr, tmp_in, sizeof(config_addr)) != 0) {
 	  // not localhost
 #if 0
 	  ndbout << "MgmtSrvr::getFreeNodeId compare failed for \"" << config_hostname
@@ -2394,6 +2410,46 @@ MgmtSrvr::alloc_node_id(NodeId * nodeId,
 #endif
     return true;
   }
+
+  BaseString type_string, type_c_string;
+  {
+    const char *alias, *str;
+    alias= ndb_mgm_get_node_type_alias_string(type, &str);
+    type_string.assfmt("%s(%s)", alias, str);
+    alias= ndb_mgm_get_node_type_alias_string((enum ndb_mgm_node_type)type_c, &str);
+    type_c_string.assfmt("%s(%s)", alias, str);
+  }
+
+  if (*nodeId == 0) {
+    if (found_matching_id)
+      if (found_matching_type)
+	if (found_free_node)
+	  error_string.appfmt("Connection done from wrong host ip %s.",
+			      inet_ntoa(((struct sockaddr_in *)(client_addr))->sin_addr));
+	else
+	  error_string.appfmt("No free node id found for %s.", type_string.c_str());
+      else
+	error_string.appfmt("No %s node defined in config file.", type_string.c_str());
+    else
+      error_string.append("No nodes defined in config file.");
+  } else {
+    if (found_matching_id)
+      if (found_matching_type)
+	if (found_free_node) {
+	  // have to split these into two since inet_ntoa overwrites itself
+	  error_string.appfmt("Connection with id %d done from wrong host ip %s,",
+			      *nodeId, inet_ntoa(((struct sockaddr_in *)(client_addr))->sin_addr));
+	  error_string.appfmt(" expected %s(%s).", config_hostname,
+			      r_config_addr ? "lookup failed" : inet_ntoa(config_addr));
+	} else
+	  error_string.appfmt("Id %d already allocated by another node.", *nodeId);
+      else
+	error_string.appfmt("Id %d configured as %s, connect attempted as %s.",
+			    *nodeId, type_c_string.c_str(), type_string.c_str());
+    else
+      error_string.appfmt("No node defined with id=%d in config file.", *nodeId);
+  }
+
   return false;
 }
 
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index e910fb67449..2ed0d4d4874 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -179,7 +179,7 @@ public:
    *   @return true if succeeded, otherwise false
    */
   bool check_start(); // may be run before start to check that some things are ok
-  bool start();
+  bool start(BaseString &error_string);
 
   ~MgmtSrvr();
 
@@ -467,7 +467,8 @@ public:
    */
   bool getNextNodeId(NodeId * _nodeId, enum ndb_mgm_node_type type) const ;
   bool alloc_node_id(NodeId * _nodeId, enum ndb_mgm_node_type type,
-		     struct sockaddr *client_addr, SOCKET_SIZE_TYPE *client_addr_len);
+		     struct sockaddr *client_addr, SOCKET_SIZE_TYPE *client_addr_len,
+		     BaseString &error_string);
   
   /**
    *
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 0f54a15c20c..26120e1b82b 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -413,11 +413,14 @@ MgmApiSession::get_nodeid(Parser_t::Context &,
 
   NodeId tmp= nodeid;
   if(tmp == 0 || !m_allocated_resources->is_reserved(tmp)){
+    BaseString error_string;
     if (!m_mgmsrv.alloc_node_id(&tmp, (enum ndb_mgm_node_type)nodetype, 
-				&addr, &addrlen)){
+				&addr, &addrlen, error_string)){
+      const char *alias;
+      const char *str;
+      alias= ndb_mgm_get_node_type_alias_string((enum ndb_mgm_node_type)nodetype, &str);
       m_output->println(cmd);
-      m_output->println("result: no free nodeid %d for nodetype %d",
-			nodeid, nodetype);
+      m_output->println("result: %s", error_string.c_str());
       m_output->println("");
       return;
     }
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index b671a4d8590..3ca6db70e61 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -203,10 +203,15 @@ NDB_MAIN(mgmsrv){
   glob.use_specific_ip = false;
 
   if(!glob.use_specific_ip){
-    if(!glob.socketServer->tryBind(glob.port, glob.interface_name)){
+    int count= 5; // no of retries for tryBind
+    while(!glob.socketServer->tryBind(glob.port, glob.interface_name)){
+      if (--count > 0) {
+	NdbSleep_MilliSleep(1000);
+	continue;
+      }
       ndbout_c("Unable to setup port: %s:%d!\n"
 	       "Please check if the port is already used,\n"
-	       "(perhaps a mgmtsrvr is already running),\n"
+	       "(perhaps a ndb_mgmd is already running),\n"
 	       "and if you are executing on the correct computer", 
 	       (glob.interface_name ? glob.interface_name : "*"), glob.port);
       goto error_end;
@@ -218,7 +223,7 @@ NDB_MAIN(mgmsrv){
   if(!glob.socketServer->setup(mapi, glob.port, glob.interface_name)){
     ndbout_c("Unable to setup management port: %d!\n"
 	     "Please check if the port is already used,\n"
-	     "(perhaps a mgmtsrvr is already running),\n"
+	     "(perhaps a ndb_mgmd is already running),\n"
 	     "and if you are executing on the correct computer", 
 	     glob.port);
     delete mapi;
@@ -251,10 +256,14 @@ NDB_MAIN(mgmsrv){
   }
 
   signal(SIGPIPE, SIG_IGN);
-  if(!glob.mgmObject->start()){
-    ndbout_c("Unable to start management server.");
-    ndbout_c("Probably caused by illegal initial configuration file.");
-    goto error_end;
+  {
+    BaseString error_string;
+    if(!glob.mgmObject->start(error_string)){
+      ndbout_c("Unable to start management server.");
+      ndbout_c("Probably caused by illegal initial configuration file.");
+      ndbout_c(error_string.c_str());
+      goto error_end;
+    }
   }
 
   //glob.mgmObject->saveConfig();