MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 28 2009 1:11pm
Subject:bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3144)
Bug#47365
View as plain text  
#At file:///home/msvensson/mysql/6.3-bug47365/ based on revid:magnus.blaudd@stripped28-u72djdsaqgw00qs7

 3144 Magnus Blåudd	2009-10-28
      Bug#47365 ndb_config --xml --configinfo: mark shm*, sci* as unsupported
       - Extend status for a config parameter so it can now also have the status experimental
       - Mark all SCI and SHM parameters as experimental
       - Remove unused CFG_CONNECTION_NODE_2_SYSTEM and CFG_CONNECTION_NODE_1_SYSTEM internal
         parameters
       - Mark TCP.PotNumber, SHM.PortNumber and SCI.PortNumber as deprecated so that code matches
         documentation. "This parameter should no longer be used. "

    modified:
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.hpp
=== modified file 'storage/ndb/include/mgmapi/mgmapi_config_parameters.h'
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2009-07-02 20:47:17 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2009-10-28 13:11:28 +0000
@@ -180,8 +180,8 @@
 #define CFG_CONNECTION_NODE_2         401
 #define CFG_CONNECTION_SEND_SIGNAL_ID 402
 #define CFG_CONNECTION_CHECKSUM       403
-#define CFG_CONNECTION_NODE_1_SYSTEM  404
-#define CFG_CONNECTION_NODE_2_SYSTEM  405
+#define CFG_404                       404 /* Removed */
+#define CFG_405                       405 /* Removed */
 #define CFG_CONNECTION_SERVER_PORT    406
 #define CFG_CONNECTION_HOSTNAME_1     407
 #define CFG_CONNECTION_HOSTNAME_2     408

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-10-09 13:09:38 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-10-28 13:11:28 +0000
@@ -2069,7 +2069,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "PortNumber",
     "TCP",
     "Port used for this transporter",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_DEPRICATED,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2112,28 +2112,6 @@ const ConfigInfo::ParamInfo ConfigInfo::
     0, 0 },
 
   {
-    CFG_CONNECTION_NODE_1_SYSTEM,
-    "NodeId1_System",
-    "TCP",
-    "System for node 1 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 },
-
-  {
-    CFG_CONNECTION_NODE_2_SYSTEM,
-    "NodeId2_System",
-    "TCP",
-    "System for node 2 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 },
-
-  {
     CFG_TCP_SND_BUF_SIZE,
     "TCP_SND_BUF_SIZE",
     "TCP",
@@ -2191,7 +2169,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SHM",
     "SHM",
     "Connection section",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_SECTION,
     (const char *)CONNECTION_TYPE_SHM, 
@@ -2224,7 +2202,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "PortNumber",
     "SHM",
     "Port used for this transporter",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_DEPRICATED,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2236,7 +2214,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Signum",
     "SHM",
     "Signum to be used for signalling",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     UNDEFINED,
@@ -2248,7 +2226,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId1",
     "SHM",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2259,7 +2237,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId2",
     "SHM",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2270,7 +2248,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Group",
     "SHM",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "35",
@@ -2281,7 +2259,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeIdServer",
     "SHM",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2292,7 +2270,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendSignalId",
     "SHM",
     "Sends id in each signal.  Used in trace files.",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "false",
@@ -2305,7 +2283,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Checksum",
     "SHM",
     "If checksum is enabled, all signals between nodes are checked for errors",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "true",
@@ -2317,7 +2295,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "ShmKey",
     "SHM",
     "A shared memory key",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     UNDEFINED,
@@ -2329,35 +2307,13 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "ShmSize",
     "SHM",
     "Size of shared memory segment",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "1M",
     "64K",
     STR_VALUE(MAX_INT_RNIL) },
 
-  {
-    CFG_CONNECTION_NODE_1_SYSTEM,
-    "NodeId1_System",
-    "SHM",
-    "System for node 1 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 },
-
-  {
-    CFG_CONNECTION_NODE_2_SYSTEM,
-    "NodeId2_System",
-    "SHM",
-    "System for node 2 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 },
-
   /****************************************************************************
    * SCI
    ***************************************************************************/
@@ -2366,7 +2322,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SCI",
     "SCI",
     "Connection section",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_SECTION,
     (const char *)CONNECTION_TYPE_SCI, 
@@ -2378,7 +2334,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId1",
     "SCI",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2390,7 +2346,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeId2",
     "SCI",
     "Id of node ("DB_TOKEN_PRINT", "API_TOKEN_PRINT" or "MGM_TOKEN_PRINT") on one side of the connection",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_STRING,
     MANDATORY,
@@ -2402,7 +2358,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Group",
     "SCI",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "15",
@@ -2413,7 +2369,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "NodeIdServer",
     "SCI",
     "",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2446,7 +2402,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "PortNumber",
     "SCI",
     "Port used for this transporter",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_DEPRICATED,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2458,7 +2414,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host1SciId0",
     "SCI",
     "SCI-node id for adapter 0 on Host1 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2470,7 +2426,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host1SciId1",
     "SCI",
     "SCI-node id for adapter 1 on Host1 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "0",
@@ -2482,7 +2438,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host2SciId0",
     "SCI",
     "SCI-node id for adapter 0 on Host2 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     MANDATORY,
@@ -2494,7 +2450,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Host2SciId1",
     "SCI",
     "SCI-node id for adapter 1 on Host2 (a computer can have two adapters)",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "0",
@@ -2506,7 +2462,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendSignalId",
     "SCI",
     "Sends id in each signal.  Used in trace files.",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "true",
@@ -2518,7 +2474,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "Checksum",
     "SCI",
     "If checksum is enabled, all signals between nodes are checked for errors",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_BOOL,
     "false",
@@ -2530,7 +2486,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SendLimit",
     "SCI",
     "Transporter send buffer contents are sent when this no of bytes is buffered",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "8K",
@@ -2542,34 +2498,13 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "SharedBufferSize",
     "SCI",
     "Size of shared memory segment",
-    ConfigInfo::CI_USED,
+    ConfigInfo::CI_EXPERIMENTAL,
     false,
     ConfigInfo::CI_INT,
     "1M",
     "64K",
     STR_VALUE(MAX_INT_RNIL) },
 
-  {
-    CFG_CONNECTION_NODE_1_SYSTEM,
-    "NodeId1_System",
-    "SCI",
-    "System for node 1 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 },
-
-  {
-    CFG_CONNECTION_NODE_2_SYSTEM,
-    "NodeId2_System",
-    "SCI",
-    "System for node 2 in connection",
-    ConfigInfo::CI_INTERNAL,
-    false,
-    ConfigInfo::CI_STRING,
-    UNDEFINED,
-    0, 0 }
 };
 
 const int ConfigInfo::m_NoOfParams = sizeof(m_ParamInfo) / sizeof(ParamInfo);
@@ -3070,6 +3005,7 @@ public:
     pairs.put("name", alias ? alias : name);
     if (primarykeys)
       pairs.put("primarykeys", primarykeys);
+
     print_xml("section", pairs, false);
     m_indent++;
   }
@@ -3142,6 +3078,16 @@ public:
     if (buf.length())
       pairs.put("check", buf.c_str());
 
+    // Get "supported" flag
+    Uint32 status = info.getStatus(section, param_name);
+    buf.clear();
+    if (status & ConfigInfo::CI_EXPERIMENTAL)
+      buf.append("experimental");
+
+    if (buf.length())
+      pairs.put("supported", buf.c_str());
+
+
     print_xml("param", pairs);
   }
 };

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.hpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2009-10-28 13:11:28 +0000
@@ -47,6 +47,7 @@ class ConfigInfo {
 public:
   enum Type        { CI_BOOL, CI_INT, CI_INT64, CI_STRING, CI_SECTION };
   enum Status      { CI_USED,            ///< Active
+                     CI_EXPERIMENTAL,    ///< Active but experimental
 		     CI_DEPRICATED,      ///< Can be, but shouldn't
 		     CI_NOTIMPLEMENTED,  ///< Is ignored.
 		     CI_INTERNAL         ///< Not configurable by the user

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20091028131128-4nislnvm40jjh6me.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3144)Bug#47365Magnus Blåudd28 Oct