5087 libpq pool leak (hasura#5089)

Shrink libpq buffers to 1MB before returning connection to pool. Closes hasura#5087 See: hasura/pg-client-hs#19 Also related: hasura#3388 hasura#4077
lexi-lambda · Jul 28, 2020 · e88668a · e88668a
1 parent 28ff27d
commit e88668a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/server/cabal.project b/server/cabal.project
@@ -43,7 +43,7 @@ package graphql-engine
 source-repository-package
   type: git
   location: https://github.com/hasura/pg-client-hs.git
-  tag: 70a849d09bea9461e72c5a5bbde06df65aab61c0
+  tag: cbfc69b935d19dc40be8cdcc73a70b81cf511d34
 
 source-repository-package
   type: git

diff --git a/server/graphql-engine.cabal b/server/graphql-engine.cabal
@@ -71,13 +71,6 @@ common common-all
     TypeFamilyDependencies
     TypeOperators
 
-    -- ApplicativeDo BangPatterns BlockArguments ConstraintKinds DataKinds DefaultSignatures DeriveDataTypeable
-    -- DeriveFoldable DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable DerivingVia EmptyCase
-    -- FlexibleContexts FlexibleInstances FunctionalDependencies GeneralizedNewtypeDeriving
-    -- InstanceSigs LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude
-    -- OverloadedStrings QuantifiedConstraints QuasiQuotes RankNTypes RecordWildCards ScopedTypeVariables
-    -- StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeOperators
-
 common common-exe
   ghc-options:
     -threaded -rtsopts

diff --git a/server/src-lib/Hasura/Server/Init.hs b/server/src-lib/Hasura/Server/Init.hs
@@ -183,8 +183,7 @@ mkServeOptions rso = do
       iTime <- fromMaybe 180 <$> withEnv i (fst pgTimeoutEnv)
       connLifetime <- withEnv cl (fst pgConnLifetimeEnv)
       allowPrepare <- fromMaybe True <$> withEnv p (fst pgUsePrepareEnv)
-      -- The connLifetime is being used by the new pg-client-hs, uncomment it below
-      return $ Q.ConnParams stripes conns iTime allowPrepare --connLifetime
+      return $ Q.ConnParams stripes conns iTime allowPrepare connLifetime
 
     mkAuthHook (AuthHookG mUrl mType) = do
       mUrlEnv <- withEnv mUrl $ fst authHookEnv