Dejan - Were you able to commit it?
On Tue, Jun 23, 2009 at 12:36 AM, NAKAHIRA Kazutomo<[email protected]> wrote: > Hi, Serge and Dejan > > Thank you for being interested in my patches. > > I remade the patch that based on the latest Linux-HA-Dev. > (http://hg.linux-ha.org/dev/rev/f9f9567ee692) > > Best regards, > NAKAHIRA Kazutomo > > Serge Dubrouski wrote: >> >> Here is the one with applied patch. >> >> On Mon, Jun 22, 2009 at 3:54 PM, Dejan Muhamedagic<[email protected]> >> wrote: >>> >>> Hi Serge, >>> >>> On Mon, Jun 22, 2009 at 02:04:30PM -0600, Serge Dubrouski wrote: >>>> >>>> Dejan - >>>> >>>> Please try this one. >>> >>> No luck: >>> >>> [0]rondo:work > patch -p0 --dry-run < /tmp/pgsql.patch >>> patching file resources/OCF/pgsql >>> Hunk #1 FAILED at 194. >>> Hunk #3 FAILED at 253. >>> Hunk #4 succeeded at 297 with fuzz 1. >>> Hunk #5 FAILED at 308. >>> 3 out of 5 hunks FAILED -- saving rejects to file resources/OCF/pgsql.rej >>> >>> If you're absolutely sure that your copy of pgsql is good, post >>> it and we'll see how does it differ from the current version in >>> the hg repository. >>> >>> Thanks, >>> >>> Dejan >>> >>>> On Mon, Jun 22, 2009 at 1:54 PM, Serge Dubrouski<[email protected]> >>>> wrote: >>>>> >>>>> heartbeat-resources-2.99.2-8.1.i386 >>>>> >>>>> And this is the right one. I used it to create that patch and just >>>>> applied my patch against it without any problems: >>>>> >>>>> [r...@fc-node1 pgsql]# patch resources/OCF/pgsql pgsql.patch >>>>> patching file resources/OCF/pgsql >>>>> [r...@fc-node1 pgsql]# >>>>> >>>>> But the one that I see here: >>>>> >>>>> http://hg.clusterlabs.org/pacemaker/stable-1.0/file/e5c2b1d937ac/resources/OCF/pgsql >>>>> is the wrong one. >>>>> >>>>> On Mon, Jun 22, 2009 at 1:36 PM, Dejan Muhamedagic<[email protected]> >>>>> wrote: >>>>>> >>>>>> Hi Serge, >>>>>> >>>>>> On Mon, Jun 22, 2009 at 01:04:23PM -0600, Serge Dubrouski wrote: >>>>>>> >>>>>>> Dejan - >>>>>>> >>>>>>> Something is wrong with your repository. The patch is against the >>>>>>> file >>>>>>> that comes with heartbeat-resources package and that file is >>>>>>> absolutely different from what you have in the repository. The file >>>>>>> in >>>>>>> repository looks incorrect. >>>>>> >>>>>> Just checked and what I have in my repository equals this: >>>>>> >>>>>> http://hg.linux-ha.org/dev/raw-file/tip/resources/OCF/pgsql >>>>>> >>>>>> Hmm, odd indeed. Which heartbeat-resources package do you have? >>>>>> >>>>>> Thanks, >>>>>> >>>>>> Dejan >>>>>> >>>>>>> On Mon, Jun 22, 2009 at 12:33 PM, Dejan >>>>>>> Muhamedagic<[email protected]> wrote: >>>>>>>> >>>>>>>> Hi Serge, >>>>>>>> >>>>>>>> On Mon, Jun 22, 2009 at 12:24:44PM -0600, Serge Dubrouski wrote: >>>>>>>>> >>>>>>>>> And here is the patch. >>>>>>>> >>>>>>>> Looks like you were using a different version than what we have >>>>>>>> in the hg repository: >>>>>>>> >>>>>>>> [0]rondo:work > patch -p0 --dry-run < /tmp/pgsql.patch >>>>>>>> patching file resources/OCF/pgsql >>>>>>>> Hunk #1 FAILED at 194. >>>>>>>> Hunk #3 FAILED at 253. >>>>>>>> Hunk #4 succeeded at 297 with fuzz 1. >>>>>>>> Hunk #5 FAILED at 308. >>>>>>>> 3 out of 5 hunks FAILED -- saving rejects to file >>>>>>>> resources/OCF/pgsql.rej >>>>>>>> >>>>>>>> Or maybe I missed some patch. What I have as the last changeset >>>>>>>> is this: >>>>>>>> >>>>>>>> changeset: ? 11977:1cbc4c8c571f >>>>>>>> user: ? ? ? ?Serge >>>>>>>> date: ? ? ? ?Thu Jun 26 01:51:05 2008 +0200 >>>>>>>> summary: ? ? Low: pgsql RA: check for the non-supported action >>>>>>>> >>>>>>>> Can you please see what's up. >>>>>>>> >>>>>>>> Thanks, >>>>>>>> >>>>>>>> Dejan >>>>>>>> >>>>>>>>> On Mon, Jun 22, 2009 at 12:00 PM, Serge Dubrouski >>>>>>>>> <[email protected]>wrote: >>>>>>>>> >>>>>>>>>> All these patches are OK with one exception. Construction >>>>>>>>>> $(command) isn't >>>>>>>>>> supported by native Bourne shell so I'd propose changing it to >>>>>>>>>> `command`. >>>>>>>>>> Attached is a patch that combines all 3 patches and fixes that >>>>>>>>>> incompatibility issue. >>>>>>>>>> >>>>>>>>>> Thanks for the patches. >>>>>>>>>> >>>>>>>>>> 2009/6/18 NAKAHIRA Kazutomo <[email protected]> >>>>>>>>>> >>>>>>>>>>> Hello, >>>>>>>>>>> >>>>>>>>>>> The pgsql RA includes the several confusing logs as follows >>>>>>>>>>> and I propose 3 patches to solve these problems. >>>>>>>>>>> >>>>>>>>>>> 1. When it takes time to start PostgreSQL, the "ERROR" level log >>>>>>>>>>> ? "PostgreSQL $OCF_RESKEY_pgdb isn't running" is output >>>>>>>>>>> ? though the start of pgsql RA has succeeded. >>>>>>>>>>> ? It seems that "WARN" level is more appropriate than "ERROR". >>>>>>>>>>> >>>>>>>>>>> pgsql-ra-logging-1.patch is a patch that corrects No.1 problem. >>>>>>>>>>> >>>>>>>>>>> 2. In the start confirmation processing of pgsql RA, An >>>>>>>>>>> unnecessary >>>>>>>>>>> ? "sleep 1" is executed though the start of PostgreSQL is >>>>>>>>>>> confirmed >>>>>>>>>>> ? with pgsql_monitor(). >>>>>>>>>>> 3. In the stop processing of pgsql RA, An unnecessary log message >>>>>>>>>>> ? "PostgreSQL still hasn't stopped yet. Waiting..." is output to >>>>>>>>>>> ? the ha-debug though PostgreSQL has been stopped. >>>>>>>>>>> >>>>>>>>>>> pgsql-ra-logging-2.patch is a patch that corrects No.2 and 3 >>>>>>>>>>> problem. >>>>>>>>>>> >>>>>>>>>>> 4. When failing in the execution of the psql command and >>>>>>>>>>> ? the pg_ctl command, the execution result of the command is not >>>>>>>>>>> ? recorded in the log file. >>>>>>>>>>> >>>>>>>>>>> pgsql-ra-logging-3.patch is a patch that corrects No.4 problem. >>>>>>>>>>> >>>>>>>>>>> Best regards, >>>>>>>>>>> NAKAHIRA Kazutomo >>>>>>>>>>> >>>>>>>>>>> -- >>>>>>>>>>> ---------------------------------------- >>>>>>>>>>> NAKAHIRA Kazutomo >>>>>>>>>>> NTT DATA INTELLILINK CORPORATION >>>>>>>>>>> Open Source Business Unit >>>>>>>>>>> Software Services Integration Business Division >>>>>>>>>>> >>>>>>>>>>> _______________________________________________________ >>>>>>>>>>> Linux-HA-Dev: [email protected] >>>>>>>>>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>>>>>>>>> Home Page: http://linux-ha.org/ >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> Serge Dubrouski. >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> -- >>>>>>>>> Serge Dubrouski. >>>>>>>> >>>>>>>>> _______________________________________________________ >>>>>>>>> Linux-HA-Dev: [email protected] >>>>>>>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>>>>>>> Home Page: http://linux-ha.org/ >>>>>>>> >>>>>>>> _______________________________________________________ >>>>>>>> Linux-HA-Dev: [email protected] >>>>>>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>>>>>> Home Page: http://linux-ha.org/ >>>>>>>> >>>>>>> >>>>>>> >>>>>>> -- >>>>>>> Serge Dubrouski. >>>>>>> _______________________________________________________ >>>>>>> Linux-HA-Dev: [email protected] >>>>>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>>>>> Home Page: http://linux-ha.org/ >>>>>> >>>>>> _______________________________________________________ >>>>>> Linux-HA-Dev: [email protected] >>>>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>>>> Home Page: http://linux-ha.org/ >>>>>> >>>>> >>>>> >>>>> -- >>>>> Serge Dubrouski. >>>>> >>>> >>>> >>>> -- >>>> Serge Dubrouski. >>> >>>> _______________________________________________________ >>>> Linux-HA-Dev: [email protected] >>>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>>> Home Page: http://linux-ha.org/ >>> >>> _______________________________________________________ >>> Linux-HA-Dev: [email protected] >>> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >>> Home Page: http://linux-ha.org/ >>> >> >> >> >> >> ------------------------------------------------------------------------ >> >> _______________________________________________________ >> Linux-HA-Dev: [email protected] >> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev >> Home Page: http://linux-ha.org/ > > > -- > ---------------------------------------- > NAKAHIRA Kazutomo > NTT DATA INTELLILINK CORPORATION > Open Source Business Unit > Software Services Integration Business Division > > _______________________________________________________ > Linux-HA-Dev: [email protected] > http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev > Home Page: http://linux-ha.org/ > > -- Serge Dubrouski. _______________________________________________________ Linux-HA-Dev: [email protected] http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev Home Page: http://linux-ha.org/
