From 7847a037e74df6735aae8335d5d152580039d51c Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 21 Mar 2009 23:48:49 +0100
Subject: [PATCH] Some small changes in preparation for hscan
This patch does some small changes:
- fixes a comment
- export more node functions (unneeded now, but hscan will use them)
- fixes Makefile rule for building the programs
---
Ganeti/HTools/Cluster.hs | 2 +-
Ganeti/HTools/Node.hs | 4 ++--
Makefile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Ganeti/HTools/Cluster.hs b/Ganeti/HTools/Cluster.hs
index 788288ead..93a5ce506 100644
--- a/Ganeti/HTools/Cluster.hs
+++ b/Ganeti/HTools/Cluster.hs
@@ -754,7 +754,7 @@ loadData ndata idata =
(ktn, nl) = loadTabular ndata
(\ (i:jt:jf:kt:kf:[]) -> (i, Node.create jt jf kt kf))
Node.setIdx
- {- instance file: name mem disk -}
+ {- instance file: name mem disk pnode snode -}
(kti, il) = loadTabular idata
(\ (i:j:k:l:m:[]) -> (i,
Instance.create j k
diff --git a/Ganeti/HTools/Node.hs b/Ganeti/HTools/Node.hs
index 03bff7882..e667ce31a 100644
--- a/Ganeti/HTools/Node.hs
+++ b/Ganeti/HTools/Node.hs
@@ -6,8 +6,8 @@
module Ganeti.HTools.Node
(
- Node(failN1, idx, f_mem, f_dsk, p_mem, p_dsk, slist, plist,
- p_rem, offline)
+ Node(failN1, idx, t_mem, f_mem, t_dsk, f_dsk, p_mem, p_dsk, p_rem,
+ plist, slist, offline)
-- * Constructor
, create
-- ** Finalization after data loading
diff --git a/Makefile b/Makefile
index 67096d463..ca410585c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ DOCS = README.html NEWS.html
all: $(HPROGS)
-hn1 hbal: % : %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
+$(HPROGS): %: %.hs Ganeti/HTools/Version.hs $(HSRCS) Makefile
ghc --make -O2 -W $@
$(DOCS) : %.html : %
--
GitLab