ndb

 - merge in support for CI_BITMASK parameters in config.in and my.cnf
 - change to use same code path(as much as possible) for reading both
 config.ini and my.cnf so that the same rules are applied to config.

Author: blaudden

mysql-test/suite/ndb/bug56185.ini

@@ -0,0 +1,19 @@
+[ndbd default]
+
+[ndb_mgmd]
+Id=1
+Hostname=localhost
+
+[ndbd]
+Id=2
+Hostname=localhost
+Arbitration=WaitExternal
+LockExecuteThreadToCPU=37-48
+
+[ndbd]
+Id=3
+Hostname=localhost
+Arbitration=Default
+LockExecuteThreadToCPU=1-2
+
+[mysqld]

mysql-test/suite/ndb/ndb_config_mycnf1.cnf

@@ -19,3 +19,14 @@ NoOfReplicas=2
 ndbd = 192.168.0.1,192.168.0.2,192.168.0.3,192.168.0.4
 ndb_mgmd = 192.168.0.1
 mysqld = 192.168.0.1
+
+[cluster_config.bug56185]
+NoOfReplicas=1
+ndbd = localhost
+ndb_mgmd = localhost
+mysql = localhost, localhost
+
+[cluster_config.ndbd.1.bug56185]
+LockExecuteThreadToCPU=0-65535
+Arbitration=Disabled
+

mysql-test/suite/ndb/r/ndb_config.result

@@ -32,3 +32,6 @@ tcp,3,4,55,3 tcp,3,5,55,3 tcp,3,6,55,3 tcp,4,5,55,4 tcp,4,6,55,4 tcp,5,6,55,5 tc
 == 17 == bug49400
  ERROR    -- at line 25: TCP connection is a duplicate of the existing TCP link from line 14
  ERROR    -- at line 25: Could not store section of configuration file.
+== 18 == bug56185
+0,0-65535
+2,37-48 1,1-2

mysql-test/suite/ndb/t/ndb_config.test

@@ -54,3 +54,10 @@ echo == 17 == bug49400;
 --error 255
 --exec $NDB_CONFIG --no-defaults --config-file=$MYSQL_TEST_DIR/suite/ndb/bug49400.ini 2>&1
 
+echo == 18 == bug56185;
+# Read bitmask value and enum from my.cnf
+--exec $NDB_CONFIG --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --defaults-group-suffix=.bug56185 --query=Arbitration,LockExecuteThreadToCPU --type=ndbd --mycnf
+
+# Read bitmask value and enum from config.ini
+--exec $NDB_CONFIG --config-file=$MYSQL_TEST_DIR/suite/ndb/bug56185.ini --query=Arbitration,LockExecuteThreadToCPU --type=ndbd
+

storage/ndb/src/mgmsrv/ConfigInfo.cpp

@@ -637,9 +637,11 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
     "CPU list indicating which CPU will run the execution thread(s)",
     ConfigInfo::CI_USED,
     0,
-    ConfigInfo::CI_STRING,
+    ConfigInfo::CI_BITMASK,
     0,
-    0, 0 },
+    0,
+    "65535"
+  },
 
   {
     CFG_DB_MAINT_LOCK_CPU,
@@ -3013,6 +3015,20 @@ ConfigInfo::ConfigInfo()
         else if(param._default)
           pinfo.put("Default", param._default);
 	break;
+
+      case CI_BITMASK:
+        assert(param._min == 0); // Bitmask can't have min value
+
+	Uint64 tmp_uint64;
+	require(InitConfigFileParser::convertStringToUint64(param._max,
+                                                            tmp_uint64));
+	pinfo.put64("Max", tmp_uint64);
+
+        if(param._default == MANDATORY)
+          pinfo.put("Mandatory", (Uint32)1);
+        else if(param._default)
+          pinfo.put("Default", param._default);
+        break;
     }
 
     // Check that pinfo is really new
@@ -3043,6 +3059,7 @@ ConfigInfo::ConfigInfo()
 	    break;
 	  case CI_ENUM:
 	  case CI_STRING:
+          case CI_BITMASK:
 	    require(p->put(param._fname, param._default));
 	    break;
 	  case CI_BOOL:
@@ -3429,6 +3446,7 @@ class PrettyPrinter : public ConfigPrinter {
       fprintf(m_out, "\n");
       break;
 
+    case ConfigInfo::CI_BITMASK:
     case ConfigInfo::CI_ENUM:
     case ConfigInfo::CI_STRING:
       fprintf(m_out, "%s (String)\n", param_name);
@@ -3552,6 +3570,7 @@ class XMLPrinter : public ConfigPrinter {
       pairs.put("max", buf.c_str());
     break;
 
+    case ConfigInfo::CI_BITMASK:
     case ConfigInfo::CI_ENUM:
     case ConfigInfo::CI_STRING:
       pairs.put("type", "string");
@@ -3959,6 +3978,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
           DBUG_PRINT("info",("%s=%lld #default",name,val));
 	  break;
 	}
+        case ConfigInfo::CI_BITMASK:
 	case ConfigInfo::CI_STRING:{
 	  const char * val;
 	  require(defaults->get(name, &val));
@@ -3987,6 +4007,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
           DBUG_PRINT("info",("%s=%lld",name,val));
           break;
         }
+        case ConfigInfo::CI_BITMASK:
         case ConfigInfo::CI_ENUM:
         case ConfigInfo::CI_STRING:{
           const char * val;

storage/ndb/src/mgmsrv/ConfigInfo.hpp

@@ -43,6 +43,7 @@ class ConfigInfo {
                      CI_INT64,
                      CI_STRING,
                      CI_ENUM, // String externaly, int internally
+                     CI_BITMASK, // String both externally and internally
                      CI_SECTION
   };
   enum Status      { CI_USED,            ///< Active