Ack. Code review only.
Regards, Vu
> -----Original Message-----
> From: Minh Chau <minh.c...@dektech.com.au>
> Sent: Friday, February 15, 2019 4:52 PM
> To: hans.nordeb...@ericsson.com; gary....@dektech.com.au;
> vu.m.ngu...@dektech.com.au
> Cc: opensaf-devel@lists.sourceforge.net; Minh Chau
> <minh.c...@dektech.com.au>
> Subject: [PATCH 1/1] osaf: Call opensaf_quick_reboot if failed to set
active
> role in consensus [#3001]
>
> ---
> src/fm/fmd/fm_rda.cc | 4 ++--
> src/rde/rded/rde_main.cc | 8 +++-----
> src/rde/rded/role.cc | 8 ++++----
> 3 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/src/fm/fmd/fm_rda.cc b/src/fm/fmd/fm_rda.cc
> index 028bfa3..0aa5a3d 100644
> --- a/src/fm/fmd/fm_rda.cc
> +++ b/src/fm/fmd/fm_rda.cc
> @@ -97,8 +97,8 @@ uint32_t fm_rda_set_role(FM_CB *fm_cb,
> PCS_RDA_ROLE role) {
> rc = consensus_service.PromoteThisNode(true, fm_cb->cluster_size);
> if (rc != SA_AIS_OK && rc != SA_AIS_ERR_EXIST) {
> LOG_ER("Unable to set active controller in consensus service");
> - opensaf_reboot(0, nullptr,
> - "Unable to set active controller in consensus
service");
> + opensaf_quick_reboot("Unable to set active controller"
> + "in consensus service");
> } else if (rc == SA_AIS_ERR_EXIST) {
> // @todo if we don't reboot, we don't seem to recover from this.
Can we
> // improve?
> diff --git a/src/rde/rded/rde_main.cc b/src/rde/rded/rde_main.cc
> index bb17133..3487f0b 100644
> --- a/src/rde/rded/rde_main.cc
> +++ b/src/rde/rded/rde_main.cc
> @@ -203,9 +203,8 @@ static void handle_mbx_event() {
> if (state == Consensus::TakeoverState::ACCEPTED) {
> LOG_NO("Accepted takeover request");
> if (consensus_service.IsRemoteFencingEnabled() == false) {
> - opensaf_reboot(0, nullptr,
> - "Another controller is taking over the active
role. "
> - "Rebooting this node");
> + opensaf_quick_reboot("Another controller is taking over"
> + "the active role. Rebooting this node");
> }
> } else if (state == Consensus::TakeoverState::UNDEFINED) {
> bool fencing_required = true;
> @@ -233,8 +232,7 @@ static void handle_mbx_event() {
> if (fencing_required == true) {
> LOG_NO("Lost connectivity to consensus service");
> if (consensus_service.IsRemoteFencingEnabled() == false) {
> - opensaf_reboot(0, nullptr,
> - "Lost connectivity to consensus service. "
> + opensaf_quick_reboot("Lost connectivity to consensus
service. "
> "Rebooting this node");
> }
> }
> diff --git a/src/rde/rded/role.cc b/src/rde/rded/role.cc
> index 499f7c8..b2b9b49 100644
> --- a/src/rde/rded/role.cc
> +++ b/src/rde/rded/role.cc
> @@ -112,8 +112,8 @@ void Role::PromoteNode(const uint64_t cluster_size,
> promotion_pending = true;
> } else if (rc != SA_AIS_OK) {
> LOG_ER("Unable to set active controller in consensus service");
> - opensaf_reboot(0, nullptr,
> - "Unable to set active controller in consensus
service");
> + opensaf_quick_reboot("Unable to set active controller"
> + "in consensus service");
> }
>
> RDE_CONTROL_BLOCK* cb = rde_get_control_block();
> @@ -133,8 +133,8 @@ void Role::PromoteNode(const uint64_t cluster_size,
> rc = consensus_service.PromoteThisNode(true, cluster_size);
> if (rc == SA_AIS_ERR_EXIST) {
> LOG_ER("Unable to set active controller in consensus service");
> - opensaf_reboot(0, nullptr,
> - "Unable to set active controller in consensus
service");
> + opensaf_quick_reboot("Unable to set active controller in"
> + "consensus service");
> }
> std::this_thread::sleep_for(std::chrono::seconds(1));
> }
> --
> 2.7.4
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
