From: <mat...@or...> - 2014-05-06 11:38:52
|
Summary: log: saflogger to return EXIT_FAILURE when SaLogWriteLogCallbackT reports error [#884] Review request for Trac Ticket(s): #884 Peer Reviewer(s): len...@er... Pull request to: <<LIST THE PERSON WITH PUSH ACCESS HERE>> Affected branch(es): opensaf-4.3.x, 4.4.x, default Development branch: <<IF ANY GIVE THE REPO URL>> -------------------------------- Impacted area Impact y/n -------------------------------- Docs n Build system n RPM/packaging n Configuration files n Startup scripts n SAF services y OpenSAF services n Core libraries n Samples n Tests n Other n Comments (indicate scope for each "y" above): --------------------------------------------- changeset 0be0d1a15dcce989b9db4a80a926e989a8ca3114 Author: Mathivanan N.P.<mat...@or...> Date: Tue, 06 May 2014 16:42:04 -0400 log: saflogger to return EXIT_FAILURE when SaLogWriteLogCallbackT reports error [#884] saflogger is not returning appropriate exit code to the shell when SaLogWriteLogCallbackT returns error. The patch exits with EXIT_FAILURE when the SaLogWriteLogCallbackT returns error Complete diffstat: ------------------ osaf/tools/saflog/saflogger/saf_logger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Testing Commands: ----------------- Load LOG server such that it returns TRY_AGAIN for writes continously. Run saflogger to write to an application stream. Testing, Expected Results: -------------------------- Load LOG server such that it returns TRY_AGAIN for writes continously. After trying for ten seconds, when the saflogger exits with TRY_AGAIN error. The shell exit code should be 1 for failure cases. Conditions of Submission: ------------------------- Ack from Lennart. Arch Built Started Linux distro ------------------------------------------- mips n n mips64 n n x86 n n x86_64 y y 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 ~/.hgrc file (i.e. username, 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. |
From: <mat...@or...> - 2014-05-06 11:38:53
|
osaf/tools/saflog/saflogger/saf_logger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) saflogger is not returning appropriate exit code to the shell when SaLogWriteLogCallbackT returns error. The patch exits with EXIT_FAILURE when the SaLogWriteLogCallbackT returns error diff --git a/osaf/tools/saflog/saflogger/saf_logger.c b/osaf/tools/saflog/saflogger/saf_logger.c --- a/osaf/tools/saflog/saflogger/saf_logger.c +++ b/osaf/tools/saflog/saflogger/saf_logger.c @@ -194,7 +194,7 @@ poll_retry: if (wait_time) fprintf(stderr, "Waited for %u seconds.\n", wait_time/1000000); fprintf(stderr, "logWriteLogCallbackT FAILED: %s\n", saf_error(cb_error)); - return errorCode; + return cb_error; } return errorCode; |
From: Lennart L. <len...@er...> - 2014-05-06 11:58:47
|
Hi This seems Ok but there is one more problem in the same area that should be fixed as well. if (cb_invocation != invocation) { fprintf(stderr, "logWriteLogCallbackT FAILED: wrong invocation\n"); return errorCode; } Should be changed to: if (cb_invocation != invocation) { fprintf(stderr, "logWriteLogCallbackT FAILED: wrong invocation\n"); return SA_AIS_ERR_BAD_OPERATION; } It's not relevant to return errorCode here. Also, there is a simililar function, saflogtest.c, used for test that also should be fixed in the same way Thanks Lennart > -----Original Message----- > From: mat...@or... [mailto:mat...@or...] > Sent: den 6 maj 2014 23:08 > To: Lennart Lund > Cc: ope...@li... > Subject: [PATCH 1 of 1] log: saflogger to return EXIT_FAILURE when > SaLogWriteLogCallbackT reports error [#884] > > osaf/tools/saflog/saflogger/saf_logger.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > > saflogger is not returning appropriate exit code to the shell when > SaLogWriteLogCallbackT returns error. > The patch exits with EXIT_FAILURE when the SaLogWriteLogCallbackT returns > error > > diff --git a/osaf/tools/saflog/saflogger/saf_logger.c > b/osaf/tools/saflog/saflogger/saf_logger.c > --- a/osaf/tools/saflog/saflogger/saf_logger.c > +++ b/osaf/tools/saflog/saflogger/saf_logger.c > @@ -194,7 +194,7 @@ poll_retry: > if (wait_time) > fprintf(stderr, "Waited for %u seconds.\n", > wait_time/1000000); > fprintf(stderr, "logWriteLogCallbackT FAILED: %s\n", > saf_error(cb_error)); > - return errorCode; > + return cb_error; > } > > return errorCode; |