Commitd7afaad

committed

allow zero (infinite) 'max_attempts' in poll_query_until()

1 parent15ccedb commitd7afaadCopy full SHA for d7afaad

File tree

-4

lines changed

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -922,20 +922,25 @@ def poll_query_until(self,`
`922`	`922`	`raise_internal_error=True):`
`923`	`923`	`"""`
`924`	`924`	`Run a query once a second until it returs 'expected'.`
	`925`	`+ Query should return single column.`
`925`	`926`
`926`	`927`	`Args:`
`927`	`928`	`dbname: database name to connect to.`
`928`	`929`	`query: query to be executed.`
`929`	`930`	`username: database user name.`
`930`		`- max_attempts: how many times should we try?`
`931`		`- sleep_time: howlong should we sleep after a failure?`
	`931`	`+ max_attempts: how many times should we try? 0 == infinite`
	`932`	`+ sleep_time: howmuch should we sleep after a failure?`
`932`	`933`	`expected: what should be returned to break the cycle?`
`933`	`934`	`raise_programming_error: mute ProgrammingError?`
`934`	`935`	`raise_internal_error: mute InternalError?`
`935`	`936`	`"""`
`936`	`937`
	`938`	`+# sanity checks`
	`939`	`+assert(max_attempts>=0)`
	`940`	`+assert(sleep_time>0)`
	`941`	`+`
`937`	`942`	`attempts=0`
`938`		`-whileattempts<max_attempts:`
	`943`	`+whilemax_attempts==0orattempts<max_attempts:`
`939`	`944`	`try:`
`940`	`945`	`res=self.execute(dbname=dbname,`
`941`	`946`	`query=query,`
`@@ -1010,7 +1015,7 @@ def replicate(self, name, username=None,`
`1010`	`1015`	`xlog_method=DEFAULT_XLOG_METHOD,`
`1011`	`1016`	`use_logging=False):`
`1012`	`1017`	`"""`
`1013`		`- Create a replica of this node.`
	`1018`	`+ Create abinaryreplica of this node.`
`1014`	`1019`
`1015`	`1020`	`Args:`
`1016`	`1021`	`name: replica's name.`

Comments

(0)