Merge

Author: magnus.blaudd@oracle.com

storage/ndb/src/mgmsrv/Services.cpp

@@ -1727,6 +1727,17 @@ MgmApiSession::listen_event(Parser<MgmApiSession>::Context & ctx,
     m_output->println("msg: %s", msg.c_str());
   m_output->println("%s", "");
 
+  /*
+    Flush output from command before adding the new event listener.
+    This makes sure that the client receives the reply before the
+    loglevel thread starts to check the connection by sending <PING>'s.
+    The client is expecting <PING>'s but not until after the reply has been
+    received.
+  */
+  NdbMutex_Unlock(m_mutex);   
+  m_output->flush();
+  NdbMutex_Lock(m_mutex);   
+
   if(result==0)
   {
     m_mgmsrv.m_event_listner.add_listener(le);

storage/ndb/test/ndbapi/testMgm.cpp

@@ -3572,6 +3572,34 @@ int runTestNdbApiConfig(NDBT_Context* ctx, NDBT_Step* step)
   return NDBT_OK;
 }
 
+
+static
+int runTestCreateLogEvent(NDBT_Context* ctx, NDBT_Step* step)
+{
+  NdbMgmd mgmd;
+  int loops = ctx->getNumLoops();
+
+  if (!mgmd.connect())
+    return NDBT_FAILED;
+
+  int filter[] = {
+    15, NDB_MGM_EVENT_CATEGORY_BACKUP,
+    0
+  };
+
+  for(int l=0; l<loops; l++)
+  {
+    g_info << "Creating log event handle " << l << endl;
+    NdbLogEventHandle le_handle =
+        ndb_mgm_create_logevent_handle(mgmd.handle(), filter);
+    if (!le_handle)
+      return NDBT_FAILED;
+
+    ndb_mgm_destroy_logevent_handle(&le_handle);
+  }
+  return NDBT_OK;
+}
+
 NDBT_TESTSUITE(testMgm);
 DRIVER(DummyDriver); /* turn off use of NdbApi */
 TESTCASE("ApiSessionFailure",
@@ -3726,6 +3754,9 @@ TESTCASE("TestSetPorts",
          "Test 'set ports'"){
   INITIALIZER(runTestSetPorts);
 }
+TESTCASE("TestCreateLogEvent", "Test ndb_mgm_create_log_event_handle"){
+  STEPS(runTestCreateLogEvent, 5);
+}
 NDBT_TESTSUITE_END(testMgm);
 
 int main(int argc, const char** argv){