diff options
Diffstat (limited to 'ndb/src/mgmclient/CommandInterpreter.cpp')
| -rw-r--r-- | ndb/src/mgmclient/CommandInterpreter.cpp | 59 |
1 files changed, 36 insertions, 23 deletions
diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp index 124c5c18748..b4bbb3531ad 100644 --- a/ndb/src/mgmclient/CommandInterpreter.cpp +++ b/ndb/src/mgmclient/CommandInterpreter.cpp @@ -389,7 +389,7 @@ CommandInterpreter::CommandInterpreter(const char *_host,int verbose) } m_mgmsrv2 = ndb_mgm_create_handle(); if(m_mgmsrv2 == NULL) { - ndbout_c("Cannot create handle to management server."); + ndbout_c("Cannot create 2:nd handle to management server."); exit(-1); } if (ndb_mgm_set_connectstring(m_mgmsrv, _host)) @@ -496,11 +496,13 @@ CommandInterpreter::connect() { const char *host= ndb_mgm_get_connected_host(m_mgmsrv); unsigned port= ndb_mgm_get_connected_port(m_mgmsrv); - if(!ndb_mgm_set_connectstring(m_mgmsrv2, - BaseString(host).appfmt(":%d",port).c_str()) - && + BaseString constr; + constr.assfmt("%s:%d",host,port); + if(!ndb_mgm_set_connectstring(m_mgmsrv2, constr.c_str()) && !ndb_mgm_connect(m_mgmsrv2, try_reconnect-1, 5, 1)) { + DBUG_PRINT("info",("2:ndb connected to Management Server ok at: %s:%d", + host, port)); assert(m_event_thread == 0); assert(do_event_thread == 0); do_event_thread= 0; @@ -511,6 +513,7 @@ CommandInterpreter::connect() NDB_THREAD_PRIO_LOW); if (m_event_thread != 0) { + DBUG_PRINT("info",("Thread created ok, waiting for started...")); int iter= 1000; // try for 30 seconds while(do_event_thread == 0 && iter-- > 0) @@ -537,11 +540,18 @@ CommandInterpreter::connect() } else { + DBUG_PRINT("warning", + ("Could not do 2:nd connect to mgmtserver for event listening")); + DBUG_PRINT("info", ("code: %d, msg: %s", + ndb_mgm_get_latest_error(m_mgmsrv2), + ndb_mgm_get_latest_error_msg(m_mgmsrv2))); printf("Warning, event connect failed, degraded printouts as result\n"); + printf("code: %d, msg: %s\n", + ndb_mgm_get_latest_error(m_mgmsrv2), + ndb_mgm_get_latest_error_msg(m_mgmsrv2)); } m_connected= true; - DBUG_PRINT("info",("Connected to Management Server at: %s:%d", - host,port)); + DBUG_PRINT("info",("Connected to Management Server at: %s:%d", host, port)); if (m_verbose) { printf("Connected to Management Server at: %s:%d\n", @@ -1268,7 +1278,7 @@ CommandInterpreter::executeClusterLog(char* parameters) DBUG_VOID_RETURN; } - enum ndb_mgm_clusterlog_level severity = NDB_MGM_CLUSTERLOG_ALL; + enum ndb_mgm_event_severity severity = NDB_MGM_EVENT_SEVERITY_ALL; char * tmpString = my_strdup(parameters,MYF(MY_WME)); My_auto_ptr<char> ap1(tmpString); @@ -1276,7 +1286,7 @@ CommandInterpreter::executeClusterLog(char* parameters) char * item = strtok_r(tmpString, " ", &tmpPtr); int enable; - Uint32 *enabled = ndb_mgm_get_logfilter(m_mgmsrv); + const unsigned int *enabled= ndb_mgm_get_logfilter(m_mgmsrv); if(enabled == NULL) { ndbout << "Couldn't get status" << endl; printError(); @@ -1298,8 +1308,8 @@ CommandInterpreter::executeClusterLog(char* parameters) printf("enabled[%d] = %d\n", i, enabled[i]); #endif ndbout << "Severities enabled: "; - for(i = 1; i < (int)NDB_MGM_CLUSTERLOG_ALL; i++) { - const char *str= ndb_mgm_get_clusterlog_level_string((ndb_mgm_clusterlog_level)i); + for(i = 1; i < (int)NDB_MGM_EVENT_SEVERITY_ALL; i++) { + const char *str= ndb_mgm_get_event_severity_string((ndb_mgm_event_severity)i); if (str == 0) { DBUG_ASSERT(false); @@ -1333,8 +1343,10 @@ CommandInterpreter::executeClusterLog(char* parameters) int res_enable; item = strtok_r(NULL, " ", &tmpPtr); if (item == NULL) { - res_enable= ndb_mgm_filter_clusterlog(m_mgmsrv, - NDB_MGM_CLUSTERLOG_ON, enable, NULL); + res_enable= + ndb_mgm_set_clusterlog_severity_filter(m_mgmsrv, + NDB_MGM_EVENT_SEVERITY_ON, + enable, NULL); if (res_enable < 0) { ndbout << "Couldn't set filter" << endl; @@ -1346,32 +1358,33 @@ CommandInterpreter::executeClusterLog(char* parameters) } do { - severity= NDB_MGM_ILLEGAL_CLUSTERLOG_LEVEL; + severity= NDB_MGM_ILLEGAL_EVENT_SEVERITY; if (strcasecmp(item, "ALL") == 0) { - severity = NDB_MGM_CLUSTERLOG_ALL; + severity = NDB_MGM_EVENT_SEVERITY_ALL; } else if (strcasecmp(item, "ALERT") == 0) { - severity = NDB_MGM_CLUSTERLOG_ALERT; + severity = NDB_MGM_EVENT_SEVERITY_ALERT; } else if (strcasecmp(item, "CRITICAL") == 0) { - severity = NDB_MGM_CLUSTERLOG_CRITICAL; + severity = NDB_MGM_EVENT_SEVERITY_CRITICAL; } else if (strcasecmp(item, "ERROR") == 0) { - severity = NDB_MGM_CLUSTERLOG_ERROR; + severity = NDB_MGM_EVENT_SEVERITY_ERROR; } else if (strcasecmp(item, "WARNING") == 0) { - severity = NDB_MGM_CLUSTERLOG_WARNING; + severity = NDB_MGM_EVENT_SEVERITY_WARNING; } else if (strcasecmp(item, "INFO") == 0) { - severity = NDB_MGM_CLUSTERLOG_INFO; + severity = NDB_MGM_EVENT_SEVERITY_INFO; } else if (strcasecmp(item, "DEBUG") == 0) { - severity = NDB_MGM_CLUSTERLOG_DEBUG; + severity = NDB_MGM_EVENT_SEVERITY_DEBUG; } else if (strcasecmp(item, "OFF") == 0 || strcasecmp(item, "ON") == 0) { if (enable < 0) // only makes sense with toggle - severity = NDB_MGM_CLUSTERLOG_ON; + severity = NDB_MGM_EVENT_SEVERITY_ON; } - if (severity == NDB_MGM_ILLEGAL_CLUSTERLOG_LEVEL) { + if (severity == NDB_MGM_ILLEGAL_EVENT_SEVERITY) { ndbout << "Invalid severity level: " << item << endl; DBUG_VOID_RETURN; } - res_enable = ndb_mgm_filter_clusterlog(m_mgmsrv, severity, enable, NULL); + res_enable= ndb_mgm_set_clusterlog_severity_filter(m_mgmsrv, severity, + enable, NULL); if (res_enable < 0) { ndbout << "Couldn't set filter" << endl; |