On Fri, May 10, 2013 at 2:57 PM, Michele Tartara <[email protected]>wrote:
> The Xen instance status data collector will require to get some information > from the hypervisor. This commit introduces a module providing such > funtions. > s/funtions/functions/ > > Signed-off-by: Michele Tartara <[email protected]> > --- > Makefile.am | 1 + > src/Ganeti/Hypervisor/Xen.hs | 89 > ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 90 insertions(+) > create mode 100644 src/Ganeti/Hypervisor/Xen.hs > > diff --git a/Makefile.am b/Makefile.am > index a6fe1f9..1009227 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -548,6 +548,7 @@ HS_LIB_SRCS = \ > src/Ganeti/HTools/Program/Hroller.hs \ > src/Ganeti/HTools/Program/Main.hs \ > src/Ganeti/HTools/Types.hs \ > + src/Ganeti/Hypervisor/Xen.hs \ > src/Ganeti/Hypervisor/Xen/XmParser.hs \ > src/Ganeti/Hypervisor/Xen/Types.hs \ > src/Ganeti/Hash.hs \ > diff --git a/src/Ganeti/Hypervisor/Xen.hs b/src/Ganeti/Hypervisor/Xen.hs > new file mode 100644 > index 0000000..06c928e > --- /dev/null > +++ b/src/Ganeti/Hypervisor/Xen.hs > @@ -0,0 +1,89 @@ > +{-| Module to access the information provided by the Xen hypervisor. > + > +-} > +{- > + > +Copyright (C) 2013 Google Inc. > + > +This program is free software; you can redistribute it and/or modify > +it under the terms of the GNU General Public License as published by > +the Free Software Foundation; either version 2 of the License, or > +(at your option) any later version. > + > +This program is distributed in the hope that it will be useful, but > +WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with this program; if not, write to the Free Software > +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > +02110-1301, USA. > + > +-} > +module Ganeti.Hypervisor.Xen > + ( getDomainsInfo > + , getInferredDomInfo > + , getUptimeInfo > + --Data types to be re-exported from here > + , Domain(..) > + , UptimeInfo(..) > + ) where > + > +import qualified Control.Exception as E > +import Data.Attoparsec.Text as A > +import qualified Data.Map as Map > +import Data.Text (pack) > +import System.Process > + > +import qualified Ganeti.BasicTypes as BT > +import qualified Ganeti.Constants as C > +import Ganeti.Hypervisor.Xen.Types > +import Ganeti.Hypervisor.Xen.XmParser > +import Ganeti.Utils > + > + > +-- | Get information about the current Xen domains as a map where the > domain > +-- name is the key. This only includes the information made available by > Xen > +-- itself. > +getDomainsInfo :: IO (Map.Map String Domain) > +getDomainsInfo = do > + contents <- > + ((E.try $ readProcess C.xenCmdXm ["list", "--long"] "") > Just out of curiosity: AFAIK Ganeti supports xl as well (at least in the Python code), so will this be supported by this data collector as well? > + :: IO (Either IOError String)) >>= > + exitIfBad "running command" . either (BT.Bad . show) BT.Ok > + case A.parseOnly xmListParser $ pack contents of > + Left msg -> exitErr msg > + Right dom -> return dom > + > +-- | Given a domain and a map containing information about multiple > domains, > +-- infer additional information about that domain (specifically, whether > it is > +-- hung). > +inferDomInfos :: Map.Map String Domain -> Domain -> Domain > +inferDomInfos domMap dom1 = > + case Map.lookup (domName dom1) domMap of > + Just dom2 -> > + dom1 { domIsHung = Just $ domCpuTime dom1 == domCpuTime dom2 } > + Nothing -> dom1 { domIsHung = Nothing } > + > +-- | Get information about the current Xen domains as a map where the > domain > +-- name is the key. This includes information made available by Xen > itself as > +-- well as further information that can be inferred by querying Xen > multiple > +-- times and comparing the results. > +getInferredDomInfo :: IO (Map.Map String Domain) > +getInferredDomInfo = do > + domMap1 <- getDomainsInfo > + domMap2 <- getDomainsInfo > + return $ fmap (inferDomInfos domMap2) domMap1 > + > +-- | Get information about the uptime of domains, as a map where the > domain ID > +-- is the key. > +getUptimeInfo :: IO (Map.Map Int UptimeInfo) > +getUptimeInfo = do > + contents <- > + ((E.try $ readProcess C.xenCmdXm ["uptime"] "") > + :: IO (Either IOError String)) >>= > + exitIfBad "running command" . either (BT.Bad . show) BT.Ok > + case A.parseOnly xmUptimeParser $ pack contents of > + Left msg -> exitErr msg > + Right uInfo -> return uInfo > -- > 1.8.2.1 > > Thanks, Thomas -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Katherine Stephens
