rpms/pcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve a corruption (zero file creation) in hacluster patch

Browse Source 
Resolves: rhbz#2211263
Resolves: rhbz#2219731
Resolves: rhbz#2159207
This commit is contained in:
Nathan Scott 2023-07-10 17:00:42 +10:00
parent 1c9cbf235b
commit fef0a6b906
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
redhat-bugzilla-2219731-hacluster-metrics.patch
View File

@ -1,6 +1,6 @@
diff -Naurp pcp-5.3.7.orig/qa/1897.out pcp-5.3.7/qa/1897.out diff -Naurp pcp-5.3.7.orig/qa/1897.out pcp-5.3.7/qa/1897.out
--- pcp-5.3.7.orig/qa/1897.out 2021-09-30 12:56:49.000000000 +1000 --- pcp-5.3.7.orig/qa/1897.out 2023-07-10 16:51:15.049365731 +1000
+++ pcp-5.3.7/qa/1897.out 2023-07-05 14:08:48.576224340 +1000 +++ pcp-5.3.7/qa/1897.out 2023-07-10 16:52:18.069511419 +1000
@@ -376,12 +376,12 @@ is given as label metadata values for th @@ -376,12 +376,12 @@ is given as label metadata values for th
inst [2 or "node-2:test_clone_state"] value 1 inst [2 or "node-2:test_clone_state"] value 1
inst [3 or "node-2:test_site"] value 1 inst [3 or "node-2:test_site"] value 1
@ -651,8 +651,8 @@ diff -Naurp pcp-5.3.7.orig/qa/1897.out pcp-5.3.7/qa/1897.out
LEAK SUMMARY: LEAK SUMMARY:
definitely lost: 0 bytes in 0 blocks definitely lost: 0 bytes in 0 blocks
diff -Naurp pcp-5.3.7.orig/qa/hacluster/GNUmakefile pcp-5.3.7/qa/hacluster/GNUmakefile diff -Naurp pcp-5.3.7.orig/qa/hacluster/GNUmakefile pcp-5.3.7/qa/hacluster/GNUmakefile
--- pcp-5.3.7.orig/qa/hacluster/GNUmakefile 2021-02-17 15:27:41.000000000 +1100 --- pcp-5.3.7.orig/qa/hacluster/GNUmakefile 2023-07-10 16:51:15.069365777 +1000
+++ pcp-5.3.7/qa/hacluster/GNUmakefile 2023-07-05 14:08:41.096213777 +1000 +++ pcp-5.3.7/qa/hacluster/GNUmakefile 2023-07-10 16:52:18.069511419 +1000
@@ -8,7 +8,7 @@ default setup default_pcp: @@ -8,7 +8,7 @@ default setup default_pcp:
install install_pcp: $(ROOTFILES) install install_pcp: $(ROOTFILES)
@ -662,9 +662,29 @@ diff -Naurp pcp-5.3.7.orig/qa/hacluster/GNUmakefile pcp-5.3.7/qa/hacluster/GNUma
$(INSTALL) -m 644 -f GNUmakefile.install $(TESTDIR)/GNUmakefile $(INSTALL) -m 644 -f GNUmakefile.install $(TESTDIR)/GNUmakefile
include $(BUILDRULES) include $(BUILDRULES)
diff -Naurp pcp-5.3.7.orig/qa/hacluster/hacluster-root-002.tgz pcp-5.3.7/qa/hacluster/hacluster-root-002.tgz
--- pcp-5.3.7.orig/qa/hacluster/hacluster-root-002.tgz 1970-01-01 10:00:00.000000000 +1000
+++ pcp-5.3.7/qa/hacluster/hacluster-root-002.tgz 2023-07-10 16:53:58.649743937 +1000
@@ -0,0 +1,15 @@
+‹í[[sÛ6Îkô+°ôC“©© -Ùµ*팻[o›¤<E280BA>½íôI‘ Äš$X´¢™þøý@R”,ÇM×IÓ-Ïdl Î çN¥ß÷zO>0ô'£ýœŒúÍß< ‡ÃQà <ìôO¼“'lô¡#(”æ9cO2qËSuÿ¾‡žÿE¡<45>û_r?†Dþ<44>,á=îÿ¨oîß;ñíý ؾ?šó ‰Ò®Z>*<2A>wÞÿp8Ôþ?êáþG}ïø ë?"÷ÂßüþþÑ+TÞ›GiO¤·lÎÕ²Óñ¹f“ÉÅë¯;Xóód
+®‹\Ì”ÐSç¨;8îz»åqp-ÜU¤—S'ã¾Hø<48>ÈÝ£î©ÃD&}¬ž8,-’Y‘ÑN5uú366+Ÿã3ˆ¸1WÚ]å‘Ö"<22>:×Ë‚ý»H™ç±A<Œ<>†Ìë{G³x\™G‹ó¥ˆOÝTbP?óãH¤`³²æúA¡DŽ#Rj‡-ù­p-d^$Sgß-Š(˜:žóÏc_¦a´(r®#™Ò
+­AvÝ.Ð’õœY–ËLäzM
+b„†dšƒ’Ò9Ï\™åTçp2½Íx”ß¿×5®¸ö—<C3B6>\@‰<Sgg7P`5ä±Nï}°CÞ[‘+ü]¡n®”x½î ;rO»ÐñÌsùQ8žœÃÓáûÑ*•äFi˜ãšóÂ'[ªèÞ÷´äÁ—¹TëÔÿc$‰Ä.!»V¢‡Mêj÷û‘PZ¦°{W¤|‹ ¢rgù<67>ßQ*K u3Gþº"qw½¤-R™7ˆLzûì³´æÞ®9OÈ<4F>T}–>æȳ,ᦷõînôölôª<C3B4>“^ý$J¹/TõŒ<>ðQªë¥\ù³@„¼ˆõ†«Dh>ãZçѼÀݺó"Š·BéVgîñ¶<C3B1>ÝJGþM”
+¥*õî}Tj¸)wo‡—JÎ]¾¡éÝ`2AÖÑ…jè}F+ïR#CÈô}+xÌ—‡­2<C2AD>ÁŸù±çÅ¢Œ<>´gPjª"mÜúI<>‘ÌaìL¼Í„¯EP¯Ô’Ù3¢»šöš:<3A>pc<õÅî&+›ÛÜ»}Õ·[¦VYiÿ`k­T{™qšÞÓÛC~s5û$¨ŸÆyrW,Îv­’0a½iÀV«û/n¿£|7x<37>‹<tqƒ?ûâÿÓÅMz•÷M¨âýg‡*<2A>?»û“`§þ/s­ë‡ -eü8}ÀCýŸwìmêÿ£cÔÿÇ£ã~[ÿ x þÿNú<f&Á_ž³Á!3î™É\³›TèÎw—¯¾¥'}VYç)‚üé” NQ8Ñxø=ü¢óÔúÛ¸óô)¡Š‚ñ&¼ ÆOc"²”Jï{î<>Ÿ"{¦&Þý<C39E>õÁ=þoËËG
+øÿf²ñÿõÿ'GÃaëÿðÿŒ ‚ ež˜êµãÞ<C3A3>Î9kÃeÛý»ç<C2BB>_˜þ½Bˆvä6
+DŽS•ÍÍn¥Öî:¯¨SØÂè™5„šfè載ÒÅÎZ÷ÔÐØæèg¡:<3A>küÈcdº(k,Fl^¼Î7Ñb‰v±®¿ÆX»–²ÞdöY!›üë|óÅŽPF¦’]ö<13>ô×2?‹cÖé¼4…<34>ZFÙïa–<61>½2‘Ó"&QýñC n#_°W¨Ð:Mnîþùê kT­ì™‰ÊÏ7‡¼ym|þËÁNüG)<29>ÈGÿ>ÿ½Ñqcþ{Lõßмÿiãÿ‡‡ç¿Ö"X9Ü ÚQi=÷ ˜Z«Y˜Ë¤1 f:/4ÅEš"`;Œf½å@˜ºpä·ì–¹b4öNÙçýÁ¸ß·mãDIÂóuÙÌ™Ãô:Û3œøEžSïøH1B™1°m»÷ °5Ódû†.vCîY5-¶“è­f5Ú­ñÞ¤!!ÓaÝɈ£ñQßN´·ŽøKž.öÙ‚7Ùw§Ýûfã½ÆÄBͪyÒ[ZP¢!!ë±[ÕKïÛÖwX)3Ù4æH7öïúÊ‘c9Åd;ÑJU°•$hñýjüZivw¼YÏ5YBóAàI}á&<26>dƒKËÌåq\<5C>õTó‘!O:•…v<:¦¸ãÀD"èJ¯ÝP¤>,Ó DÌ×fGe{½†ñ5ç£vè¹oØcç@v¾SIDóŽ`¾nðd>Ï _ÅõrC¼z-iÖêÏEêÇ‚×Ç–‚Çôòe‘ <0B>»ßûžF- ÈÕæPUÀÀD+#§©7ll tZsÙÖéÊ™Sï]ŠØxÎ_UöÃïÕCc¸m‡‚Ëv—¯{fÆdcè'9gÚÎÿj|ýþ1º{òÿhˆÚ Êÿ'Ç'ÈÿhÿmþÿppÀ®aÍcxbóîàó¹}u1fŽÓ9è°«¯Îgç?^¾¸`
+Þ…z ½Ìöø[RBbèRàO&ƒQ[[b‰PŠ/Ð|0ø9mL(˼Ë.ÃÛš6'ïÀÉSÄ Á2®—‡§ó¥Ã8W"ãè’p’xÚ°4“<>ZˆµP©Ü’aMÄqþ§¥Ë9±`ó<>‘ .RÅ›…}?CˆÀ÷g/.^ž}{ñfJH6Db¸ö3¯øZšô|‹¢}b5g4¤ÈÌ4£¤eítٕК¤×ˆÄ™cÐQµ<51><10>sMz‹c¹2ÊÄ‹$
+Y¤ÙŠ+dJMuÎm$ ¯¥1aðZñÜ+f“0ðD©YJ â WR yu}öæúåëó‹iÉ÷Ž2YϪFä[B’–·µjR'ã!ˆe³²<14>ôfÓHí$j±B›‹H,P\
+l°k’>Áá9òˆðÉdò5 ¹Fèeeh23H…xlp)ÉB”Kd1ôC‹4ŒØ]<'}“‰1RJoÄP?¦r…Rd!”N,[r%jNð<4E>ÌÐ÷9vèí#¥
+a*@våºÀRÂý%½4Æh<C386>ù8„œ"IŠ²Òas’ÉèAhÒ¯È/Õe^’‚;cáV#ìJ¢,B±>X,QæånãÖñÌ5nô ä%©<10>KWäI;/E‡8À¸‚’°¤?èÍh#Œe<C592>kÅCs•ÀC8+ÚDuŒµªÖÆŽ‘²²œbŸD"U…j¬e~r33\Ïþ %£F__á
+VÜ:¼¶ÎAj¡1
+éƒQý”Às`ƒHÂÜ‰ï ”cµþ¢äßb<C39F>­ "_,µùb‡QvÀ3½q½"«*@Ü?d¡ZÂ8 ­¡Sè1ý V„¸%*¬»ìÙµ=wEh®„oýw «L‚ç°žV²­XÖp‹œ,8“ð¤Cøƒß <*ˆM„ÔÖŒõæˆ "¯\ôü⻳Ÿ­£Náw<C3A1>w…ìbr¯úzˆuÑòC­Ë`m㯵Js&-âøîÃV;û) D± â駳ëßœ¿þEáé6Ñ ûÇÈ0õ B™™~eø‡æjò«Ê}A:¤ì<C2A4>ñÔ¼<C394>_”o¿uR·@9ƒ^ÕÇôS7œ2T5"ºH¥q=&¦Pi†hî%õ×_–‘ñÓ 0V™ hDã…O‘)„šÖˆB<0ÁøVd 7 §CUi°îJÝ)‡¦Å–µË2´Qt´”ž©çTjÂœ‰Gª±Ž( ÒaŽ®^\]r„r)‹8 ƈ‘Çù_‹¨ôæ@h”µ@dpPi<50>R¸»ÇùjuW¾a¾¾d#†L]´z7Œ¾å€F–3 ƒ%âÈ8H3•<[æp}ùòâõ®§£w›©"ª/m4·UÆ™o»E‹Ä[á4}EÀJ7†<37>f›’”ø57aÞEá<45>qôy@WÆMÂÈrI7Fº#û<>á£"µ‰AÛÇ€Y½®µùÊÕ•’\nx%ª¾Dwè–Å ØÅçy”š2<14>•Q3?Y†ŸeûÍϹZE’ý&ðkÍⲶ’Û92%£Et[ªÀ¦8D³µb%ÓeÔjš¼&‚ñ04&Pª5ŽnkxÈjº‡U6E„6;Ò&â² “n#^pLÅR›d}†2>ITP˜±•ˆcS…Ô£ÃV© Þpg²× úÊ€<C38A>
+<2B>1Æži››¨ªa ‘Ši’BH"X>¯L­´°ÙÙ‹ëËׯ¦MCzÀæJ; ó<>
+d›j@aây£d))½þþújÚi”šŸZïö°Ýÿù<0çQ'À~ÿ½aýýï>õ#oäµýßǀ濟âÈ¢…G„;óŸG~÷ci¼‡ÿ›ÿÿ1l¿ÿÿ‘ õÿZh¡…Zh¡…Zh¡…Zh¡…Zh¡…Zh¡…ÿ/ø/ƒ¸VHP
\ No newline at end of file
diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/help pcp-5.3.7/src/pmdas/hacluster/help diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/help pcp-5.3.7/src/pmdas/hacluster/help
--- pcp-5.3.7.orig/src/pmdas/hacluster/help 2021-07-13 09:34:38.000000000 +1000 --- pcp-5.3.7.orig/src/pmdas/hacluster/help 2023-07-10 16:51:15.069365777 +1000
+++ pcp-5.3.7/src/pmdas/hacluster/help 2023-07-05 14:05:16.565924954 +1000 +++ pcp-5.3.7/src/pmdas/hacluster/help 2023-07-10 16:52:18.069511419 +1000
@@ -103,9 +103,9 @@ of 1 confirms the node status as shutdow @@ -103,9 +103,9 @@ of 1 confirms the node status as shutdow
Whether the expected_up status is reported by the node in the cluster, a Whether the expected_up status is reported by the node in the cluster, a
value of 1 confirms the node status as expected_up. value of 1 confirms the node status as expected_up.
@ -679,8 +699,8 @@ diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/help pcp-5.3.7/src/pmdas/hacluste
@ ha_cluster.pacemaker.resources.agent The name of the resource agent for this resource @ ha_cluster.pacemaker.resources.agent The name of the resource agent for this resource
The name given for the resource agent for the given resource instance in the The name given for the resource agent for the given resource instance in the
diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c pcp-5.3.7/src/pmdas/hacluster/pacemaker.c diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c pcp-5.3.7/src/pmdas/hacluster/pacemaker.c
--- pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c 2021-07-13 09:34:38.000000000 +1000 --- pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c 2023-07-10 16:51:15.069365777 +1000
+++ pcp-5.3.7/src/pmdas/hacluster/pacemaker.c 2023-07-05 14:08:35.526205912 +1000 +++ pcp-5.3.7/src/pmdas/hacluster/pacemaker.c 2023-07-10 16:52:18.069511419 +1000
@@ -534,18 +534,33 @@ hacluster_refresh_pacemaker_nodes(const @@ -534,18 +534,33 @@ hacluster_refresh_pacemaker_nodes(const
/* Collect our node names */ /* Collect our node names */