From 9c11715b66fe1c7b4ebc2ca1e813b95931fbbc80 Mon Sep 17 00:00:00 2001
From: Rory Browne <rory.browne@multiplay.co.uk>
Date: Wed, 19 Oct 2016 14:01:43 +0100
Subject: [PATCH] Readd shard_writer_timeout

 - Re-add the shard_writer_timeout which seems to have been removed
   inadvertently.
 - TEST:
   - Successfully started up vagrant instance.
   - Compared generated influx config with version from multiplay fork
     before merging with upstream.
---
 manifests/params.pp        | 1 +
 manifests/server.pp        | 1 +
 manifests/server/config.pp | 1 +
 3 files changed, 3 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 9a39abb..46c86ea 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -50,6 +50,7 @@ class influxdb::params {
   $hinted_handoff_retry_max_interval            = '1m'
   $hinted_handoff_purge_interval                = '1h'
 
+  $shard_writer_timeout                         = '5s'
   $cluster_write_timeout                        = '10s'
   $max_concurrent_queries                       = undef
   $query_timeout                                = undef
diff --git a/manifests/server.pp b/manifests/server.pp
index d3fb883..dfe996c 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -51,6 +51,7 @@ class influxdb::server (
   $hinted_handoff_retry_max_interval            = $influxdb::params::hinted_handoff_retry_max_interval,
   $hinted_handoff_purge_interval                = $influxdb::params::hinted_handoff_purge_interval,
 
+  $shard_writer_timeout                         = $influxdb::params::shard_writer_timeout,
   $cluster_write_timeout                        = $influxdb::params::cluster_write_timeout,
   $max_concurrent_queries                       = $influxdb::params::max_concurrent_queries,
   $query_timeout                                = $influxdb::params::query_timeout,
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index 7092460..a3295ee 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -54,6 +54,7 @@ class influxdb::server::config {
   $hinted_handoff_retry_max_interval            = $influxdb::server::hinted_handoff_retry_max_interval
   $hinted_handoff_purge_interval                = $influxdb::server::hinted_handoff_purge_interval
 
+  $shard_writer_timeout                         = $influxdb::server::shard_writer_timeout
   $cluster_write_timeout                        = $influxdb::server::cluster_write_timeout
   $max_concurrent_queries                       = $influxdb::server::max_concurrent_queries
   $query_timeout                                = $influxdb::server::query_timeout