On Tue, Jun 16, 2015 at 11:31:25AM +0200, 'Klaus Aehlig' via ganeti-devel wrote:
If a cluster allows sharedfile as only disk template, the amount of
total and free disk space might not be available. This is perfectly
normal, hence make the luxi backend handle it gracefully and just report
0 available disk on 0 total disk.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/HTools/Backend/Luxi.hs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Ganeti/HTools/Backend/Luxi.hs
b/src/Ganeti/HTools/Backend/Luxi.hs
index 58867e1..5a3cb1d 100644
--- a/src/Ganeti/HTools/Backend/Luxi.hs
+++ b/src/Ganeti/HTools/Backend/Luxi.hs
@@ -241,8 +241,12 @@ parseNode ktg [ name, mtotal, mnode, mfree, dtotal, dfree
xmtotal <- lvconvert 0.0 "mtotal" mtotal
xmnode <- lvconvert 0 "mnode" mnode
xmfree <- lvconvert 0 "mfree" mfree
- xdtotal <- lvconvert 0.0 "dtotal" dtotal
- xdfree <- lvconvert 0 "dfree" dfree
+ let xdtotal = genericResult (const 0.0) id
+ $ lvconvert 0.0 "dtotal" dtotal
+ xdfree = genericResult (const 0) id
+ $ lvconvert 0 "dfree" dfree
+ -- "dtotal" and "dfree" might be missing, e.g., if sharedfile
+ -- is the only supported disk template
xctotal <- lvconvert 0.0 "ctotal" ctotal
xcnos <- lvconvert 0 "cnos" cnos
let node = flip Node.setCpuSpeed xcpu_speed .
--
2.2.0.rc0.207.ga3a616c
LGTM, thanks
