Add timeout parameter to increase for long time running sql imports

refnode · igalic · commit 4e1bb8f1ce63 · 2014-09-29T17:42:30.000+02:00
Signed-off-by: refnode &lt;refnode@gmail.com&gt;
diff --git a/manifests/db.pp b/manifests/db.pp
@@ -9,7 +9,8 @@
   $grant       = 'ALL',
   $sql         = '',
   $enforce_sql = false,
-  $ensure      = 'present'
+  $ensure      = 'present',
+  $import_timeout = 300,
 ) {
   #input validation
   validate_re($ensure, '^(present|absent)$',
@@ -54,6 +55,7 @@
         refreshonly => $refresh,
         require     => Mysql_grant["${user}@${host}/${table}"],
         subscribe   => Mysql_database[$dbname],
+        timeout     => $import_timeout,
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`$grant = 'ALL',`
`10`	`10`	`$sql = '',`
`11`	`11`	`$enforce_sql = false,`
`12`		`- $ensure = 'present'`
	`12`	`+ $ensure = 'present',`
	`13`	`+ $import_timeout = 300,`
`13`	`14`	`) {`
`14`	`15`	`#input validation`
`15`	`16`	`validate_re($ensure, '^(present\|absent)$',`
`@@ -54,6 +55,7 @@`
`54`	`55`	`refreshonly => $refresh,`
`55`	`56`	`require => Mysql_grant["${user}@${host}/${table}"],`
`56`	`57`	`subscribe => Mysql_database[$dbname],`
	`58`	`+ timeout => $import_timeout,`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`	`}`