Merge pull request #5504 from spjmurray/fix/influxdb_timeouts_5460_5469

Fix TLS Race Connecting to InfluxDB
Icinga · Aug 17, 2017 · cb94b21 · cb94b21
2 parents f75fb89 + abc3652
commit cb94b21
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/doc/09-object-types.md b/doc/09-object-types.md
@@ -926,7 +926,6 @@ Configuration Attributes:
   enable_send_metadata   | **Optional.** Whether to send check metadata e.g. states, execution time, latency etc.
   flush_interval         | **Optional.** How long to buffer data points before transfering to InfluxDB. Defaults to `10s`.
   flush_threshold        | **Optional.** How many data points to buffer before forcing a transfer to InfluxDB.  Defaults to `1024`.
-  socket_timeout         | **Optional.** How long to wait for InfluxDB to respond.  Defaults to `5s`.
 
 Note: If `flush_threshold` is set too low, this will always force the feature to flush all data
 to InfluxDB. Experiment with the setting, if you are processing more than 1024 metrics per second

diff --git a/lib/perfdata/influxdbwriter.cpp b/lib/perfdata/influxdbwriter.cpp
@@ -134,9 +134,9 @@ void InfluxdbWriter::ExceptionHandler(boost::exception_ptr exp)
 	//TODO: Close the connection, if we keep it open.
 }
 
-Stream::Ptr InfluxdbWriter::Connect(TcpSocket::Ptr& socket)
+Stream::Ptr InfluxdbWriter::Connect()
 {
-	socket = new TcpSocket();
+	TcpSocket::Ptr socket = new TcpSocket();
 
 	Log(LogNotice, "InfluxdbWriter")
 	    << "Reconnecting to InfluxDB on host '" << GetHost() << "' port '" << GetPort() << "'.";
@@ -423,8 +423,7 @@ void InfluxdbWriter::Flush(void)
 	String body = boost::algorithm::join(m_DataBuffer, "\n");
 	m_DataBuffer.clear();
 
-	TcpSocket::Ptr socket;
-	Stream::Ptr stream = Connect(socket);
+	Stream::Ptr stream = Connect();
 
 	if (!stream)
 		return;
@@ -462,14 +461,6 @@ void InfluxdbWriter::Flush(void)
 	HttpResponse resp(stream, req);
 	StreamReadContext context;
 
-	struct timeval timeout = { GetSocketTimeout(), 0 };
-
-	if (!socket->Poll(true, false, &timeout)) {
-		Log(LogWarning, "InfluxdbWriter")
-		    << "Response timeout of TCP socket from host '" << GetHost() << "' port '" << GetPort() << "'.";
-		return;
-	}
-
 	try {
 		resp.Parse(context, true);
 	} catch (const std::exception& ex) {

diff --git a/lib/perfdata/influxdbwriter.hpp b/lib/perfdata/influxdbwriter.hpp
@@ -74,7 +74,7 @@ class InfluxdbWriter : public ObjectImpl<InfluxdbWriter>
 	static String EscapeKey(const String& str);
 	static String EscapeField(const String& str);
 
-	Stream::Ptr Connect(TcpSocket::Ptr& socket);
+	Stream::Ptr Connect();
 
 	void AssertOnWorkQueue(void);
 

diff --git a/lib/perfdata/influxdbwriter.ti b/lib/perfdata/influxdbwriter.ti
@@ -90,9 +90,6 @@ class InfluxdbWriter : ConfigObject
 	[config] int flush_threshold {
 		default {{{ return 1024; }}}
 	};
-	[config] int socket_timeout {
-		default {{{ return 5; }}}
-	};
 };
 
 validator InfluxdbWriter {