Commit 9f10e20f authored by unknown's avatar unknown

[PATCH] WL#3704 mgmapi timeouts: use NdbMgmHandle write_timeout

Start using the write_timeout we already have in NdbMgmHandle

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================


storage/ndb/src/mgmapi/mgmapi.cpp:
  WL#3704 mgmapi timeouts: use NdbMgmHandle write_timeout
parent 582b0ba8
...@@ -323,7 +323,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply, ...@@ -323,7 +323,7 @@ ndb_mgm_call(NdbMgmHandle handle, const ParserRow<ParserDummy> *command_reply,
DBUG_ENTER("ndb_mgm_call"); DBUG_ENTER("ndb_mgm_call");
DBUG_PRINT("enter",("handle->socket: %d, cmd: %s", DBUG_PRINT("enter",("handle->socket: %d, cmd: %s",
handle->socket, cmd)); handle->socket, cmd));
SocketOutputStream out(handle->socket); SocketOutputStream out(handle->socket, handle->write_timeout);
SocketInputStream in(handle->socket, handle->read_timeout); SocketInputStream in(handle->socket, handle->read_timeout);
out.println(cmd); out.println(cmd);
...@@ -771,7 +771,7 @@ ndb_mgm_get_status(NdbMgmHandle handle) ...@@ -771,7 +771,7 @@ ndb_mgm_get_status(NdbMgmHandle handle)
CHECK_HANDLE(handle, NULL); CHECK_HANDLE(handle, NULL);
CHECK_CONNECTED(handle, NULL); CHECK_CONNECTED(handle, NULL);
SocketOutputStream out(handle->socket); SocketOutputStream out(handle->socket, handle->write_timeout);
SocketInputStream in(handle->socket, handle->read_timeout); SocketInputStream in(handle->socket, handle->read_timeout);
out.println("get status"); out.println("get status");
...@@ -2405,7 +2405,7 @@ int ...@@ -2405,7 +2405,7 @@ int
ndb_mgm_check_connection(NdbMgmHandle handle){ ndb_mgm_check_connection(NdbMgmHandle handle){
CHECK_HANDLE(handle, 0); CHECK_HANDLE(handle, 0);
CHECK_CONNECTED(handle, 0); CHECK_CONNECTED(handle, 0);
SocketOutputStream out(handle->socket); SocketOutputStream out(handle->socket, handle->write_timeout);
SocketInputStream in(handle->socket, handle->read_timeout); SocketInputStream in(handle->socket, handle->read_timeout);
char buf[32]; char buf[32];
if (out.println("check connection")) if (out.println("check connection"))
...@@ -2535,7 +2535,7 @@ ndb_mgm_convert_to_transporter(NdbMgmHandle *handle) ...@@ -2535,7 +2535,7 @@ ndb_mgm_convert_to_transporter(NdbMgmHandle *handle)
(*handle)->connected= 0; // we pretend we're disconnected (*handle)->connected= 0; // we pretend we're disconnected
s= (*handle)->socket; s= (*handle)->socket;
SocketOutputStream s_output(s); SocketOutputStream s_output(s, (*handle)->write_timeout);
s_output.println("transporter connect"); s_output.println("transporter connect");
s_output.println(""); s_output.println("");
...@@ -2611,7 +2611,7 @@ int ndb_mgm_end_session(NdbMgmHandle handle) ...@@ -2611,7 +2611,7 @@ int ndb_mgm_end_session(NdbMgmHandle handle)
CHECK_CONNECTED(handle, 0); CHECK_CONNECTED(handle, 0);
DBUG_ENTER("ndb_mgm_end_session"); DBUG_ENTER("ndb_mgm_end_session");
SocketOutputStream s_output(handle->socket); SocketOutputStream s_output(handle->socket, handle->write_timeout);
s_output.println("end session"); s_output.println("end session");
s_output.println(""); s_output.println("");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment