scripts/opensaf_reboot |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Hard resetting the active controller causes the standby controller to attempt
to restart the (now reset) active controller's EE. This times out after 10 s,
which holds up role switch over.

The call to immlist to get the admin state of the EE in opensaf_reboot is
actually returning "<Empty>" in this case.

Since PLM restart will not restart an EE that is not in instantiated state, add
a check for this. In this case "<Empty>" is returned and the
opensaf_reboot_with_plm function is not called, which allows the switchover
to proceed immediately.

diff --git a/scripts/opensaf_reboot b/scripts/opensaf_reboot
--- a/scripts/opensaf_reboot
+++ b/scripts/opensaf_reboot
@@ -87,8 +87,11 @@ if [ "$self_node_id" = "$node_id" ] || [
        $icmd /sbin/reboot -f
 else
        if [ ":$ee_name" != ":" ]; then
+               plm_node_presence_state=`immlist $ee_name |grep 
saPlmEEPresenceState|awk '{print $3}'`
                plm_node_state=`immlist $ee_name |grep saPlmEEAdminState|awk 
'{print $3}'` 
-               if [ $plm_node_state != 2 ]; then
+               if [ "$plm_node_presence_state" != 3 ] ; then
+                       logger -t "opensaf_reboot" "Not rebooting remote node 
$ee_name as it is not in INSTANTIATED state"
+               elif [ $plm_node_state != 2 ]; then
                        opensaf_reboot_with_plm
                else    
                        logger -t "opensaf_reboot" "Not rebooting remote node 
$ee_name as it is already in locked state"


------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to