From 940c28a563a20c50b7437778b1461d8e75daa4e3 Mon Sep 17 00:00:00 2001
From: Ralf <bubriks@gmail.com>
Date: Sun, 17 Sep 2023 16:43:47 +0200
Subject: [PATCH] [FSTORE-1010] Don't leave orphaned subjects when deleting
 online enabled fg (#1547)

---
 .../featuregroup/online/OnlineFeaturegroupController.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/featuregroup/online/OnlineFeaturegroupController.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/featuregroup/online/OnlineFeaturegroupController.java
index 99d32df0ee..b25121f3cf 100644
--- a/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/featuregroup/online/OnlineFeaturegroupController.java
+++ b/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/featuregroup/online/OnlineFeaturegroupController.java
@@ -213,6 +213,10 @@ public void disableOnlineFeatureGroup(Featuregroup featureGroup, Project project
       throws FeaturestoreException, SQLException, SchemaException, KafkaException {
     dropMySQLTable(featureGroup, project, user);
     String topicName = Utils.getFeatureGroupTopicName(featureGroup);
+    String featureGroupEntityName = Utils.getFeaturegroupName(featureGroup);
+    if (!subjectsController.getSubjectVersions(project, featureGroupEntityName).isEmpty()) {
+      subjectsController.deleteSubject(project, featureGroupEntityName);
+    }
     // HOPSWORKS-3252 - we keep kafka topics in order to avoid consumers getting blocked
     // deleteFeatureGroupKafkaTopic(project, topicName);
   }