I just realized that the symptoms you see could be caused by using a too old "patch" tool. Please try either with a newer version of the "patch" command, or by using Mercurial for applying the patches (e.g. "hg qimport patch_file.diff; hg qpush").
regards, Anders Widell On 03/09/2016 10:39 AM, Anders Widell wrote: > Hi! > > The patches are based on changeset 7290:b4e2c14d222b which was the most > recent changeset on the default branch when the patches were sent out. > If necessary, you may have to go back to that changeset. Alse, please > check that you have applied the RDE patches in the correct order: > > 1) rde: Convert the RDE service to C++ [#79] > 2) rde: Add QUIESCING and QUIESCED roles [#79] > 3) rde: Generalize the role selection algorithm to work with more than > two nodes [#79] > > If you have applied them in the correct order on changeset > 7290:b4e2c14d222b and you still get this problem, the explanation could > be that the patches have been corrupted by the mail system. In such a > case I could send them in e.g. a ZIP file. > > regards, > Anders Widell > > On 03/08/2016 11:17 AM, Neelakanta Reddy wrote: >> Hi Anders, >> >> While applying rde patch the following errors are observed: >> >> patching file osaf/libs/agents/infrastructure/rda/Makefile.am >> patching file osaf/libs/agents/infrastructure/rda/rda.h >> patching file osaf/libs/agents/infrastructure/rda/rda_papi.c >> patching file osaf/libs/core/include/rda_papi.h >> Hunk #1 succeeded at 115 (offset -1 lines). >> patching file osaf/services/infrastructure/rde/Makefile.am >> patching file osaf/services/infrastructure/rde/include/rde_amf.h >> patching file osaf/services/infrastructure/rde/include/rde_cb.h >> patching file osaf/services/infrastructure/rde/include/rde_rda.h >> patching file osaf/services/infrastructure/rde/include/rde_rda_common.h >> patching file osaf/services/infrastructure/rde/rde_amf.c >> patching file osaf/services/infrastructure/rde/rde_main.c >> patching file osaf/services/infrastructure/rde/rde_mds.c >> patching file osaf/services/infrastructure/rde/rde_rda.c >> >> can't find file to patch at input line 6379 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> | osaf/libs/agents/infrastructure/rda/rda_papi.cc | 6 ++++++ >> | osaf/tools/rde/rde_get_role.c | 6 ++++++ >> | 2 files changed, 12 insertions(+), 0 deletions(-) >> | >> | >> |Add support for the QUIESCING and QUIESCED roles in RDE as well as the >> |rdegetrole tool. >> | >> |diff --git a/osaf/libs/agents/infrastructure/rda/rda_papi.cc >> b/osaf/libs/agents/infrastructure/rda/rda_papi.cc >> |--- a/osaf/libs/agents/infrastructure/rda/rda_papi.cc >> |+++ b/osaf/libs/agents/infrastructure/rda/rda_papi.cc >> -------------------------- >> File to patch: >> Skip this patch? [y] y >> Skipping patch. >> 1 out of 1 hunk ignored >> patching file osaf/tools/rde/rde_get_role.c >> patching file Makefile.am >> patching file opensaf.spec.in >> patching file osaf/services/infrastructure/rde/Makefile.am >> patching file osaf/services/infrastructure/rde/config/rde.conf >> patching file osaf/services/infrastructure/rde/include/Makefile.am >> patching file osaf/services/infrastructure/rde/include/rde_amf.h >> patching file osaf/services/infrastructure/rde/include/rde_cb.h >> patching file osaf/services/infrastructure/rde/include/rde_rda.h >> patching file osaf/services/infrastructure/rde/include/role.h >> can't find file to patch at input line 6656 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> |diff --git a/osaf/services/infrastructure/rde/rde_amf.cc >> b/osaf/services/infrastructure/rde/rde_amf.cc >> |--- a/osaf/services/infrastructure/rde/rde_amf.cc >> |+++ b/osaf/services/infrastructure/rde/rde_amf.cc >> -------------------------- >> File to patch: y >> y: No such file or directory >> Skip this patch? [y] >> Skipping patch. >> 4 out of 4 hunks ignored >> can't find file to patch at input line 6734 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> |diff --git a/osaf/services/infrastructure/rde/rde_main.cc >> b/osaf/services/infrastructure/rde/rde_main.cc >> |--- a/osaf/services/infrastructure/rde/rde_main.cc >> |+++ b/osaf/services/infrastructure/rde/rde_main.cc >> -------------------------- >> File to patch: y >> y: No such file or directory >> Skip this patch? [y] >> Skipping patch. >> 15 out of 15 hunks ignored >> can't find file to patch at input line 7212 >> Perhaps you used the wrong -p or --strip option? >> The text leading up to this was: >> -------------------------- >> |diff --git a/osaf/services/infrastructure/rde/rde_mds.cc >> b/osaf/services/infrastructure/rde/rde_mds.cc >> |--- a/osaf/services/infrastructure/rde/rde_mds.cc >> |+++ b/osaf/services/infrastructure/rde/rde_mds.cc >> -------------------------- >> File to patch: >> Skip this patch? [y] >> Skipping patch. >> 6 out of 6 hunks ignored >> can't find file to patch at input line 7346 >> Perhaps you used the wrong -p or --strip option? >> The text le-------------------------- >> |diff --git a/osaf/services/infrastructure/rde/rde_rda.cc >> b/osaf/services/infrastructure/rde/rde_rda.cc >> |--- a/osaf/services/infrastructure/rde/rde_rda.cc >> |+++ b/osaf/services/infrastructure/rde/rde_rda.cc >> -------------------------- >> File to patch: >> Skip this patch? [y] >> Skipping patch. >> 3 out of 3 hunks ignored >> ading up to this was: >> >> >> /Neel. >> >> On Monday 29 February 2016 09:09 PM, Anders Widell wrote: >>> Summary: rde: Support AMF configurations containing more than two >>> OpenSAF 2N SUs [#79] >>> Review request for Trac Ticket(s): 79 >>> Peer Reviewer(s): Ramesh >>> Pull request to: >>> Affected branch(es): default(5.0) >>> Development branch: default >>> >>> -------------------------------- >>> Impacted area Impact y/n >>> -------------------------------- >>> Docs n >>> Build system n >>> RPM/packaging n >>> Configuration files n >>> Startup scripts n >>> SAF services n >>> OpenSAF services y >>> Core libraries n >>> Samples n >>> Tests n >>> Other n >>> >>> >>> Comments (indicate scope for each "y" above): >>> --------------------------------------------- >>> >>> changeset 71019a32fea392f66ccd73463bd878668b30cbc0 >>> Author: Anders Widell <anders.wid...@ericsson.com> >>> Date: Mon, 29 Feb 2016 16:22:22 +0100 >>> >>> rde: Convert the RDE service to C++ [#79] >>> >>> changeset 34046fa73e284da53d2806cf3ded5aa262c7de9c >>> Author: Anders Widell <anders.wid...@ericsson.com> >>> Date: Mon, 29 Feb 2016 16:23:35 +0100 >>> >>> rde: Add QUIESCING and QUIESCED roles [#79] >>> >>> Add support for the QUIESCING and QUIESCED roles in RDE as well >>> as the >>> rdegetrole tool. >>> >>> changeset e7ec31badd51e045ea24a11e52bafbe603bec963 >>> Author: Anders Widell <anders.wid...@ericsson.com> >>> Date: Mon, 29 Feb 2016 16:37:14 +0100 >>> >>> rde: Generalize the role selection algorithm to work with more >>> than two >>> nodes [#79] >>> >>> Without changing the network protocol, generalize the role selection >>> algorithm used by RDE so that it works with more than two nodes. >>> Nodes are >>> now initially given the QUIESCED role. When there are no ACTIVE >>> or STANDBY >>> nodes, the CLM node agent will initiate an election of a new >>> ACTIVE node. >>> RDE on the winning node will set its role to ACTIVE. >>> >>> There is now also a new customizable script which is executed on >>> a node >>> before it becomes ACTIVE. The purpose of this script is to >>> perform necessary >>> preparations (if any) needed before a node can take on the ACTIVE >>> role. For >>> example, shared files system may have to be mounted. >>> >>> >>> Complete diffstat: >>> ------------------ >>> Makefile.am | 3 +- >>> opensaf.spec.in | 1 + >>> osaf/libs/agents/infrastructure/rda/Makefile.am | 2 +- >>> osaf/libs/agents/infrastructure/rda/rda.h | 15 +++-- >>> osaf/libs/agents/infrastructure/rda/rda_papi.c | 82 >>> ++++++++++++++++++-------------- >>> osaf/libs/core/include/rda_papi.h | 2 +- >>> osaf/services/infrastructure/rde/Makefile.am | 9 ++- >>> osaf/services/infrastructure/rde/config/rde.conf | 3 + >>> osaf/services/infrastructure/rde/include/Makefile.am | 3 +- >>> osaf/services/infrastructure/rde/include/rde_amf.h | 12 +++- >>> osaf/services/infrastructure/rde/include/rde_cb.h | 22 >>> +++++--- >>> osaf/services/infrastructure/rde/include/rde_rda.h | 17 ++++-- >>> osaf/services/infrastructure/rde/include/rde_rda_common.h | 4 +- >>> osaf/services/infrastructure/rde/include/role.h | 60 >>> ++++++++++++++++++++++++ >>> osaf/services/infrastructure/rde/rde_amf.c | 48 >>> +++++++++++++------ >>> osaf/services/infrastructure/rde/rde_main.c | 337 >>> +++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------- >>> osaf/services/infrastructure/rde/rde_mds.c | 84 >>> +++++++++++++++++++++------------- >>> osaf/services/infrastructure/rde/rde_rda.c | 15 ++--- >>> osaf/services/infrastructure/rde/role.cc | 144 >>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >>> osaf/tools/rde/rde_get_role.c | 6 ++ >>> scripts/opensaf_sc_active | 30 >>> ++++++++++++ >>> 21 files changed, 539 insertions(+), 360 deletions(-) >>> >>> >>> Testing Commands: >>> ----------------- >>> >>> Configure the system with more than two controller nodes. The system >>> should work >>> as normal. >>> >>> Note: you need all the patches for ticket [#79] in order to run the >>> system with >>> more than two controller nodes. However, it should also be possible >>> to apply the >>> patches for just one service and test legacy functionality (i.e. run >>> regression >>> tests). >>> >>> >>> Testing, Expected Results: >>> -------------------------- >>> >>> The system should work both when configured with two system >>> controllers (and >>> possibly some payload nodes), as well as with a configuration where >>> all nodes >>> are configured as controller nodes. >>> >>> >>> Conditions of Submission: >>> ------------------------- >>> Ack from reviewer. >>> >>> >>> 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. >>> >>> >>> ------------------------------------------------------------------------------ >>> >>> Site24x7 APM Insight: Get Deep Visibility into Application Performance >>> APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month >>> Monitor end-to-end web transactions and take corrective actions now >>> Troubleshoot faster and improve end-user experience. Signup Now! >>> http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140 >>> _______________________________________________ >>> Opensaf-devel mailing list >>> Opensaf-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/opensaf-devel > > ------------------------------------------------------------------------------ > Transform Data into Opportunity. > Accelerate data analysis in your applications with > Intel Data Analytics Acceleration Library. > Click to learn more. > http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140 > _______________________________________________ > Opensaf-devel mailing list > Opensaf-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/opensaf-devel > ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785111&iu=/4140 _______________________________________________ Opensaf-devel mailing list Opensaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/opensaf-devel
