From: Maitrayi Sabaratnam Date: April 12 2011 12:00pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4305) Bug#12330248 List-Archive: http://lists.mysql.com/commits/135265 X-Bug: 12330248 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2013992826==" --===============2013992826== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home2/tmp/maitrayi/repo/repo-70/mysql-5.1-telco-7.0-genno/ based on revid:jonas@stripped 4305 Maitrayi Sabaratnam 2011-04-12 Bug#12330248 - EXTEND NDBINFO.NODES TO SHOW THE CONFIG GENERATION NUMBER OF THE DATA NODES modified: storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp storage/ndb/src/kernel/vm/Configuration.cpp storage/ndb/src/kernel/vm/Configuration.hpp storage/ndb/src/kernel/vm/NdbinfoTables.cpp storage/ndb/tools/ndbinfo_sql.cpp === modified file 'storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp' --- a/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2011-04-09 15:48:21 +0000 +++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp 2011-04-12 11:59:36 +0000 @@ -2108,7 +2108,8 @@ void Cmvmi::execDBINFO_SCANREQ(Signal *s const NodeState& nodeState = getNodeState(); const Uint32 start_level = nodeState.startLevel; const NDB_TICKS uptime = (NdbTick_CurrentMillisecond()/1000) - m_start_time; - + Uint32 generation = m_ctx.m_config.get_config_generation(); + Ndbinfo::Row row(signal, req); row.write_uint32(getOwnNodeId()); // Node id @@ -2116,6 +2117,7 @@ void Cmvmi::execDBINFO_SCANREQ(Signal *s row.write_uint32(start_level); row.write_uint32(start_level == NodeState::SL_STARTING ? nodeState.starting.startPhase : 0); + row.write_uint32(generation); ndbinfo_send_row(signal, req, row, rl); break; } === modified file 'storage/ndb/src/kernel/vm/Configuration.cpp' --- a/storage/ndb/src/kernel/vm/Configuration.cpp 2011-03-29 12:32:02 +0000 +++ b/storage/ndb/src/kernel/vm/Configuration.cpp 2011-04-12 11:59:36 +0000 @@ -545,6 +545,16 @@ Configuration::getClusterConfigIterator( return m_clusterConfigIter; } +Uint32 +Configuration::get_config_generation() const { + Uint32 generation = ~0; + ndb_mgm_configuration_iterator sys_iter(*m_clusterConfig, + CFG_SECTION_SYSTEM); + sys_iter.get(CFG_SYS_CONFIG_GENERATION, &generation); + return generation; +} + + void Configuration::calcSizeAlt(ConfigValues * ownConfig){ const char * msg = "Invalid configuration fetched"; === modified file 'storage/ndb/src/kernel/vm/Configuration.hpp' --- a/storage/ndb/src/kernel/vm/Configuration.hpp 2011-02-01 23:27:25 +0000 +++ b/storage/ndb/src/kernel/vm/Configuration.hpp 2011-04-12 11:59:36 +0000 @@ -124,6 +124,7 @@ public: ndb_mgm_configuration_iterator * getClusterConfigIterator() const; ndb_mgm_configuration* getClusterConfig() const { return m_clusterConfig; } + Uint32 get_config_generation() const; private: friend class Cmvmi; === modified file 'storage/ndb/src/kernel/vm/NdbinfoTables.cpp' --- a/storage/ndb/src/kernel/vm/NdbinfoTables.cpp 2011-02-02 00:40:07 +0000 +++ b/storage/ndb/src/kernel/vm/NdbinfoTables.cpp 2011-04-12 11:59:36 +0000 @@ -141,14 +141,15 @@ DECLARE_NDBINFO_TABLE(COUNTERS,5) = } }; -DECLARE_NDBINFO_TABLE(NODES,4) = -{ { "nodes", 4, 0, "node status" }, +DECLARE_NDBINFO_TABLE(NODES,5) = +{ { "nodes", 5, 0, "node status" }, { {"node_id", Ndbinfo::Number, ""}, {"uptime", Ndbinfo::Number64, "time in seconds that node has been running"}, {"status", Ndbinfo::Number, "starting/started/stopped etc."}, - {"start_phase", Ndbinfo::Number, "start phase if node is starting"} + {"start_phase", Ndbinfo::Number, "start phase if node is starting"}, + {"config_generation", Ndbinfo::Number, "configuration generation number"} } }; === modified file 'storage/ndb/tools/ndbinfo_sql.cpp' --- a/storage/ndb/tools/ndbinfo_sql.cpp 2011-04-06 14:16:13 +0000 +++ b/storage/ndb/tools/ndbinfo_sql.cpp 2011-04-12 11:59:36 +0000 @@ -153,7 +153,8 @@ struct view { " WHEN 8 THEN \"STOPPING_4\"" " ELSE \"\" " " END AS status, " - "start_phase " + "start_phase, " + "config_generation " "FROM .nodes" }, { "memoryusage", --===============2013992826== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/maitrayi.sabaratnam@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: maitrayi.sabaratnam@stripped\ # w8k15ksvxfr2a5ki # target_branch: file:///export/home2/tmp/maitrayi/repo/repo-70/mysql-\ # 5.1-telco-7.0-genno/ # testament_sha1: 2a88feab636cf96cde3c52d55bba0c93a6699823 # timestamp: 2011-04-12 14:00:19 +0200 # base_revision_id: jonas@stripped # # Begin bundle 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 IUvtMFY= --===============2013992826==--