Fix possible failure in parallel index build.

robertmhaas · robertmhaas · commit 47cb9ca49a61 · 2018-04-06T19:28:48.000-04:00
Report and proposed fix by David Rowley, put in patch form by Peter Geoghegan. Discussion: http://postgr.es/m/CAKJS1f91kq1wfYR8rnRRfKtxyhU2woEA+=whd640UxMyU+O0EQ@mail.gmail.com
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -4064,8 +4064,7 @@ RemoveReindexPending(Oid indexOid)
 static void
 ResetReindexPending(void)
 {
-	if (IsInParallelMode())
-		elog(ERROR, "cannot modify reindex state during a parallel operation");
+	/* This may be called in leader error path */
 	pendingReindexedIndexes = NIL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4064,8 +4064,7 @@ RemoveReindexPending(Oid indexOid)`
`4064`	`4064`	`static void`
`4065`	`4065`	`ResetReindexPending(void)`
`4066`	`4066`	`{`
`4067`		`- if (IsInParallelMode())`
`4068`		`- elog(ERROR, "cannot modify reindex state during a parallel operation");`
	`4067`	`+ /* This may be called in leader error path */`
`4069`	`4068`	`pendingReindexedIndexes = NIL;`
`4070`	`4069`	`}`
`4071`	`4070`