From 25bd97bdb896eeba1479da04e93ff60718ec1a4f Mon Sep 17 00:00:00 2001 From: z00793368 Date: Sat, 5 Nov 2022 17:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=AE=89=E8=A3=85=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E7=8E=AF=E5=A2=83=E5=8F=A5=E6=9F=84=E6=95=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=86=99=E5=85=A5=E6=96=B9=E5=BC=8F=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E4=BB=8E=E8=A6=86=E7=9B=96=E6=94=B9=E4=B8=BA=E8=BF=BD=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 13 +++++++++++++ .vscode/tags-19.wecode-db | Bin 0 -> 94208 bytes .vscode/tags-19.wecode-lock | Bin 0 -> 4096 bytes script/local/LocalCheck.py | 7 ++++--- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 .vscode/tags-19.wecode-db create mode 100644 .vscode/tags-19.wecode-lock diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..60dd7edc --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,13 @@ +{ + "C_Cpp.autocomplete": "Disabled", + "C_Cpp.intelliSenseEngine": "Disabled", + "CodeCheck.RealTimeCodeMarsCheck.Enable": false, + "CodeCheck.AllRelatedRemoteBranch": "", + "CodeCheck.TaskIdsUpdateTime": "2022-11-05 17:14:10", + "CodeCheck.TaskIdsForRemoteUrl": "https://gitee.com/zhang-ao39/openGauss-OM_1.git", + "CodeCheck.TaskIdsForRemoteBranch": "", + "CodeCheck.TaskIds": "", + "CodeCheck.SubRepoTaskIdsInfo": {}, + "CodeCheck.RelatedRemoteRepo": "https://gitee.com/zhang-ao39/openGauss-OM_1.git", + "CodeCheck.RelatedRemoteBranch": "" +} \ No newline at end of file diff --git a/.vscode/tags-19.wecode-db b/.vscode/tags-19.wecode-db new file mode 100644 index 0000000000000000000000000000000000000000..294733165e7644576de493e91990e619fa6ff6fa GIT binary patch literal 94208 zcmeI5&u<&owZ}=PMp5BpyU*I5B&??vOxcUuDa>s?cTQg0tLG1qMHIiSIMULo_ps9e)EXKx%O0> zNq?GNp83^Gc6uh|r*2REZfY-SEPfUr>Ysak_PsZ?Y&M&DvGc6$e$;dKJ@MJBS_Q{q zk4x4L6J>*W&yRPzM|Shr&9VLVk^89Wf0$!O-MyyY?shz8vOv^Rj%SYFS z$tu;T$VxS4*UM#Au!|%+?`>BcJ_R2@i7dxu`@QZlYxSD@zNe;`G=a&?LtWENJ=wq2 z?zG⋙I^MH|cm?VJz82>wV%Fbzl`+f-u5+0%lZ|Nb*r8f}QYZKGV-h}{t*7K|qBZJsSGYpZuxGUreH zUi;v{?Mc%%xP9GTqvamCzALK&0js5LA)J6e1C8#zj+Y2<=-)sWf%JkuWS0sO0s`S z29g@c@A-fLnMl?dQb)1WnPa{0ut(L>!$S25`@Z!g7n6F_QcAqx1|B7LO3s5y-4V1( z#iQ3W{r2r-e~!cvUgS0S(rfH>JNxZ};qu&oh-<^mYsTTAfX{|zJGrjuZ@-=FFAdGs z>h5{%PuyrcRdH?7e5!rTXtzQy9YEuK!i0yKKV8!FwY6mb{?Lr=*2mFoyf8ayCf>GY zcFm1Epxk2&>&PB$0VGu~_tY5b!_9-+)J8aMrBBtVOoGLs|_jguAKe^2) zX!^~Ynf?z3l?~@nGdwO;oqD0nWGo0b-&TuW&LP))yW_b%pK1b))si3WrB-~&u31$_ zta$3e#w>W%g}Zx2b`oA}kd!jUn(T3*T(@e5ZSC9$2U(=H=HHqcy$)|(cqQZ=lN)oF2QqCJ(>V zb$ZNjQI}}MsLnjQt7)s-dgjHlGP4vyn)&pE`>osP?hgnZkW?1G@CIf4`lF&qgeqH1 zDHF;v=m$K&+how78_zkMDu;jZ6CsTB<8qYvb7Jz7;42Ivo&Y~fYpW0S%=tGiq;}kG zwfCPp?PHf9T?$-u&j`C%Q{Wt9@QJ5ltmj*K0vfB4ER{(}FrL0Sp=I)Ht5B|4DsdC- zlopC*CJVIA`u2ZgE~oR5mdfcT=oLAxu(XtOf;zFTdFew#*~73x&!#F$WDsjv8ae+^AH_RzYNkTZMYrA=BnU=N)d9E@GOgiy}7Z)mW!r zDZY=)h`r=lDyd~xc+%@W<2yRfZ~CX6{8mh8S0`%>774f|f_#phc2o#c<#=gemuIN0 z(_Z(q;~U>H8Rfeqi&}!w*uv>WI5czY%WsQ?P@?cvZ{iGIzp)@tTo+&X0Ra#I0T2KI z5C8!X009sH0T2KI5V)!Yt_j7k|G%o{g40w4eaAOHd&00JNY0w4eaAV37L|A!-h z00@8p2!H?xfB*=900@8p2!O!VCxHF`)weM;1OX5L0T2KI5C8!X009sH0T2KI{QW+m0&}U=*R{LCgs?DT7O)t;< zY9>29lk!uyr+zoJmo)fo|5iVXpQTILY&P>^=ULnRsORo`;v^Rj%SYFS$tu;T$VxS4 z*UM#Au!|%+?`>BcJ_R2@i7dxu`@QZlYxSD@zNe;`G=a&?LtWENJ=wq2?zG⋙I^M zH|cm?VJz82>wV%Fbzl`+f-u5+0%lZ|Nb*r8f}QYZKGV-h}{t*7K|qBZJsSGYpZuxGUreHUi;v{?Mc%% zxP9GTqvamCzALK&0js5LA)J6e1C8#zj+Y2<=-)sWf%JkuWS0sO0s`S29g@c@A-fL znMl?dQb)1WnPa{0ut(L>!$S25`@Z!g7n6F_QcAqx1|B7LO3s5y-4V1(#iQ3W{r2r- ze~!cvUgS0S(rfH>JNxZ};qu&oh-<^mYsTTAfX{|zJGrjuZ@-=FFAdGs>h5{%Puyrc zRdH?7e5!rTXtzQy9YEuK!i0yKKV8!FwY6mb{?Lr=*2mFoyf8ayCf>GYcFm1Epx zk2&>&PB$0VGu~_tY5b!_9-+)J8aMrBBtVOoGLs|_jguAKe^2)X!^~Ynf?z3 zl?~@nGdwO;oqD0nWGo0b-&TuW&LP))yW_b%pK1b))si3WrB-~&u31$_ta$3e#w>W% zg}Zx2b`oA}kd!jUn(T3*T(@e5ZSC9$2U(=H= zHHqcy$)|(cqQZ=lN)oF2QqCJ(>Vb$ZNjQI}}M zsLnjQt7)s-dgjHlGP4vyn)&pE`>osP?hgnZkW?1G@CIf4`lF&qgeqH1DHF;v=m$K& z+how78_zkMDu;jZ6CsTB<8qYvb7Jz7;42Ivo&Y~fYpW0S%=tGiq;}kGwfCPp?PHf9 zT?$-u&j`C%Q{Wt9@QJ5ltmj*K0vfB4ER{(}FrL0Sp=I)Ht5B|4DsdC-lopC*CJVIA z`u2ZgE~oR5mdfcT=oLAxu(XtOf;zFTdFew#*~73x&!#F$WDsjv8ae+^AH_RzYNkTZMYrA=BnU=N)d9E@GOgiy}7Z)mW!rDZXvZh^^~c zDyd~xc+%@W<2yRfZ~CX6{8mh8S0`%>774f|f_#phc2o#c<#=gemuIN0(_Z(q;~U>H z8Rfeqi&}!w*uv>WI5czY%WsQ?P@?cvZ=#77=2MCJsb41MemmE=_Sx)jGPTUS_H)fl z|8_b*^~;5w_$Ghqf8!-wgTPBBKn>E zjJy_6Y2Zkv-J$IAi2t@aeBW@=_1fZ$W?=Ekd&P(%-3!LO{8(~tOB>RE{eztFV2C1o zo~^(5udi$3Q0%`O!Zbol@rfHolrLi!$$69STbkS+y-OL2Z}rHg;=AhZ=h$x3b8V5; z#}C;e3(70nRty?aY?o+S)h1%II=7qTBxC2^JZgF#jUi)vgX~_mww(C+9Y6mIClpz7 zSWp`tenJ;k32k_CHf9K+E6pc{2n*2=qKbAtL#Ky)cFEyi?;LU1{l0VfpYel50XsT3 zB=)*;MY;PL>>#*Nr^_BJ{s%v!;AeI-^w_1bf^#++=8e(0g7#=C;aMV>h@cbv=E2A8 zr&cxn9v^)>8hywKXp-#cBtzYzxrQ2oQ`4d9_}QuTwb=0{X()nTsYp}b7@bFYH$ggV|7Geof=%oqpKO*O@6!YG}X0udd#MXBV7g0Z8{iw;f6 zB%u`1ck~~}p(pY(Bt76r-rf|iob6z^*jqO@vYVZ@=@4ZQp7q25k zl*8)?^d z8LN&$VvwcSJPHTbBH{(tn?c@!bV=rK0@Ob=T@vTh;)ShBnRv>el1MtU=9wBj*Mh7o zmf_3oeVty_%7=dN{Qc*?iyg_K@b~{Oc@K->K>!3m00ck)1V8`;KmY_l00cnb6(E59 z|0`ewhyVg000JNY0w4eaAOHd&00JNY0xy{W_Wv&#Fop*K5C8!X009sH0T2KI5C8!X n0D)J40QUc{fDs@92!H?xfB*=900@8p2!H?xfB*=*WCDK!?~3OY literal 0 HcmV?d00001 diff --git a/.vscode/tags-19.wecode-lock b/.vscode/tags-19.wecode-lock new file mode 100644 index 0000000000000000000000000000000000000000..bd4ede2edd1a3125b28ee2db538dd013a214981a GIT binary patch literal 4096 zcmWFz^vNtqRY=P(%1ta$FlG>7U}R))P*7lCU|@t|AVoG{WYCK?;00+HAlr;ljiVtj n8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O6ovo*BiRO; literal 0 HcmV?d00001 diff --git a/script/local/LocalCheck.py b/script/local/LocalCheck.py index 484820fa..d55e757b 100644 --- a/script/local/LocalCheck.py +++ b/script/local/LocalCheck.py @@ -501,11 +501,12 @@ def SetLimitsConf(typename, item, value, limitfile): """ g_logger.debug("Setting limits config.") clusterUser = getClusterUser() - cmd = """sed -i '/^.* %s *%s .*$/d' %s && + cmd = """sed -i '/^.*root * %s *%s .*$/d' %s && echo "root %s %s %s" >> %s && """ \ % (typename, item, limitfile, typename, item, value, limitfile) - cmd += """echo "%s %s %s %s" >> %s""" \ - % (clusterUser, typename, item, value, limitfile) + cmd += """sed -i '/^.*%s * %s *%s .*$/d' %s && + echo "%s %s %s %s" >> %s""" \ + % (clusterUser, typename, item, limitfile, clusterUser, typename, item, value, limitfile) (status, output) = subprocess.getstatusoutput(cmd) if (status != 0): g_logger.debug("The cmd is %s " % cmd) -- Gitee