recompute_online_node_usage: show state on internal error

makes debugging easier, also throw in some code cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index 8dcabcaf0681ae21c1d8079c087aadc917cbf3c4..afbd236ae47cc544868a3ebd0fa6c5408d25cb1a 100644 (file)
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -828,7 +828,6 @@ sub exec_resource_agent {
 
     # process error state early
     if ($cmd eq 'error') {
-
        $haenv->log('err', "service $sid is in an error state and needs manual " .
                    "intervention. Look up 'ERROR RECOVERY' in the documentation.");
 

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index d1bd4775d5587355128f6879850329c4529482dd..1d646b20ae1e269c09f6ba2ca8bc63d2416449af 100644 (file)
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -200,7 +200,7 @@ sub recompute_online_node_usage {
            } elsif ($state eq 'stopped') {
                # do nothing
            } else {
-               die "should not be reached";
+               die "should not be reached (sid = '$sid', state = '$state')";
            }
        }
     }
@@ -297,7 +297,6 @@ sub read_lrm_status {
        }
     }
 
-
     return ($results, $modes);
 }