修复非root类检查项和root类检查项配合--skip-root-items检查结果不一致的问题
gs_collector core dump增加相关线程名 gs_check适配centos容器
This commit is contained in:
@ -780,7 +780,7 @@ def parseCheckContext():
|
||||
failedItems.append(i)
|
||||
else:
|
||||
items_all.append(item)
|
||||
for item in items_all:
|
||||
for item in items_all[:]:
|
||||
if not g_context.set and item['name'] in g_opts.skipItems:
|
||||
items_all.remove(item)
|
||||
continue
|
||||
|
||||
@ -495,7 +495,54 @@ class DefaultValue():
|
||||
"gs_rewind_stack": "gs_rewind_stack",
|
||||
"cm_server_stack": "cm_server_stack",
|
||||
"cm_agent_stack": "cm_agent_stack",
|
||||
"gs_ctl_stack": "gs_ctl_stack"
|
||||
"gs_ctl_stack": "gs_ctl_stack",
|
||||
"AioWorker": "AioWorker",
|
||||
"AlarmChecker": "AlarmChecker",
|
||||
"Archiver": "Archiver",
|
||||
"Auditor": "Auditor",
|
||||
"AutoVacLauncher": "AutoVacLauncher",
|
||||
"AutoVacWorker": "AutoVacWorker",
|
||||
"AuxMain": "AuxMain",
|
||||
"BackendMode": "BackendMode",
|
||||
"BgWriter": "BgWriter",
|
||||
"BootStrap": "BootStrap",
|
||||
"Catchup": "Catchup",
|
||||
"CBMWriter": "CBMWriter",
|
||||
"Checkpointer": "Checkpointer",
|
||||
"CommAuxStream": "CommAuxStream",
|
||||
"CommPoolCleaner": "CommPoolCleaner",
|
||||
"CommRcvStream": "CommRcvStream",
|
||||
"CommRcvWorker": "CommRcvWorker",
|
||||
"CommSendStream": "CommSendStream",
|
||||
"CpMonitor": "CpMonitor",
|
||||
"DataRcvWriter": "DataRcvWriter",
|
||||
"DataReceiver": "DataReceiver",
|
||||
"DataSender": "DataSender",
|
||||
"ExtremeRTO": "ExtremeRTO",
|
||||
"FencedUDFMaster": "FencedUDFMaster",
|
||||
"GaussMaster": "GaussMaster",
|
||||
"Heartbeater": "Heartbeater",
|
||||
"JobExecutor": "JobExecutor",
|
||||
"LWLockMonitor": "LWLockMonitor",
|
||||
"PageWriter": "PageWriter",
|
||||
"ParallelRecov": "ParallelRecov",
|
||||
"PercentileJob": "PercentileJob",
|
||||
"Reaper": "Reaper",
|
||||
"RemoteSrv": "RemoteSrv",
|
||||
"StartupProcess": "StartupProcess",
|
||||
"StatCollector": "StatCollector",
|
||||
"Stream": "Stream",
|
||||
"SysLogger": "SysLogger",
|
||||
"ThdPoolListener": "ThdPoolListener",
|
||||
"TwoPhaseCleaner": "TwoPhaseCleaner",
|
||||
"WalRcvWriter": "WalRcvWriter",
|
||||
"WalReceiver": "WalReceiver",
|
||||
"WalSender": "WalSender",
|
||||
"WalWriter": "WalWriter",
|
||||
"WDRSnapshot": "WDRSnapshot",
|
||||
"WlmArbiter": "WlmArbiter",
|
||||
"WlmCollector": "WlmCollector",
|
||||
"WlmMonitor": "WlmMonitor"
|
||||
}
|
||||
|
||||
COLLECT_CONF_MAP = {
|
||||
@ -508,7 +555,18 @@ class DefaultValue():
|
||||
"CoreDump": "gaussdb,gs_gtm,gs_rewind,cm_server,cm_agent,gs_ctl,"
|
||||
"gaussdb_stack,gs_gtm_stack,gs_rewind_stack,"
|
||||
"cm_server_stack,cm_agent_stack,cm_server_stack,"
|
||||
"gs_ctl_stack",
|
||||
"gs_ctl_stack,AioWorker,AlarmChecker,Archiver,Auditor,"
|
||||
"AutoVacLauncher,AutoVacWorker,AuxMain,BackendMode,"
|
||||
"BgWriter,BootStrap,Catchup,CBMWriter,Checkpointer,"
|
||||
"CommAuxStream,CommPoolCleaner,CommRcvStream,CommRcvWorker,"
|
||||
"CommSendStream,CpMonitor,DataRcvWriter,DataReceiver,"
|
||||
"DataSender,ExtremeRTO,FencedUDFMaster,GaussMaster,"
|
||||
"Heartbeater,JobExecutor,JobScheduler,LWLockMonitor,"
|
||||
"PageWriter,ParallelRecov,PercentileJob,Reaper,RemoteSrv,"
|
||||
"StartupProcess,StatCollector,Stream,SysLogger,"
|
||||
"ThdPoolListener,TwoPhaseCleaner,WalRcvWriter,WalReceiver,"
|
||||
"WalSender,WalWriter,WDRSnapshot,WlmArbiter,WlmCollector,"
|
||||
"WlmMonitor",
|
||||
"Trace": "Dump",
|
||||
"Plan": "*"
|
||||
}
|
||||
|
||||
@ -866,6 +866,8 @@ def getNetWorkConfFile(networkCardNum):
|
||||
output.find("No such file or directory") >= 0):
|
||||
return output.strip()
|
||||
if (output.strip() == "" or len(output.split('\n')) != 1):
|
||||
if DefaultValue.checkDockerEnv():
|
||||
return ""
|
||||
raise Exception(ErrorCode.GAUSS_502["GAUSS_50201"]
|
||||
% NetWorkConfFile)
|
||||
NetWorkConfFile = output.strip()
|
||||
@ -880,8 +882,8 @@ def CheckNetWorkBonding(serviceIP):
|
||||
"""
|
||||
networkCardNum = getNICNum(serviceIP)
|
||||
NetWorkConfFile = getNetWorkConfFile(networkCardNum)
|
||||
if (NetWorkConfFile.find("No such file or directory") >= 0
|
||||
and DefaultValue.checkDockerEnv()):
|
||||
if ((NetWorkConfFile.find("No such file or directory") >= 0
|
||||
or NetWorkConfFile == "") and DefaultValue.checkDockerEnv()):
|
||||
return "Shell command faild"
|
||||
bondingConfFile = "/proc/net/bonding/%s" % networkCardNum
|
||||
networkCardNumList = [networkCardNum]
|
||||
|
||||
@ -34,6 +34,8 @@ class CheckSctpService(BaseItem):
|
||||
(status, output) = subprocess.getstatusoutput(cmd)
|
||||
if (status != 0 or output == "" or output.find(
|
||||
"No such file or directory") > 0):
|
||||
if DefaultValue.checkDockerEnv():
|
||||
return
|
||||
flag = "Error"
|
||||
parRes += "There is no sctp service."
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user