coord: check while dropping error'd sink connector

Fixes MaterializeInc#7548
maddyblue · Jul 27, 2021 · 4a94ad2 · 4a94ad2
1 parent 67e931b
commit 4a94ad2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/coord/src/coord.rs b/src/coord/src/coord.rs
@@ -687,9 +687,12 @@ impl Coordinator {
                 tx.send(Ok(ExecuteResponse::CreatedSink { existed: false }), session);
             }
             Err(e) => {
-                self.catalog_transact(vec![catalog::Op::DropItem(id)])
-                    .await
-                    .expect("deleting placeholder sink cannot fail");
+                // Drop the placeholder sink if still present.
+                if self.catalog.try_get_by_id(id).is_some() {
+                    self.catalog_transact(vec![catalog::Op::DropItem(id)])
+                        .await
+                        .expect("deleting placeholder sink cannot fail");
+                }
                 tx.send(Err(e), session);
             }
         }