Use GetFdwRoutineByRelId to load the OSM library

Author: zilder

src/chunk.c

@@ -25,6 +25,7 @@
 #include <commands/trigger.h>
 #include <executor/executor.h>
 #include <fmgr.h>
+#include <foreign/fdwapi.h>
 #include <funcapi.h>
 #include <miscadmin.h>
 #include <nodes/execnodes.h>
@@ -4035,15 +4036,18 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 	// if we have tiered chunks cascade drop to tiering layer as well
 	if (osm_chunk_id != INVALID_CHUNK_ID)
 	{
+		Chunk *osm_chunk = ts_chunk_get_by_id(osm_chunk_id, true);
+
 		hypertable_drop_chunks_hook_type osm_drop_chunks_hook =
 			ts_get_osm_hypertable_drop_chunks_hook();
 
 		/*
-		 * OSM library may not be loaded at the moment if `ts_chunk_do_drop_chunks`
-		 * is called from the a background worker. If this is the case try to
-		 * load it now.
+		 * The OSM library may not be loaded at the moment if
+		 * `ts_chunk_do_drop_chunks` is called from the a background worker
+		 * (e.g. from a retention policy). We call `GetFdwRoutineByRelId` to
+		 * ensure the library is loaded.
 		 */
-		if (!osm_drop_chunks_hook && ts_try_load_osm())
+		if (!osm_drop_chunks_hook && GetFdwRoutineByRelId(osm_chunk->table_id))
 			osm_drop_chunks_hook = ts_get_osm_hypertable_drop_chunks_hook();
 
 		if (osm_drop_chunks_hook)
@@ -4053,7 +4057,6 @@ ts_chunk_do_drop_chunks(Hypertable *ht, int64 older_than, int64 newer_than, int3
 			/* convert to PG timestamp from timescaledb internal format */
 			int64 range_start = ts_internal_to_time_int64(newer_than, dim->fd.column_type);
 			int64 range_end = ts_internal_to_time_int64(older_than, dim->fd.column_type);
-			Chunk *osm_chunk = ts_chunk_get_by_id(osm_chunk_id, true);
 			List *osm_dropped_names = osm_drop_chunks_hook(osm_chunk->table_id,
 														   NameStr(ht->fd.schema_name),
 														   NameStr(ht->fd.table_name),

src/osm_callbacks.c

@@ -79,46 +79,3 @@ ts_get_osm_hypertable_drop_chunks_hook()
 		return ptr->hypertable_drop_chunks_hook;
 	return NULL;
 }
-
-TSDLLEXPORT bool
-ts_try_load_osm(void)
-{
-	bool res = false;
-	Oid osm_extension_oid = get_extension_oid(OSM_EXTENSION_NAME, true);
-
-	if (OidIsValid(osm_extension_oid))
-	{
-		MemoryContext old_mcxt = CurrentMemoryContext;
-
-		PG_TRY();
-		{
-			char version[MAX_VERSION_LEN];
-			char soname[MAX_SO_NAME_LEN];
-
-			/* Format the osm library path */
-			strlcpy(version, ts_osm_extension_version(), MAX_VERSION_LEN);
-			snprintf(soname, MAX_SO_NAME_LEN, "%s%s-%s", TS_LIBDIR, OSM_EXTENSION_NAME, version);
-
-			/* Load the library */
-			load_external_function(soname, "pfdw_handler_wrapper", false, NULL);
-			res = true;
-		}
-		PG_CATCH();
-		{
-			ErrorData *error;
-
-			/* Switch to the original context & copy edata */
-			MemoryContextSwitchTo(old_mcxt);
-			error = CopyErrorData();
-			FlushErrorState();
-
-			elog(LOG, "failed to load OSM extension: %s", error->message);
-
-			/* Finally, free error data */
-			FreeErrorData(error);
-		}
-		PG_END_TRY();
-	}
-
-	return res;
-}

src/osm_callbacks.h

@@ -42,4 +42,3 @@ typedef struct
 extern chunk_insert_check_hook_type ts_get_osm_chunk_insert_hook(void);
 extern hypertable_drop_hook_type ts_get_osm_hypertable_drop_hook(void);
 extern hypertable_drop_chunks_hook_type ts_get_osm_hypertable_drop_chunks_hook(void);
-extern bool ts_try_load_osm(void);