dimitri · dimitri · Jun 28, 2023 · Jun 28, 2023
diff --git a/src/bin/pgcopydb/cli_stream.c b/src/bin/pgcopydb/cli_stream.c
@@ -602,8 +602,23 @@ cli_stream_cleanup(int argc, char **argv)
 		exit(EXIT_CODE_INTERNAL_ERROR);
 	}
 
-	copySpecs.resume = true;    /* pretend --resume has been used */
-	copySpecs.restart = false;  /* pretend --restart has NOT been used */
+	bool resume = true;    /* pretend --resume has been used */
+	bool restart = false;  /* pretend --restart has NOT been used */
+
+	bool createWorkDir = false;
+	bool service = false;
+
+	if (!copydb_init_workdir(&copySpecs,
+							 NULL,
+							 service,
+							 NULL,
+							 restart,
+							 resume,
+							 createWorkDir))
+	{
+		/* errors have already been logged */
+		exit(EXIT_CODE_INTERNAL_ERROR);
+	}
 
 	if (!stream_cleanup_databases(&copySpecs,
 								  streamDBoptions.slot.slotName,

diff --git a/src/bin/pgcopydb/ld_stream.c b/src/bin/pgcopydb/ld_stream.c
@@ -2222,6 +2222,8 @@ stream_cleanup_databases(CopyDataSpec *copySpecs, char *slotName, char *origin)
 		return false;
 	}
 
+	log_info("Removing schema pgcopydb and its objects");
+
 	if (!pgsql_execute(&src, "drop schema if exists pgcopydb cascade"))
 	{
 		/* errors have already been logged */
@@ -2234,6 +2236,28 @@ stream_cleanup_databases(CopyDataSpec *copySpecs, char *slotName, char *origin)
 		return false;
 	}
 
+	/*
+	 * When we have dropped the replication slot, we can remove the slot file
+	 * on-disk and also the snapshot file.
+	 */
+	log_notice("Removing slot file \"%s\"", copySpecs->cfPaths.cdc.slotfile);
+
+	if (!unlink_file(copySpecs->cfPaths.cdc.slotfile))
+	{
+		log_error("Failed to unlink the slot file \"%s\"",
+				  copySpecs->cfPaths.cdc.slotfile);
+		return false;
+	}
+
+	log_notice("Removing snapshot file \"%s\"", copySpecs->cfPaths.snfile);
+
+	if (!unlink_file(copySpecs->cfPaths.snfile))
+	{
+		log_error("Failed to unlink the snapshot file \"%s\"",
+				  copySpecs->cfPaths.snfile);
+		return false;
+	}
+
 	/*
 	 * Now cleanup the target database (replication origin).
 	 */

diff --git a/tests/cdc-low-level/copydb.sh b/tests/cdc-low-level/copydb.sh
@@ -121,4 +121,4 @@ done
 pgcopydb stream replay --resume --endpos "${lsn}"
 
 # cleanup
-pgcopydb stream cleanup
+pgcopydb stream cleanup --verbose