Improve tablesync behavior with concurrent changes

petere · petere · commit 8dc7c338129d · 2017-06-09T09:20:54.000-04:00
When a table is removed from a subscription before the tablesync worker
could start, this would previously result in an error when reading
pg_subscription_rel.  Now we just ignore this.

Author: Masahiko Sawada &lt;sawada.mshk@gmail.com&gt;
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
@@ -796,7 +796,7 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 	StartTransactionCommand();
 	relstate = GetSubscriptionRelState(MyLogicalRepWorker->subid,
 									   MyLogicalRepWorker->relid,
-									   &relstate_lsn, false);
+									   &relstate_lsn, true);
 	CommitTransactionCommand();
 
 	SpinLockAcquire(&MyLogicalRepWorker->relmutex);
@@ -942,7 +942,10 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
 			}
 		case SUBREL_STATE_SYNCDONE:
 		case SUBREL_STATE_READY:
-			/* Nothing to do here but finish. */
+		case SUBREL_STATE_UNKNOWN:
+			/* Nothing to do here but finish.  (UNKNOWN means the relation was
+			 * removed from pg_subscription_rel before the sync worker could
+			 * start.) */
 			finish_sync_worker();
 			break;
 		default:
