Commit152faf3

committed

Add instance names for 9.6 and 10

1 parent1bd538f commit152faf3Copy full SHA for 152faf3

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ def get_auxiliary_pids(self):`
`479`	`479`
`480`	`480`	`result= {}`
`481`	`481`	`forchildinchildren:`
`482`		`-line=child.cmdline()[0]`
	`482`	`+line=' '.join(child.cmdline())`
`483`	`483`	`forptypeinProcessType:`
`484`	`484`	`ifptype==ProcessType.WalSender \`
`485`	`485`	`and (line.startswith(ptype.value)or`
`@@ -513,8 +513,10 @@ def get_walsender_pid(self):`
`513`	`513`	`forname,client_portinself._master.execute(sql):`
`514`	`514`	`ifname==self.name:`
`515`	`515`	`forchildinchildren:`
`516`		`-line=child.cmdline()[0]`
`517`		`-ifline.startswith('postgres: walsender')andstr(client_port)inline:`
	`516`	`+line=' '.join(child.cmdline())`
	`517`	`+if (line.startswith(ProcessType.WalSender.value)or`
	`518`	`+line.startswith('postgres: wal sender'))and \`
	`519`	`+str(client_port)inline:`
`518`	`520`	`returnchild.pid`
`519`	`521`
`520`	`522`	`returnNone`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -709,15 +709,17 @@ def test_pids(self):`
`709`	`709`	`exceptImportError:`
`710`	`710`	`psutil=None`
`711`	`711`
`712`		`-master_processes=(`
	`712`	`+master_processes=[`
`713`	`713`	`ProcessType.Checkpointer,`
`714`	`714`	`ProcessType.BackgroundWriter,`
`715`	`715`	`ProcessType.WalWriter,`
`716`	`716`	`ProcessType.AutovacuumLauncher,`
`717`	`717`	`ProcessType.StatsCollector,`
`718`		`-ProcessType.LogicalReplicationLauncher,`
`719`	`718`	`ProcessType.WalSender,`
`720`		`- )`
	`719`	`+ ]`
	`720`	`+ifpg_version_ge('10'):`
	`721`	`+master_processes.append(ProcessType.LogicalReplicationLauncher)`
	`722`	`+`
`721`	`723`	`repl_processes= (`
`722`	`724`	`ProcessType.Startup,`
`723`	`725`	`ProcessType.Checkpointer,`

Comments

(0)