Re: [PATCH stable-2.10 2/2] MonD: force computation of state in stateful collectors

['Petr Pudlak' via ganeti-devel]

On Tue, Mar 03, 2015 at 05:34:17PM +0100, Klaus Aehlig wrote:

    Interdiff

Sorry, of course I meant

commit 0492501221504199bb7c613398a88218491ebf6b
Author: Klaus Aehlig <aeh...@google.com>
Date:   Tue Mar 3 17:30:59 2015 +0100

   Interdiff

diff --git a/src/Ganeti/Monitoring/Server.hs b/src/Ganeti/Monitoring/Server.hs
index def1e72..05ff189 100644
--- a/src/Ganeti/Monitoring/Server.hs
+++ b/src/Ganeti/Monitoring/Server.hs
@@ -42,6 +42,7 @@ module Ganeti.Monitoring.Server

import Control.Applicative
import Control.DeepSeq (force)
+import Control.Exception.Base (evaluate)
import Control.Monad
import Control.Monad.IO.Class
import Data.ByteString.Char8 hiding (map, filter, find)
@@ -252,7 +253,8 @@ collect m collector =
      let name = dName collector
          existing = Map.lookup name m
      new_data <- update existing
-      return $ Map.insert name (force new_data) m
+      _ <- evaluate $ force new_data
+      return $ Map.insert name new_data m

-- | Invokes collect for each data collector.
collection :: CollectorMap -> IO CollectorMap


--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores

LGTM with the interdiff, thanks