[Backport 2.x] Revert datasource state when delete fails

CHANGELOG.md

@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * IP2Geo processor implementation ([#362](https://github.com/opensearch-project/geospatial/pull/362))
 ### Enhancements
 ### Bug Fixes
+* Revert datasource state when delete fails([#382](https://github.com/opensearch-project/geospatial/pull/382))
 ### Infrastructure
 * Make jacoco report to be generated faster in local ([#267](https://github.com/opensearch-project/geospatial/pull/267))
 * Exclude lombok generated code from jacoco coverage report ([#268](https://github.com/opensearch-project/geospatial/pull/268))

src/main/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportAction.java

@@ -111,9 +111,18 @@ protected void deleteDatasource(final String datasourceName) throws IOException
         if (datasource == null) {
             throw new ResourceNotFoundException("no such datasource exist");
         }
-
+        DatasourceState previousState = datasource.getState();
         setDatasourceStateAsDeleting(datasource);
-        geoIpDataDao.deleteIp2GeoDataIndex(datasource.getIndices());
+
+        try {
+            geoIpDataDao.deleteIp2GeoDataIndex(datasource.getIndices());
+        } catch (Exception e) {
+            if (previousState.equals(datasource.getState()) == false) {
+                datasource.setState(previousState);
+                datasourceDao.updateDatasource(datasource);
+            }
+            throw e;
+        }
         datasourceDao.deleteDatasource(datasource);
     }
 

src/test/java/org/opensearch/geospatial/ip2geo/action/DeleteDatasourceTransportActionTests.java

@@ -8,6 +8,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -162,4 +163,19 @@ public void testDeleteDatasource_whenProcessorIsCreatedDuringDeletion_thenThrowE
         verify(geoIpDataDao, never()).deleteIp2GeoDataIndex(datasource.getIndices());
         verify(datasourceDao, never()).deleteDatasource(datasource);
     }
+
+    @SneakyThrows
+    public void testDeleteDatasource_whenDeleteFailsAfterStateIsChanged_thenRevertState() {
+        Datasource datasource = randomDatasource();
+        datasource.setState(DatasourceState.AVAILABLE);
+        when(datasourceDao.getDatasource(datasource.getName())).thenReturn(datasource);
+        doThrow(new RuntimeException()).when(geoIpDataDao).deleteIp2GeoDataIndex(datasource.getIndices());
+
+        // Run
+        expectThrows(RuntimeException.class, () -> action.deleteDatasource(datasource.getName()));
+
+        // Verify
+        verify(datasourceDao, times(2)).updateDatasource(datasource);
+        assertEquals(DatasourceState.AVAILABLE, datasource.getState());
+    }
 }