Merge pull request #993 from seagate-ssg/dev/halon-457

[HALON-457] Implement new job interface.

cep/cep/src/Network/CEP.hs

@@ -38,6 +38,7 @@ module Network.CEP
     , start
     , start_
     , startFork
+    , startForks
     , get
     , gets
     , put

cep/cep/src/Network/CEP/Types.hs

@@ -453,20 +453,25 @@ start h l = singleton $ Start h l
 start_ :: Jump PhaseHandle -> RuleM g () (Started g ())
 start_ h = start h ()
 
--- | Start a rule with an implicit fork
+-- | Start a rule with an implicit fork.
 startFork :: Jump PhaseHandle -> l -> RuleM g l (Started g l)
-startFork rule state = do
+startFork rule = startForks [rule]
+
+-- | Start a rule with an implicit fork. Rule may started from
+-- different phases.
+startForks :: [Jump PhaseHandle] -> l -> RuleM g l (Started g l)
+startForks rules state = do
     winit <- initWrapper
     start winit state
   where
     initWrapper = do
       wrapper_init <- phaseHandle "wrapper_init"
       wrapper_clear <- phaseHandle "wrapper_clear"
       wrapper_end <- phaseHandle "wrapper_end"
-      directly wrapper_init $ Network.CEP.Types.switch [rule, wrapper_clear]
+      directly wrapper_init $ Network.CEP.Types.switch (rules ++ [wrapper_clear])
 
       directly wrapper_clear $ do
-        fork NoBuffer $ continue rule
+        fork NoBuffer $ Network.CEP.Types.switch rules
         continue wrapper_end
 
       directly wrapper_end stop

mero-halon/mero-halon.cabal

@@ -97,7 +97,8 @@ Library
                    HA.RecoveryCoordinator.Actions.Hardware
                    HA.RecoveryCoordinator.Actions.Service
                    HA.RecoveryCoordinator.Actions.Test
-                   HA.RecoveryCoordinator.Actions.Job
+                   HA.RecoveryCoordinator.Job.Actions
+                   HA.RecoveryCoordinator.Job.Events
                    HA.RecoveryCoordinator.Rules.Castor
                    HA.RecoveryCoordinator.Rules.Debug
                    HA.RecoveryCoordinator.Rules.Service
@@ -124,6 +125,7 @@ Library
                    HA.Services.SSPL.HL.StatusHandler
                    HA.Services.SSPL.HL.CEP
                    HA.Services.SSPL.LL.RC.Actions
+                   HA.RecoveryCoordinator.Job.Internal
 
   Build-Depends:   base,
                    aeson,

mero-halon/src/lib/HA/RecoveryCoordinator/Actions/Core.hs

@@ -25,9 +25,15 @@ module HA.RecoveryCoordinator.Actions.Core
   , putStorageRC
   , getStorageRC
   , deleteStorageRC
+    -- ** Helpers for Set
   , insertStorageSetRC
   , memberStorageSetRC
   , deleteStorageSetRC
+    -- ** Helpers for Map
+  , insertWithStorageMapRC
+  , memberStorageMapRC
+  , deleteStorageMapRC
+  , lookupStorageMapRC
     -- * Communication with the EQ
   , messageProcessed
   , mkMessageProcessed
@@ -86,14 +92,15 @@ import Control.Distributed.Process
   , spawnLocal
   , link
   )
-import Control.Monad (when, unless)
+import Control.Monad (when, unless, (<=<))
 import Control.Distributed.Process.Serializable
 
 import Data.Typeable (Typeable)
 import Data.Functor (void)
 import Data.Proxy
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
+import           Data.Maybe (fromMaybe)
 
 import Network.CEP
 
@@ -135,6 +142,32 @@ deleteStorageSetRC x = modify Global $ \g -> do
     Nothing -> g
     Just z  -> g{lsStorage = Storage.put (Set.delete x z)  $ lsStorage g}
 
+-- | Helper that wraps. 'Data.Map.member' for map kept in Storage.
+memberStorageMapRC :: forall proxy k v l . (Typeable k, Typeable v, Ord k)
+                   => proxy v -> k -> PhaseM LoopState l Bool
+memberStorageMapRC _ x =
+  maybe False (\m -> Map.member x (m :: Map.Map k v))
+    . Storage.get . lsStorage <$> get Global
+
+insertWithStorageMapRC :: (Typeable k, Typeable v, Ord k)
+                       => (v -> v -> v) -> k -> v -> PhaseM LoopState l ()
+insertWithStorageMapRC f k v = modify Global $ \g -> do
+  let z = fromMaybe Map.empty $ Storage.get (lsStorage g)
+  g{lsStorage = Storage.put (Map.insertWith f k v z) $ lsStorage g}
+
+deleteStorageMapRC :: forall proxy k v l . (Typeable k, Typeable v, Ord k)
+                   => proxy v -> k -> PhaseM LoopState l ()
+deleteStorageMapRC _ x = modify Global $ \g -> do
+  case Storage.get (lsStorage g) of
+    Nothing -> g
+    Just (z::Map.Map k v) -> g{lsStorage = Storage.put (Map.delete x z)  $ lsStorage g}
+
+lookupStorageMapRC :: forall proxy k v l . (Typeable k, Typeable v, Ord k)
+                   => k -> PhaseM LoopState l (Maybe v)
+lookupStorageMapRC x =
+  ((\m -> Map.lookup x (m :: Map.Map k v))
+    <=< Storage.get . lsStorage) <$> get Global
+
 -- | Is a given resource existent in the RG?
 knownResource :: G.Resource a => a -> PhaseM LoopState l Bool
 knownResource res = fmap (G.memberResource res) getLocalGraph

mero-halon/src/lib/HA/RecoveryCoordinator/CEP.hs

@@ -43,7 +43,7 @@ import           HA.RecoveryCoordinator.Events.Cluster
 import           HA.RecoveryCoordinator.Rules.Castor
 import qualified HA.RecoveryCoordinator.Rules.Service
 import qualified HA.RecoveryCoordinator.Rules.Debug as Debug (rules)
-import           HA.RecoveryCoordinator.Actions.Job
+import           HA.RecoveryCoordinator.Job.Actions
 import qualified HA.ResourceGraph as G
 import           HA.Resources
 import           HA.Resources.Castor