Hi Hans,
Thanks for the review. Earlier I had in mind that middleware and
node/appl su lock should go together, but they can be left as well.
The below change will be committed today.
+ /* Allow admin operations on middleware SUs, if
saAmfSUMaintenanceCampaign is set for the SUs.*/
+ if (su->sg_of_su->sg_ncs_spec == true) {
+ if (su->saAmfSUMaintenanceCampaign.length == 0) {
+ LOG_ER("saAmfSUMaintenanceCampaign not set for %s,
rejecting operation",
+ su->name.value);
+ rc = SA_AIS_ERR_BAD_OPERATION;
+ goto done;
+ }
+ }
+
Thanks
-Nagu
-----Original Message-----
From: Hans Feldt [mailto:[email protected]]
Sent: 01 October 2013 12:50
To: Nagendra Kumar
Cc: Mathivanan Naickan Palanivelu; [email protected]; Praveen
Malviya; [email protected]
Subject: Re: [devel] [PATCH 1 of 1] Amfd: Allow admin operation on middleware
only when originated from SMF [#477]
I don't understand why you are not just checking saAmfSUMaintenanceCampaign for
the SU in question?
The reason for bringing in all this code is not commented/described.
Basically why not just:
if (su_ptr->saAmfSUMaintenanceCampaign.length == 0) {
+ LOG_ER("saAmfSUMaintenanceCampaign not
set for %s, rejecting operation",
+ su_ptr->name.value);
+ rc = SA_AIS_ERR_BAD_OPERATION;
+ goto done;
+ }
Thanks,
Hans
On 9 September 2013 13:56, <[email protected]> wrote:
> osaf/services/saf/amf/amfd/avd_su.cc | 27
> +++++++++++++++++++++++++++
> 1 files changed, 27 insertions(+), 0 deletions(-)
>
>
> diff --git a/osaf/services/saf/amf/amfd/avd_su.cc
> b/osaf/services/saf/amf/amfd/avd_su.cc
> --- a/osaf/services/saf/amf/amfd/avd_su.cc
> +++ b/osaf/services/saf/amf/amfd/avd_su.cc
> @@ -953,6 +953,33 @@ static void su_admin_op_cb(SaImmOiHandle
> goto done;
> }
>
> + /* Allow admin operations on middleware sus, if
> saAmfSUMaintenanceCampaign is set on
> + any SU hosted on the same node.*/
> + if (su->sg_of_su->sg_ncs_spec == true) {
> + for (su_ptr = node->list_of_su; su_ptr != NULL; su_ptr =
> su_ptr->avnd_list_su_next) {
> + if (su_ptr->saAmfSUMaintenanceCampaign.length == 0) {
> + LOG_ER("saAmfSUMaintenanceCampaign not set
> for %s, rejecting operation",
> + su_ptr->name.value);
> + rc = SA_AIS_ERR_BAD_OPERATION;
> + goto done;
> + } else {
> + sumaintenance_set = true;
> + break;
> + }
> + }
> + for (su_ptr = node->list_of_ncs_su; (su_ptr != NULL) &&
> (!sumaintenance_set);
> + su_ptr = su_ptr->avnd_list_su_next) {
> + if (su_ptr->saAmfSUMaintenanceCampaign.length == 0) {
> + LOG_ER("saAmfSUMaintenanceCampaign not set
> for %s, rejecting operation",
> + su_ptr->name.value);
> + rc = SA_AIS_ERR_BAD_OPERATION;
> + goto done;
> + } else {
> + break;
> + }
> + }
> + }
> +
> /* Validation has passed and admin operation should be done. Proceed
> with it... */
> switch (op_id) {
> case SA_AMF_ADMIN_UNLOCK:
>
> ----------------------------------------------------------------------
> -------- Learn the latest--Visual Studio 2012, SharePoint 2013, SQL
> 2012, more!
> Discover the easy way to master current and previous Microsoft
> technologies and advance your career. Get an incredible 1,500+ hours
> of step-by-step tutorial videos with LearnDevNow. Subscribe today and save!
> http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.c
> lktrk _______________________________________________
> Opensaf-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
