[devel] [PATCH 0/1] Review Request for imm: fix coredump on immnd during upgrade [#3030]

2019-04-17 Thread Vu Minh Nguyen 
Summary: imm: fix coredump on immnd during upgrade [#3030]
Review request for Ticket(s): 3030
Peer Reviewer(s): Lennart, Hans, Gary
Pull request to: *** LIST THE PERSON WITH PUSH ACCESS HERE ***
Affected branch(es): develop
Development branch: ticket-3030
Base revision: ecbdd454813cb2e5994143aa202535374d119392
Personal repository: git://git.code.sf.net/u/winhvu/review


Impacted area   Impact y/n

 Docsn
 Build systemn
 RPM/packaging   n
 Configuration files n
 Startup scripts n
 SAF servicesy
 OpenSAF servicesn
 Core libraries  n
 Samples n
 Tests   n
 Other   n


Comments (indicate scope for each "y" above):
-
*** EXPLAIN/COMMENT THE PATCH SERIES HERE ***

revision 7c90172e2fc6ff1700668db98063a9253ec71a0e
Author: Vu Minh Nguyen 
Date:   Wed, 17 Apr 2019 16:09:57 +0700

imm: fix coredump on immnd during upgrade [#3030]

The assertion about the existence of the new added attribute
`saImmFileSystemStatus` should be done if the admOp ID is
either 400 or 401.



Complete diffstat:
--
 src/imm/common/immsv_api.h   | 2 +-
 src/imm/config/immsv_classes.xml | 1 -
 src/imm/immnd/ImmModel.cc| 7 ---
 3 files changed, 5 insertions(+), 5 deletions(-)


Testing Commands:
-
*** LIST THE COMMAND LINE TOOLS/STEPS TO TEST YOUR CHANGES ***


Testing, Expected Results:
--
*** PASTE COMMAND OUTPUTS / TEST RESULTS ***


Conditions of Submission:
-
Ack from peer reviewers


Arch  Built StartedLinux distro
---
mipsn  n
mips64  n  n
x86 n  n
x86_64  n  n
powerpc n  n
powerpc64   n  n


Reviewer Checklist:
---
[Submitters: make sure that your review doesn't trigger any checkmarks!]


Your checkin has not passed review because (see checked entries):

___ Your RR template is generally incomplete; it has too many blank entries
that need proper data filled in.

___ You have failed to nominate the proper persons for review and push.

___ Your patches do not have proper short+long header

___ You have grammar/spelling in your header that is unacceptable.

___ You have exceeded a sensible line length in your headers/comments/text.

___ You have failed to put in a proper Trac Ticket # into your commits.

___ You have incorrectly put/left internal data in your comments/files
(i.e. internal bug tracking tool IDs, product names etc)

___ You have not given any evidence of testing beyond basic build tests.
Demonstrate some level of runtime or other sanity testing.

___ You have ^M present in some of your files. These have to be removed.

___ You have needlessly changed whitespace or added whitespace crimes
like trailing spaces, or spaces before tabs.

___ You have mixed real technical changes with whitespace and other
cosmetic code cleanup changes. These have to be separate commits.

___ You need to refactor your submission into logical chunks; there is
too much content into a single commit.

___ You have extraneous garbage in your review (merge commits etc)

___ You have giant attachments which should never have been sent;
Instead you should place your content in a public tree to be pulled.

___ You have too many commits attached to an e-mail; resend as threaded
commits, or place in a public tree for a pull.

___ You have resent this content multiple times without a clear indication
of what has changed between each re-send.

___ You have failed to adequately and individually address all of the
comments and change requests that were proposed in the initial review.

___ You have a misconfigured ~/.gitconfig file (i.e. user.name, user.email etc)

___ Your computer have a badly configured date and time; confusing the
the threaded patch review.

___ Your changes affect IPC mechanism, and you don't present any results
for in-service upgradability test.

___ Your changes affect user manual and documentation, your patch series
do not contain the patch that updates the Doxygen manual.



___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

[devel] [PATCH 1/1] imm: fix coredump on immnd during upgrade [#3030]

2019-04-17 Thread Vu Minh Nguyen 
The assertion about the existence of the new added attribute
`saImmFileSystemStatus` should be done if the admOp ID is
either 400 or 401.
---
 src/imm/common/immsv_api.h   | 2 +-
 src/imm/config/immsv_classes.xml | 1 -
 src/imm/immnd/ImmModel.cc| 7 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/imm/common/immsv_api.h b/src/imm/common/immsv_api.h
index 3ab3892d1..c37a624ed 100644
--- a/src/imm/common/immsv_api.h
+++ b/src/imm/common/immsv_api.h
@@ -151,7 +151,7 @@ typedef enum {
 #define OPENSAF_IMM_FLAG_PRT50_ALLOW 0x0080
 #define OPENSAF_IMM_FLAG_PRT51_ALLOW 0x0100
 #define OPENSAF_IMM_FLAG_PRT51710_ALLOW 0x0200
-#define OPENSAF_IMM_FLAG_PRT51906_ALLOW 0x0800
+#define OPENSAF_IMM_FLAG_PRT51906_ALLOW 0x0400
 
 #define OPENSAF_IMM_SERVICE_NAME "safImmService"
 
diff --git a/src/imm/config/immsv_classes.xml b/src/imm/config/immsv_classes.xml
index c6f448e82..193ccd2e2 100644
--- a/src/imm/config/immsv_classes.xml
+++ b/src/imm/config/immsv_classes.xml
@@ -50,7 +50,6 @@
saImmFileSystemStatus
SA_UINT32_T
SA_RUNTIME
-   SA_RUNTIME
SA_CACHED


diff --git a/src/imm/immnd/ImmModel.cc b/src/imm/immnd/ImmModel.cc
index 2cf2649cf..1435690c0 100644
--- a/src/imm/immnd/ImmModel.cc
+++ b/src/imm/immnd/ImmModel.cc
@@ -13873,9 +13873,6 @@ SaAisErrorT ImmModel::admoImmMngtObject(const 
ImmsvOmAdminOperationInvoke* req,
   valuep = (ImmAttrValue*)avi->second;
 
   auto fs_attr_iter = immObject->mAttrValueMap.find(saImmFileSystemStatus);
-  osafassert(fs_attr_iter != immObject->mAttrValueMap.end());
-  auto fs_attr_value = fs_attr_iter->second;
-
 
   if (req->operationId == SA_IMM_ADMIN_EXPORT) { /* Standard */
 err = SA_AIS_ERR_NOT_SUPPORTED;
@@ -13900,11 +13897,15 @@ SaAisErrorT ImmModel::admoImmMngtObject(const 
ImmsvOmAdminOperationInvoke* req,
   } else if (req->operationId == SA_IMM_ADMIN_FS_AVAILABLE) {
 LOG_NO("Received: immadm -o %u safRdn=immManagement,safApp=safImmService",
SA_IMM_ADMIN_FS_AVAILABLE);
+osafassert(fs_attr_iter != immObject->mAttrValueMap.end());
+auto fs_attr_value = fs_attr_iter->second;
 sFileSystemAvailable = true;
 fs_attr_value->setValue_int(1);
   } else if (req->operationId == SA_IMM_ADMIN_FS_UNAVAILABLE) {
 LOG_NO("Received: immadm -o %u safRdn=immManagement,safApp=safImmService",
SA_IMM_ADMIN_FS_UNAVAILABLE);
+osafassert(fs_attr_iter != immObject->mAttrValueMap.end());
+auto fs_attr_value = fs_attr_iter->second;
 sFileSystemAvailable = false;
 fs_attr_value->setValue_int(0);
   } else {
-- 
2.19.2



___
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel